diff --git a/thirdparty/freetype/README.txt b/thirdparty/freetype/README.txt index 701ac664..b16d5c51 100644 --- a/thirdparty/freetype/README.txt +++ b/thirdparty/freetype/README.txt @@ -3,8 +3,10 @@ How to build freetype instructions -1. Download freetype (http://www.freetype.org/download.html#stable) -2. Decompress freetype.XXX.tar.gz -3. Update on freetype.pro file the freetype directory -4. Run qmake freetype.pro (on mac add -spec macx-g++) -5. Run make +- Download freetype (http://www.freetype.org/download.html#stable) +- Decompress freetype.XXX.tar.gz + +LINUX: + - qmake freetype.pro -spec linux-g++ + - make + diff --git a/thirdparty/freetype/freetype.pro b/thirdparty/freetype/freetype.pro index fe68c3dd..14470320 100644 --- a/thirdparty/freetype/freetype.pro +++ b/thirdparty/freetype/freetype.pro @@ -29,11 +29,10 @@ INCLUDEPATH += "$$FREETYPE_DIR_WITH_VERSION/include" DEFINES = "FT2_BUILD_LIBRARY" -FREETYPE_DIR = "$$[UNIBOARD_DIR]/thirdparty/freetype/$$FREETYPE_DIR_WITH_VERSION" -target.path = "$$FREETYPE_DIR/lib" -ft2build.path = "$$FREETYPE_DIR/include" +target.path = "lib" +ft2build.path = "$$FREETYPE_DIR_WITH_VERSION/include" ft2build.files = "$$FREETYPE_DIR_WITH_VERSION/include/ft2build.h" -headers.path = "$$FREETYPE_DIR/include/freetype" +headers.path = "$$FREETYPE_DIR_WITH_VERSION/include/freetype" headers.files = "$$FREETYPE_DIR_WITH_VERSION/include/freetype/config" "$$FREETYPE_DIR_WITH_VERSION/include/freetype/*.h" INSTALLS += "target" "ft2build" "headers" diff --git a/thirdparty/libs.pri b/thirdparty/libs.pri index 17518d1f..e394d7dc 100644 --- a/thirdparty/libs.pri +++ b/thirdparty/libs.pri @@ -12,7 +12,7 @@ win32 { } FREETYPE_DIR = "$$PWD/freetype/freetype-2.4.4" -LIBS += "-L"$$PWD/freetype/lib/$$SUB_LIB" "-lfreetype" +LIBS += "-L$$PWD/freetype/lib/$$SUB_LIB" "-lfreetype" # no INCLUDEPATH, freetype is not used directly XPDF_DIR = "$$PWD/xpdf/xpdf-3.02" diff --git a/thirdparty/xpdf/README.txt b/thirdparty/xpdf/README.txt index 4fcf77a3..e131b07c 100644 --- a/thirdparty/xpdf/README.txt +++ b/thirdparty/xpdf/README.txt @@ -15,7 +15,11 @@ OSX: - run ./configure (may need extrea options ?) Linux: - - run ./configure + - cd xpdf-3.02 + - ./configure --with-freetype2-library="../../freetype/lib/linux" --with-freetype2-includes="../../freetype/freetype-2.4.4/include" + - cd .. + - qmake xpdf.pdf -spec linux-g++ + - make: - Run qmake (-spec macx-g++ on OSX) - Run make (nmake on windows) diff --git a/thirdparty/xpdf/xpdf-3.02/splash/Makefile b/thirdparty/xpdf/xpdf-3.02/splash/Makefile index 3ded6e98..121b4bcf 100644 --- a/thirdparty/xpdf/xpdf-3.02/splash/Makefile +++ b/thirdparty/xpdf/xpdf-3.02/splash/Makefile @@ -16,7 +16,7 @@ GOOLIBDIR = ../goo FOFISRCDIR = $(srcdir)/../fofi FOFILIBDIR = ../fofi -CXXFLAGS = -g -O2 -DHAVE_CONFIG_H -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) +CXXFLAGS = -g -O2 -DHAVE_CONFIG_H -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) -I../../freetype/freetype-2.4.4/include CXX = g++ AR = ar rc diff --git a/thirdparty/xpdf/xpdf-3.02/xpdf/Makefile b/thirdparty/xpdf/xpdf-3.02/xpdf/Makefile index 8fc95fb4..c8e9ff12 100644 --- a/thirdparty/xpdf/xpdf-3.02/xpdf/Makefile +++ b/thirdparty/xpdf/xpdf-3.02/xpdf/Makefile @@ -19,12 +19,12 @@ FOFILIBDIR = ../fofi SPLASHSRCDIR = $(srcdir)/../splash SPLASHLIBDIR = ../splash -CXXFLAGS = -g -O2 -DHAVE_CONFIG_H -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) +CXXFLAGS = -g -O2 -DHAVE_CONFIG_H -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) -I../../freetype/freetype-2.4.4/include LDFLAGS = T1LIBS = -FTLIBS = +FTLIBS = -L../../freetype/lib/linux -lfreetype XLIBS = -lXt -lXext -lSM -lICE -lX11 diff --git a/thirdparty/xpdf/xpdf.pro b/thirdparty/xpdf/xpdf.pro index 9ecde62a..ec4f1046 100644 --- a/thirdparty/xpdf/xpdf.pro +++ b/thirdparty/xpdf/xpdf.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += staticlib release warn_off +CONFIG += staticlib release XPDF_DIR = "xpdf-3.02" @@ -21,15 +21,15 @@ OBJECTS_DIR = "objects" macx { CONFIG += x86 ppc - QMAKE_MACOSX_DEPLOYMENT_TARGET = "10.4" + QMAKE_MACOSX_DEPLOYMENT_TARGET = "10.5" } # Free type includes and lib FREETYPE_DIR = "../freetype/freetype-2.4.4" INCLUDEPATH += "$$FREETYPE_DIR/include" "$$FREETYPE_DIR/include/freetype2" -LIBS += "-Lfreetype/lib" "-lfreetype" +LIBS += "-L../freetype/lib/$$SUB_LIB" "-lfreetype" -INCLUDEPATH += $$XPDF_DIR $$XPDF_DIR "$$XPDF_DIR/fofi" "$$XPDF_DIR/goo" "$$XPDF_DIR/splash" "$$XPDF_DIR/include" xpdf-3.02Extra +INCLUDEPATH += $$XPDF_DIR "$$XPDF_DIR/fofi" "$$XPDF_DIR/goo" "$$XPDF_DIR/splash" "$$XPDF_DIR/include" "xpdf-3.02Extra" aconf.path = $$XPDF_DIR aconf.files = $$XPDF_DIR/aconf.h