From 3a37417a6ba315f237c2db958e337a8493def5eb Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 25 Apr 2015 13:02:38 +0200 Subject: [PATCH] use target suffixes only for main executable (nw) --- scripts/genie.lua | 38 -------------------------------------- scripts/src/main.lua | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 38 deletions(-) diff --git a/scripts/genie.lua b/scripts/genie.lua index ddb651bb4b1..032e66409c7 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -428,44 +428,6 @@ configuration { "gmake" } "SingleOutputDir", } -configuration { "x64", "Release" } - targetsuffix "64" - if _OPTIONS["PROFILE"] then - targetsuffix "64p" - end - -configuration { "x64", "Debug" } - targetsuffix "64d" - if _OPTIONS["PROFILE"] then - targetsuffix "64dp" - end - -configuration { "x32", "Release" } - targetsuffix "" - if _OPTIONS["PROFILE"] then - targetsuffix "p" - end - -configuration { "x32", "Debug" } - targetsuffix "d" - if _OPTIONS["PROFILE"] then - targetsuffix "dp" - end - -configuration { "Native", "Release" } - targetsuffix "" - if _OPTIONS["PROFILE"] then - targetsuffix "p" - end - -configuration { "Native", "Debug" } - targetsuffix "d" - if _OPTIONS["PROFILE"] then - targetsuffix "dp" - end - -configuration { } - dofile ("toolchain.lua") diff --git a/scripts/src/main.lua b/scripts/src/main.lua index a109bea87dd..80e3d1bf09a 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -28,6 +28,42 @@ function mainProject(_target, _subtarget) "Unicode", } + configuration { "x64", "Release" } + targetsuffix "64" + if _OPTIONS["PROFILE"] then + targetsuffix "64p" + end + + configuration { "x64", "Debug" } + targetsuffix "64d" + if _OPTIONS["PROFILE"] then + targetsuffix "64dp" + end + + configuration { "x32", "Release" } + targetsuffix "" + if _OPTIONS["PROFILE"] then + targetsuffix "p" + end + + configuration { "x32", "Debug" } + targetsuffix "d" + if _OPTIONS["PROFILE"] then + targetsuffix "dp" + end + + configuration { "Native", "Release" } + targetsuffix "" + if _OPTIONS["PROFILE"] then + targetsuffix "p" + end + + configuration { "Native", "Debug" } + targetsuffix "d" + if _OPTIONS["PROFILE"] then + targetsuffix "dp" + end + configuration { "mingw*" or "vs*" } targetextension ".exe"