From fa2c7f1c58e5eba8f0f7a802b5ac05889b4d5200 Mon Sep 17 00:00:00 2001 From: vng Date: Tue, 11 Jan 2011 00:53:49 +0200 Subject: [PATCH] Fix linker errors : add fribidi dependencies. --- qt/qt.pro | 2 +- yg/yg.pro | 2 -- yg/yg_tests/yg_tests.pro | 4 +--- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/qt/qt.pro b/qt/qt.pro index 4aa4637274..83b3ea4c44 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -1,6 +1,6 @@ # Main application in qt. ROOT_DIR = .. -DEPENDENCIES = map storage indexer yg platform geometry coding base freetype expat version +DEPENDENCIES = map storage indexer yg platform geometry coding base freetype expat fribidi version include($$ROOT_DIR/common.pri) diff --git a/yg/yg.pro b/yg/yg.pro index 599a0eb79c..a23fdada3e 100644 --- a/yg/yg.pro +++ b/yg/yg.pro @@ -10,8 +10,6 @@ DEPENDENCIES = geometry coding base freetype fribidi INCLUDEPATH += $$ROOT_DIR/3party/freetype/include -LIBS += lfreetype lfribidi - include($$ROOT_DIR/common.pri) !iphonesimulator-g++42 { diff --git a/yg/yg_tests/yg_tests.pro b/yg/yg_tests/yg_tests.pro index 5cd14d1234..c5e4f0e596 100644 --- a/yg/yg_tests/yg_tests.pro +++ b/yg/yg_tests/yg_tests.pro @@ -4,7 +4,7 @@ CONFIG -= app_bundle TEMPLATE = app ROOT_DIR = ../.. -DEPENDENCIES = qt_tstfrm map yg geometry platform coding base expat sgitess +DEPENDENCIES = qt_tstfrm map yg geometry platform coding base sgitess freetype fribidi include($$ROOT_DIR/common.pri) @@ -14,8 +14,6 @@ win32-g++ { LIBS += -lpthread -lopengl32 } -LIBS += -lfreetype - SOURCES += \ ../../testing/testingmain.cpp \ texture_test.cpp \