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
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
--- amanith/plugins/fonts/build.conf
+++ amanith/plugins/fonts/build.conf
@@ -38,9 +38,9 @@
# take into account compilation mode (debug or release)
DEFINES -= FT_DEBUG_LEVEL_ERROR FT_DEBUG_LEVEL_TRACE
-INCLUDEPATH += $$(AMANITHDIR)/3rdpart/freetype2/include
+QMAKE_CXXFLAGS += `pkg-config --cflags freetype2`
-unix: LIBS += $$(AMANITHDIR)/lib/libfreetype2.a $$(AMANITHDIR)/lib/libzlib.a
+unix: LIBS += `pkg-config --libs freetype2` -lz
win32: {
!contains(DEFINES, WIN32_MINGW) {
--- amanith/plugins/jpeg/build.conf
+++ amanith/plugins/jpeg/build.conf
@@ -25,7 +25,7 @@
}
}
-unix: LIBS += $$(AMANITHDIR)/lib/libjpeg.a
+unix: LIBS += -ljpeg
win32: {
!contains(DEFINES, WIN32_MINGW) {
--- amanith/plugins/jpeg/gjpegimpexp.cpp
+++ amanith/plugins/jpeg/gjpegimpexp.cpp
@@ -36,7 +36,7 @@
#include <csetjmp>
G_EXTERN_C {
- #include "../../3rdpart/libjpeg/jpeglib.h"
+ #include <jpeglib.h>
};
/****************************************************************************
--- amanith/plugins/png/build.conf
+++ amanith/plugins/png/build.conf
@@ -25,9 +25,8 @@
}
}
-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/png/gpngimpexp.cpp
+++ amanith/plugins/png/gpngimpexp.cpp
@@ -35,7 +35,7 @@
//#include <csetjmp>
G_EXTERN_C {
- #include "../../3rdpart/libpng/png.h"
+ #include <png.h>
};
/****************************************************************************
|
GitWeb
