From 3fc637d9c6001f6031b7f0bab4ebe8b1c015ef21 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 27 Mar 2015 08:06:15 +0100 Subject: [PATCH] Create makefiles for targets per subdir (nw) --- makefile | 46 +++++++++++++++++++---------------- scripts/genie.lua | 19 ++++++++++----- scripts/toolchain.lua | 56 +++++++++++++++++++++---------------------- 3 files changed, 67 insertions(+), 54 deletions(-) diff --git a/makefile b/makefile index c6ea673af87..21a5419cb59 100644 --- a/makefile +++ b/makefile @@ -324,6 +324,12 @@ GENIE=3rdparty/genie/bin/$(OS)/genie SILENT?=@ +ifeq ($(TARGET),$(SUBTARGET)) +SUBDIR = $(TARGET) +else +SUBDIR = $(TARGET)$(SUBTARGET) +endif + all: $(GENIE) $(TARGETOS)_$(ARCHITECTURE) windows_x64: generate @@ -333,7 +339,7 @@ endif ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw64-gcc --targetos=windows --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-mingw64-gcc config=$(CONFIG)64 WINDRES=$(WINDRES) + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-mingw64-gcc config=$(CONFIG)64 WINDRES=$(WINDRES) windows_x86: generate ifndef MINGW32 @@ -342,7 +348,7 @@ endif ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw32-gcc --targetos=windows --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-mingw32-gcc config=$(CONFIG)32 WINDRES=$(WINDRES) + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-mingw32-gcc config=$(CONFIG)32 WINDRES=$(WINDRES) windows_x64_clang: generate ifndef CLANG @@ -351,7 +357,7 @@ endif ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw-clang --targetos=windows --osd=$(OSD) --gcc_version=$(CLANG_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-mingw-clang config=$(CONFIG)64 WINDRES=$(WINDRES) + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-mingw-clang config=$(CONFIG)64 WINDRES=$(WINDRES) windows_x86_clang: generate ifndef CLANG @@ -360,7 +366,7 @@ endif ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw-clang --targetos=windows --osd=$(OSD) --gcc_version=$(CLANG_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES) + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES) vs2010: generate $(SILENT) $(GENIE) $(PARAMS) --targetos=$(TARGETOS) --osd=windows --target=$(TARGET) --subtarget=$(SUBTARGET) vs2010 @@ -396,7 +402,7 @@ endif ifndef COMPILE $(SILENT) $(GENIE) --gcc=android-arm --osd=osdmini --target=$(TARGET) --gcc_version=4.8 --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-android-arm config=$(CONFIG) + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-android-arm config=$(CONFIG) android-mips: generate ifndef ANDROID_NDK_MIPS @@ -408,7 +414,7 @@ endif ifndef COMPILE $(SILENT) $(GENIE) --gcc=android-mips --osd=osdmini --target=$(TARGET) --gcc_version=4.8 --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-android-mips config=$(CONFIG) + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-android-mips config=$(CONFIG) android-x86: generate ifndef ANDROID_NDK_X86 @@ -420,7 +426,7 @@ endif ifndef COMPILE $(SILENT) $(GENIE) --gcc=android-x86 --osd=osdmini --target=$(TARGET) --gcc_version=4.8 --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-android-x86 config=$(CONFIG) + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-android-x86 config=$(CONFIG) asmjs: generate ifndef EMSCRIPTEN @@ -429,7 +435,7 @@ endif ifndef COMPILE $(SILENT) $(GENIE) --gcc=asmjs --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-asmjs config=$(CONFIG) + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-asmjs config=$(CONFIG) nacl_x64: generate ifndef NACL_SDK_ROOT @@ -438,7 +444,7 @@ endif ifndef COMPILE $(SILENT) $(GENIE) --gcc=nacl --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-nacl config=$(CONFIG)64 + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-nacl config=$(CONFIG)64 nacl_x86: generate ifndef NACL_SDK_ROOT @@ -447,7 +453,7 @@ endif ifndef COMPILE $(SILENT) $(GENIE) --gcc=nacl --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-nacl config=$(CONFIG)32 + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-nacl config=$(CONFIG)32 nacl-arm: generate ifndef NACL_SDK_ROOT @@ -456,7 +462,7 @@ endif ifndef COMPILE $(SILENT) $(GENIE) --gcc=nacl-arm --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-nacl-arm config=$(CONFIG) + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-nacl-arm config=$(CONFIG) pnacl: generate ifndef NACL_SDK_ROOT @@ -465,55 +471,55 @@ endif ifndef COMPILE $(SILENT) $(GENIE) --gcc=pnacl --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-pnacl config=$(CONFIG) + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-pnacl config=$(CONFIG) linux_x64: generate ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=linux-gcc --targetos=$(TARGETOS) --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-linux config=$(CONFIG)64 + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-linux config=$(CONFIG)64 linux_x86: generate ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=linux-gcc --targetos=$(TARGETOS) --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-linux config=$(CONFIG)32 + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-linux config=$(CONFIG)32 linux_x64_clang: generate ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=linux-clang --targetos=$(TARGETOS) --osd=$(OSD) --gcc_version=$(CLANG_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-linux-clang config=$(CONFIG)64 + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-linux-clang config=$(CONFIG)64 linux_x86_clang: generate ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=linux-clang --targetos=$(TARGETOS) --osd=$(OSD) --gcc_version=$(CLANG_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-linux-clang config=$(CONFIG)32 + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-linux-clang config=$(CONFIG)32 macosx_x64: generate ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=osx --targetos=macosx --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx config=$(CONFIG)64 + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-osx config=$(CONFIG)64 macosx_x86: generate ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=osx --targetos=macosx --os_version=$(DARWIN_VERSION) --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx config=$(CONFIG)32 + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-osx config=$(CONFIG)32 macosx_x64_clang: generate ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --targetos=macosx --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx-clang config=$(CONFIG)64 + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-osx-clang config=$(CONFIG)64 macosx_x86_clang: generate ifndef COMPILE $(SILENT) $(GENIE) $(PARAMS) --gcc=osx-clang --targetos=macosx --os_version=$(DARWIN_VERSION) --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake endif - $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx-clang config=$(CONFIG)32 + $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/$(SUBDIR)/gmake-osx-clang config=$(CONFIG)32 $(GENIE): $(SILENT) $(MAKE) --no-print-directory -R -C 3rdparty/genie/build/gmake.$(OS) -f genie.make diff --git a/scripts/genie.lua b/scripts/genie.lua index b754db0fe01..7879e2e2135 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -205,11 +205,11 @@ end } configuration {} -msgcompile ("Compiling $(subst ../../../,,$<)...") +msgcompile ("Compiling $(subst ../,,$<)...") -msgcompile_objc ("Objective-C compiling $(subst ../../../,,$<)...") +msgcompile_objc ("Objective-C compiling $(subst ../,,$<)...") -msgresource ("Compiling resources $(subst ../../../,,$<)...") +msgresource ("Compiling resources $(subst ../,,$<)...") msglinking ("Linking $(notdir $@)...") @@ -483,11 +483,11 @@ end if _OPTIONS["MAP"] then if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then linkoptions { - "-Wl,-Map," .. "../../../" .. _OPTIONS["target"] .. ".map" + "-Wl,-Map," .. "../../../../" .. _OPTIONS["target"] .. ".map" } else linkoptions { - "-Wl,-Map," .. "../../../" .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".map" + "-Wl,-Map," .. "../../../../" .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".map" } end @@ -580,7 +580,14 @@ end -- CCOMFLAGS += -Wno-cast-align --endif -if not toolchain(MAME_BUILD_DIR) then +local subdir +if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then + subdir = _OPTIONS["target"] +else + subdir = _OPTIONS["target"] .. _OPTIONS["subtarget"] +end + +if not toolchain(MAME_BUILD_DIR, subdir) then return -- no action specified end diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 7d21ebee792..983e739b4bb 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -60,9 +60,9 @@ newoption { description = "Set iOS target version (default: 8.0).", } -function toolchain(_buildDir) +function toolchain(_buildDir, _subDir) - location (_buildDir .. "projects/" .. _ACTION) + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION) local androidPlatform = "android-14" if _OPTIONS["with-android"] then @@ -90,7 +90,7 @@ function toolchain(_buildDir) premake.gcc.cc = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-gcc" premake.gcc.cxx = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-g++" premake.gcc.ar = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-ar" - location (_buildDir .. "projects/" .. _ACTION .. "-android-arm") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-arm") end if "android-mips" == _OPTIONS["gcc"] then @@ -102,7 +102,7 @@ function toolchain(_buildDir) premake.gcc.cc = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-gcc" premake.gcc.cxx = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-g++" premake.gcc.ar = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-ar" - location (_buildDir .. "projects/" .. _ACTION .. "-android-mips") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-mips") end if "android-x86" == _OPTIONS["gcc"] then @@ -114,7 +114,7 @@ function toolchain(_buildDir) premake.gcc.cc = "$(ANDROID_NDK_X86)/bin/i686-linux-android-gcc" premake.gcc.cxx = "$(ANDROID_NDK_X86)/bin/i686-linux-android-g++" premake.gcc.ar = "$(ANDROID_NDK_X86)/bin/i686-linux-android-ar" - location (_buildDir .. "projects/" .. _ACTION .. "-android-x86") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-x86") end if "asmjs" == _OPTIONS["gcc"] then @@ -127,25 +127,25 @@ function toolchain(_buildDir) premake.gcc.cxx = "$(EMSCRIPTEN)/em++" premake.gcc.ar = "$(EMSCRIPTEN)/emar" premake.gcc.llvm = true - location (_buildDir .. "projects/" .. _ACTION .. "-asmjs") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-asmjs") end if "freebsd" == _OPTIONS["gcc"] then - location (_buildDir .. "projects/" .. _ACTION .. "-freebsd") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-freebsd") end if "ios-arm" == _OPTIONS["gcc"] then premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" premake.gcc.ar = "ar" - location (_buildDir .. "projects/" .. _ACTION .. "-ios-arm") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ios-arm") end if "ios-simulator" == _OPTIONS["gcc"] then premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" premake.gcc.ar = "ar" - location (_buildDir .. "projects/" .. _ACTION .. "-ios-simulator") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ios-simulator") end if "linux-gcc" == _OPTIONS["gcc"] then @@ -171,14 +171,14 @@ function toolchain(_buildDir) premake.gcc.cxx = "@g++-4.7" end premake.gcc.ar = "ar" - location (_buildDir .. "projects/" .. _ACTION .. "-linux") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-linux") end if "linux-clang" == _OPTIONS["gcc"] then premake.gcc.cc = "clang" premake.gcc.cxx = "clang++" premake.gcc.ar = "ar" - location (_buildDir .. "projects/" .. _ACTION .. "-linux-clang") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-linux-clang") end if "mingw32-gcc" == _OPTIONS["gcc"] then @@ -188,7 +188,7 @@ function toolchain(_buildDir) premake.gcc.cc = "$(MINGW32)/bin/i686-w64-mingw32-gcc" premake.gcc.cxx = "$(MINGW32)/bin/i686-w64-mingw32-g++" premake.gcc.ar = "$(MINGW32)/bin/ar" - location (_buildDir .. "projects/" .. _ACTION .. "-mingw32-gcc") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw32-gcc") end if "mingw64-gcc" == _OPTIONS["gcc"] then @@ -198,7 +198,7 @@ function toolchain(_buildDir) premake.gcc.cc = "$(MINGW64)/bin/x86_64-w64-mingw32-gcc" premake.gcc.cxx = "$(MINGW64)/bin/x86_64-w64-mingw32-g++" premake.gcc.ar = "$(MINGW64)/bin/ar" - location (_buildDir .. "projects/" .. _ACTION .. "-mingw64-gcc") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw64-gcc") end @@ -207,7 +207,7 @@ function toolchain(_buildDir) premake.gcc.cxx = "$(CLANG)/bin/clang++" premake.gcc.ar = "$(CLANG)/bin/llvm-ar" premake.gcc.llvm = true - location (_buildDir .. "projects/" .. _ACTION .. "-mingw-clang") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw-clang") end if "nacl" == _OPTIONS["gcc"] then @@ -226,7 +226,7 @@ function toolchain(_buildDir) premake.gcc.cc = naclToolchain .. "gcc" premake.gcc.cxx = naclToolchain .. "g++" premake.gcc.ar = naclToolchain .. "ar" - location (_buildDir .. "projects/" .. _ACTION .. "-nacl") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-nacl") end if "nacl-arm" == _OPTIONS["gcc"] then @@ -245,7 +245,7 @@ function toolchain(_buildDir) premake.gcc.cc = naclToolchain .. "gcc" premake.gcc.cxx = naclToolchain .. "g++" premake.gcc.ar = naclToolchain .. "ar" - location (_buildDir .. "projects/" .. _ACTION .. "-nacl-arm") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-nacl-arm") end if "osx" == _OPTIONS["gcc"] then @@ -255,11 +255,11 @@ function toolchain(_buildDir) premake.gcc.cxx = osxToolchain .. "clang++" premake.gcc.ar = osxToolchain .. "ar" end - location (_buildDir .. "projects/" .. _ACTION .. "-osx") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx") end if "osx-clang" == _OPTIONS["gcc"] then - location (_buildDir .. "projects/" .. _ACTION .. "-osx-clang") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-osx-clang") end if "pnacl" == _OPTIONS["gcc"] then @@ -278,7 +278,7 @@ function toolchain(_buildDir) premake.gcc.cc = naclToolchain .. "clang" premake.gcc.cxx = naclToolchain .. "clang++" premake.gcc.ar = naclToolchain .. "ar" - location (_buildDir .. "projects/" .. _ACTION .. "-pnacl") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-pnacl") end if "qnx-arm" == _OPTIONS["gcc"] then @@ -290,48 +290,48 @@ function toolchain(_buildDir) premake.gcc.cc = "$(QNX_HOST)/usr/bin/arm-unknown-nto-qnx8.0.0eabi-gcc" premake.gcc.cxx = "$(QNX_HOST)/usr/bin/arm-unknown-nto-qnx8.0.0eabi-g++" premake.gcc.ar = "$(QNX_HOST)/usr/bin/arm-unknown-nto-qnx8.0.0eabi-ar" - location (_buildDir .. "projects/" .. _ACTION .. "-qnx-arm") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-qnx-arm") end if "rpi" == _OPTIONS["gcc"] then - location (_buildDir .. "projects/" .. _ACTION .. "-rpi") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi") end elseif _ACTION == "vs2012" or _ACTION == "vs2013" or _ACTION == "vs2015" then if (_ACTION .. "-clang") == _OPTIONS["vs"] then premake.vstudio.toolset = ("LLVM-" .. _ACTION) - location (_buildDir .. "projects/" .. _ACTION .. "-clang") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-clang") end if "winphone8" == _OPTIONS["vs"] then premake.vstudio.toolset = "v110_wp80" - location (_buildDir .. "projects/" .. _ACTION .. "-winphone8") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winphone8") end if "winphone81" == _OPTIONS["vs"] then premake.vstudio.toolset = "v120_wp81" platforms { "ARM" } - location (_buildDir .. "projects/" .. _ACTION .. "-winphone81") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winphone81") end if "intel-14" == _OPTIONS["vs"] then premake.vstudio.toolset = "Intel C++ Compiler XE 14.0" - location (_buildDir .. "projects/" .. _ACTION .. "-intel") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel") end if "intel-15" == _OPTIONS["vs"] then premake.vstudio.toolset = "Intel C++ Compiler XE 15.0" - location (_buildDir .. "projects/" .. _ACTION .. "-intel") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel") end if ("vs2012-xp") == _OPTIONS["vs"] then premake.vstudio.toolset = ("v110_xp") - location (_buildDir .. "projects/" .. _ACTION .. "-xp") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp") end if ("vs2013-xp") == _OPTIONS["vs"] then premake.vstudio.toolset = ("v120_xp") - location (_buildDir .. "projects/" .. _ACTION .. "-xp") + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp") end end