From c058c9db4e2d78fc2abe5a23bcfc8b8df475cfc9 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sun, 20 Mar 2011 03:50:22 +0000 Subject: [PATCH] .pro files improvements --- generator/generator_tool/generator_tool.pro | 4 +--- indexer/indexer_tests/indexer_tests.pro | 9 ++------- yg/yg.pro | 12 +++--------- yg/yg_tests/yg_tests.pro | 9 ++------- 4 files changed, 8 insertions(+), 26 deletions(-) diff --git a/generator/generator_tool/generator_tool.pro b/generator/generator_tool/generator_tool.pro index 460772d87f..293b88429b 100644 --- a/generator/generator_tool/generator_tool.pro +++ b/generator/generator_tool/generator_tool.pro @@ -12,9 +12,7 @@ TEMPLATE = app # needed for Platform::WorkingDir() QT += core -win32 { - LIBS += -lShell32 -} +win32:LIBS += -lShell32 SOURCES += \ generator_tool.cpp \ diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro index af97138df0..b1db0227e9 100644 --- a/indexer/indexer_tests/indexer_tests.pro +++ b/indexer/indexer_tests/indexer_tests.pro @@ -10,13 +10,8 @@ include($$ROOT_DIR/common.pri) QT *= core gui opengl -win32 { - LIBS += -lopengl32 -lShell32 -} - -win32-g++ { - LIBS += -lpthread -} +win32:LIBS += -lopengl32 -lShell32 +win32-g++:LIBS += -lpthread HEADERS += \ feature_routine.hpp \ diff --git a/yg/yg.pro b/yg/yg.pro index 2bcf0b47fb..74c08c8f69 100644 --- a/yg/yg.pro +++ b/yg/yg.pro @@ -106,13 +106,7 @@ HEADERS += \ circle_info.hpp \ area_renderer.hpp -!iphonesimulator-g++42 { - !iphonedevice-g++42 { - !bada-simulator { - !bada-device { - HEADERS += internal/opengl_win32.hpp - SOURCES += internal/opengl_win32.cpp - } - } - } +!iphone*:!bada-simulator { + HEADERS += internal/opengl_win32.hpp + SOURCES += internal/opengl_win32.cpp } diff --git a/yg/yg_tests/yg_tests.pro b/yg/yg_tests/yg_tests.pro index d8d5671846..f5764a83fe 100644 --- a/yg/yg_tests/yg_tests.pro +++ b/yg/yg_tests/yg_tests.pro @@ -10,13 +10,8 @@ include($$ROOT_DIR/common.pri) QT += opengl gui core -win32-g++ { - LIBS += -lpthread -} - -win32 { - LIBS += -lopengl32 -lshell32 -} +win32:LIBS += -lopengl32 -lshell32 +win32-g++:LIBS += -lpthread SOURCES += \ ../../testing/testingmain.cpp \