From bd40d691d67299d6da5ebd5ad368777628bcb9c0 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sat, 26 Nov 2011 19:45:26 +0100 Subject: [PATCH] [linux][gcc] Fixed build errors --- common.pri | 2 +- yg/yg.pro | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/common.pri b/common.pri index c268ab5f6c..c0f846f323 100644 --- a/common.pri +++ b/common.pri @@ -37,7 +37,7 @@ RCC_DIR = $$TEMP_PATH MOC_DIR = $$TEMP_PATH UI_DIR = $$TEMP_PATH -LIBS += -L$$BINARIES_PATH +QMAKE_LIBDIR *= $$BINARIES_PATH # By default, do not include base QT classes in any project. QT -= core gui diff --git a/yg/yg.pro b/yg/yg.pro index 33e6b94dc9..8b506743eb 100644 --- a/yg/yg.pro +++ b/yg/yg.pro @@ -120,12 +120,8 @@ HEADERS += \ win32* { SOURCES += internal/opengl_win32.cpp -} - -android*|iphone* { +} else android*|iphone* { SOURCES += internal/opengl_es.cpp -} - -macx* { +} else macx*|linux* { SOURCES += internal/opengl_ext.cpp }