From 3e2113a13fb2072c583f4543e9ead47c994b23c0 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Tue, 5 Jun 2012 09:46:10 +0300 Subject: [PATCH] Subdirs.pro was adapted for all 3 platforms. With msvc Sankore3.1.pro should be first because visual studio set first project as executable. --- Subdirs.pro | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Subdirs.pro b/Subdirs.pro index 78497229..192aeaf7 100644 --- a/Subdirs.pro +++ b/Subdirs.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -CONFIG += recursive +CONFIG += ordered CONFIG += debug_and_release win32: SUB_DIR = win32 @@ -23,11 +23,11 @@ SANKORE_PLUGINS_DIR = $$SANKORE_DIR/plugins PLUGIN_CFF_ADAPTOR_DIR = $$SANKORE_PLUGINS_DIR/cffadaptor PLUGIN_CFF_ADAPTOR_PRO = $$PLUGIN_CFF_ADAPTOR_DIR/UBCFFAdaptor.pro -if(exists($$PLUGIN_CFF_ADAPTOR_DIR)){ - SUBDIRS += $$PLUGIN_CFF_ADAPTOR_PRO - $$SANKORE_PRO.depends = $$PLUGIN_CFF_ADAPTOR_PRO +#visoal studio sets first project as executable +contains(TEMPLATE, vcsubdirs):{ + SUBDIRS = $$SANKORE_PRO $$PLUGIN_CFF_ADAPTOR_PRO +} else:{ + SUBDIRS = $$PLUGIN_CFF_ADAPTOR_PRO $$SANKORE_PRO } -SUBDIRS += $$SANKORE_PRO - -recurse_target = $$SANKORE_PRO +$$SANKORE_PRO.depends = $$PLUGIN_CFF_ADAPTOR_PRO