1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
--- amanith/amanith.pro.BAD 2007-05-26 18:03:40.000000000 -0500
+++ amanith/amanith.pro 2007-05-26 18:03:48.000000000 -0500
@@ -1,4 +1,4 @@
TEMPLATE = subdirs
CONFIG += ordered
-SUBDIRS += 3rdpart build plugins examples
+SUBDIRS += build plugins examples
--- amanith/plugins/jpeg/build.conf.BAD 2007-05-26 18:03:57.000000000 -0500
+++ amanith/plugins/jpeg/build.conf 2007-05-26 18:04:09.000000000 -0500
@@ -25,7 +25,7 @@ contains(DEFINES, _JPEG_PLUGIN) {
}
}
-unix: LIBS += $$(AMANITHDIR)/lib/libjpeg.a
+unix: LIBS += -ljpeg
win32: {
!contains(DEFINES, WIN32_MINGW) {
--- amanith/plugins/png/build.conf.BAD 2007-05-26 18:04:21.000000000 -0500
+++ amanith/plugins/png/build.conf 2007-05-26 18:04:33.000000000 -0500
@@ -25,9 +25,7 @@ contains(DEFINES, _PNG_PLUGIN) {
}
}
-INCLUDEPATH += $$(AMANITHDIR)/3rdpart/zlib
-
-unix: LIBS += $$(AMANITHDIR)/lib/libpng.a $$(AMANITHDIR)/lib/libzlib.a
+unix: LIBS += -lpng -lz
win32: {
!contains(DEFINES, WIN32_MINGW) {
--- amanith/plugins/fonts/build.conf.BAD 2007-05-26 18:04:44.000000000 -0500
+++ amanith/plugins/fonts/build.conf 2007-05-26 18:05:08.000000000 -0500
@@ -38,9 +38,9 @@ contains(DEFINES, _FONTS_PLUGIN) {
# take into account compilation mode (debug or release)
DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG_LEVEL_TRACE
INCLUDEPATH += $$(AMANITHDIR)/3rdpart/freetype2/include
-unix: LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a
+unix: LIBS += -lfreetype -lz
win32: {
!contains(DEFINES, WIN32_MINGW) {
|
GitWeb
