51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
--- 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) {
|
|
diff -up amanith/plugins/fonts/build.conf.orig amanith/plugins/fonts/build.conf
|
|
--- amanith/plugins/fonts/build.conf.orig 2005-09-26 04:18:52.000000000 -0400
|
|
+++ amanith/plugins/fonts/build.conf 2008-09-26 15:52:14.000000000 -0400
|
|
@@ -40,7 +40,7 @@ DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG
|
|
|
|
INCLUDEPATH += $$(AMANITHDIR)/3rdpart/freetype2/include
|
|
|
|
-unix: LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a
|
|
+unix: LIBS += -lfreetype -lz
|
|
win32: {
|
|
|
|
!contains(DEFINES, WIN32_MINGW) {
|
|
@@ -51,4 +51,4 @@ win32: {
|
|
contains(DEFINES, WIN32_MINGW) {
|
|
LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a
|
|
}
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|