diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/genie.lua | 72 | ||||
-rw-r--r-- | scripts/src/3rdparty.lua | 11 | ||||
-rw-r--r-- | scripts/src/lib.lua | 10 | ||||
-rw-r--r-- | scripts/src/main.lua | 37 | ||||
-rw-r--r-- | scripts/src/netlist.lua | 14 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 44 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 32 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 4 | ||||
-rw-r--r-- | scripts/src/tools.lua | 62 | ||||
-rw-r--r-- | scripts/src/video.lua | 2 | ||||
-rw-r--r-- | scripts/target/mame/mame.lua | 2 | ||||
-rw-r--r-- | scripts/target/mess/mess.lua | 7 | ||||
-rw-r--r-- | scripts/target/ume/dummy.lua | 43 | ||||
-rw-r--r-- | scripts/toolchain.lua | 162 |
14 files changed, 390 insertions, 112 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 090ac21fe95..42ff7fc64ce 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1,7 +1,7 @@ premake.check_paths = true premake.make.override = { "TARGET" } -premake.make.linkoptions_after = true MAME_DIR = (path.getabsolute("..") .. "/") +MAME_DIR = string.gsub(MAME_DIR, "(%s)", "\\%1") local MAME_BUILD_DIR = (MAME_DIR .. "build/") local naclToolchain = "" @@ -288,6 +288,15 @@ newoption { } } +newoption { + trigger = "STRIP_SYMBOLS", + description = "Symbols stripping.", + allowed = { + { "0", "Disabled" }, + { "1", "Enabled" }, + } +} + PYTHON = "python" @@ -420,44 +429,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") @@ -747,6 +718,13 @@ if _OPTIONS["OPENMP"]=="1" then buildoptions { "-fopenmp", } + linkoptions { + "-fopenmp" + } + defines { + "USE_OPENMP=1", + } + else buildoptions { "-Wno-unknown-pragmas", @@ -754,9 +732,9 @@ else end if _OPTIONS["LDOPTS"] then - linkoptions { - _OPTIONS["LDOPTS"] - } + linkoptions { + _OPTIONS["LDOPTS"] + } end if _OPTIONS["MAP"] then @@ -900,6 +878,9 @@ configuration { "asmjs" } archivesplit_size "20" configuration { "android*" } + buildoptions { + "-Wno-undef", + } buildoptions_cpp { "-x c++", "-std=gnu++98", @@ -1130,11 +1111,12 @@ else end mainProject(_OPTIONS["target"],_OPTIONS["subtarget"]) +if (_OPTIONS["STRIP_SYMBOLS"]=="1") then + strip() +end + if _OPTIONS["with-tools"] then group "tools" dofile(path.join("src", "tools.lua")) end -if (_ACTION == "gmake" and _OPTIONS["gcc"]=='asmjs') then - strip() -end diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index e8c73eb3bae..39bc6b65e74 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -172,15 +172,10 @@ project "flac" "_LARGEFILE_SOURCE", "_FILE_OFFSET_BITS=64", "FLAC__HAS_OGG=0", + "HAVE_CONFIG_H=1", } - configuration { "vs*" } - defines { - "VERSION=\"1.2.1\"" - } - configuration { "gmake" } - defines { - "VERSION=\\\"1.2.1\\\"" - } + + configuration { "gmake"} buildoptions_c { "-Wno-unused-function", "-O0", diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index 557e9e7316c..147099a07df 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -17,8 +17,6 @@ project "utils" files { MAME_DIR .. "src/lib/util/bitstream.h", MAME_DIR .. "src/lib/util/coretmpl.h", - MAME_DIR .. "src/lib/util/astring.c", - MAME_DIR .. "src/lib/util/astring.h", MAME_DIR .. "src/lib/util/avhuff.c", MAME_DIR .. "src/lib/util/avhuff.h", MAME_DIR .. "src/lib/util/aviio.c", @@ -157,6 +155,12 @@ project "formats" MAME_DIR .. "src/lib/formats/bw2_dsk.h", MAME_DIR .. "src/lib/formats/bw12_dsk.c", MAME_DIR .. "src/lib/formats/bw12_dsk.h", + MAME_DIR .. "src/lib/formats/c3040_dsk.c", + MAME_DIR .. "src/lib/formats/c3040_dsk.h", + MAME_DIR .. "src/lib/formats/c4040_dsk.c", + MAME_DIR .. "src/lib/formats/c4040_dsk.h", + MAME_DIR .. "src/lib/formats/c8280_dsk.c", + MAME_DIR .. "src/lib/formats/c8280_dsk.h", MAME_DIR .. "src/lib/formats/cbm_crt.c", MAME_DIR .. "src/lib/formats/cbm_crt.h", MAME_DIR .. "src/lib/formats/cbm_tap.c", @@ -183,8 +187,6 @@ project "formats" MAME_DIR .. "src/lib/formats/csw_cas.h", MAME_DIR .. "src/lib/formats/d64_dsk.c", MAME_DIR .. "src/lib/formats/d64_dsk.h", - MAME_DIR .. "src/lib/formats/d67_dsk.c", - MAME_DIR .. "src/lib/formats/d67_dsk.h", MAME_DIR .. "src/lib/formats/d71_dsk.c", MAME_DIR .. "src/lib/formats/d71_dsk.h", MAME_DIR .. "src/lib/formats/d80_dsk.c", diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 8604987ffda..80e3d1bf09a 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -12,6 +12,7 @@ function mainProject(_target, _subtarget) } flags { "NoManifest", + "Symbols", -- always include minimum symbols for executables } if _OPTIONS["SYMBOLS"] then @@ -27,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" diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index be502f5ba5c..1670ebb9ba6 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -81,8 +81,22 @@ files { MAME_DIR .. "src/emu/netlist/devices/nld_74123.h", MAME_DIR .. "src/emu/netlist/devices/nld_74153.c", MAME_DIR .. "src/emu/netlist/devices/nld_74153.h", + MAME_DIR .. "src/emu/netlist/devices/nld_74175.c", + MAME_DIR .. "src/emu/netlist/devices/nld_74175.h", + MAME_DIR .. "src/emu/netlist/devices/nld_74192.c", + MAME_DIR .. "src/emu/netlist/devices/nld_74192.h", + MAME_DIR .. "src/emu/netlist/devices/nld_74193.c", + MAME_DIR .. "src/emu/netlist/devices/nld_74193.h", + MAME_DIR .. "src/emu/netlist/devices/nld_74279.c", + MAME_DIR .. "src/emu/netlist/devices/nld_74279.h", MAME_DIR .. "src/emu/netlist/devices/nld_74ls629.c", MAME_DIR .. "src/emu/netlist/devices/nld_74ls629.h", + MAME_DIR .. "src/emu/netlist/devices/nld_82S16.c", + MAME_DIR .. "src/emu/netlist/devices/nld_82S16.h", + MAME_DIR .. "src/emu/netlist/devices/nld_9310.c", + MAME_DIR .. "src/emu/netlist/devices/nld_9310.h", + MAME_DIR .. "src/emu/netlist/devices/nld_9312.c", + MAME_DIR .. "src/emu/netlist/devices/nld_9312.h", MAME_DIR .. "src/emu/netlist/devices/nld_9316.c", MAME_DIR .. "src/emu/netlist/devices/nld_9316.h", MAME_DIR .. "src/emu/netlist/devices/nld_ne555.c", diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index dd2e9a1cf8d..9bfdfb201c1 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -1,3 +1,29 @@ +function string.starts(String,Start) + return string.sub(String,1,string.len(Start))==Start +end + +function addlibfromstring(str) + if (str==nil) then return end + for w in str:gmatch("%S+") do + if string.starts(w,"-l")==true then + links { + string.sub(w,3) + } + end + end +end + +function addoptionsfromstring(str) + if (str==nil) then return end + for w in str:gmatch("%S+") do + if string.starts(w,"-l")==false then + linkoptions { + w + } + end + end +end + function osdmodulesbuild() removeflags { @@ -191,9 +217,9 @@ function osdmodulestargetconf() if _OPTIONS["NO_USE_MIDI"]~="1" then if _OPTIONS["targetos"]=="linux" then - linkoptions { - backtick("pkg-config --libs alsa"), - } + local str = backtick("pkg-config --libs alsa") + addlibfromstring(str) + addoptionsfromstring(str) elseif _OPTIONS["targetos"]=="macosx" then links { "CoreMIDI.framework", @@ -223,13 +249,15 @@ function osdmodulestargetconf() if _OPTIONS["QT_HOME"]~=nil then linkoptions { "-L" .. backtick(_OPTIONS["QT_HOME"] .. "/bin/qmake -query QT_INSTALL_LIBS"), - "-lQtGui", - "-lQtCore", } - else - linkoptions { - backtick("pkg-config --libs QtGui"), + links { + "QtGui", + "QtCore", } + else + local str = backtick("pkg-config --libs QtGui") + addlibfromstring(str) + addoptionsfromstring(str) end end end diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 8b713bf635a..6360e79a89e 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -37,9 +37,9 @@ function maintargetosdoptions(_target) "SDL_ttf", } end - linkoptions { - backtick("pkg-config --libs fontconfig"), - } + local str = backtick("pkg-config --libs fontconfig") + addlibfromstring(str) + addoptionsfromstring(str) end if _OPTIONS["targetos"]=="windows" then @@ -239,9 +239,9 @@ if BASE_TARGETOS=="unix" then } end else - linkoptions { - backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'"), - } + local str = backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'") + addlibfromstring(str) + addoptionsfromstring(str) end else if _OPTIONS["NO_X11"]=="1" then @@ -259,9 +259,9 @@ if BASE_TARGETOS=="unix" then } end end - linkoptions { - backtick(sdlconfigcmd() .. " --libs"), - } + local str = backtick(sdlconfigcmd() .. " --libs") + addlibfromstring(str) + addoptionsfromstring(str) if _OPTIONS["targetos"]~="haiku" then links { "m", @@ -280,9 +280,9 @@ if BASE_TARGETOS=="unix" then end end elseif BASE_TARGETOS=="os2" then - linkoptions { - backtick(sdlconfigcmd() .. " --libs"), - } + local str = backtick(sdlconfigcmd() .. " --libs") + addlibfromstring(str) + addoptionsfromstring(str) links { "pthread" } @@ -422,6 +422,10 @@ if _OPTIONS["with-tools"] then "ForceCPP", } + flags { + "Symbols", -- always include minimum symbols for executables + } + dofile("sdl_cfg.lua") includedirs { @@ -480,6 +484,10 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then "ForceCPP", } + flags { + "Symbols", -- always include minimum symbols for executables + } + dofile("sdl_cfg.lua") if _OPTIONS["SEPARATE_BIN"]~="1" then diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 8c6c5dd1cb7..d8636a2e3b1 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -217,6 +217,10 @@ if _OPTIONS["with-tools"] then "ForceCPP", } + flags { + "Symbols", -- always include minimum symbols for executables + } + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index cb7602a5b54..8c371f3b19a 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -10,6 +10,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -42,6 +46,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -78,6 +86,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -110,6 +122,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -149,6 +165,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -184,6 +204,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -219,6 +243,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -251,6 +279,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -283,6 +315,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -315,6 +351,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -349,6 +389,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -381,6 +425,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -407,7 +455,7 @@ files { dofile("netlist.lua") -if (_OPTIONS["target"]=="mess") then +if (_OPTIONS["target"]~="mame") then -------------------------------------------------- -- castool -------------------------------------------------- @@ -420,6 +468,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -456,6 +508,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -493,6 +549,10 @@ options { "ForceCPP", } +flags { + "Symbols", -- always include minimum symbols for executables +} + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end diff --git a/scripts/src/video.lua b/scripts/src/video.lua index 2b1db0f07bf..08c5539a4a8 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -493,6 +493,8 @@ if (VIDEOS["PC_VGA"]~=null) then MAME_DIR .. "src/emu/video/pc_vga.h", MAME_DIR .. "src/emu/bus/isa/trident.c", MAME_DIR .. "src/emu/bus/isa/trident.h", + MAME_DIR .. "src/emu/video/clgd542x.c", + MAME_DIR .. "src/emu/video/blgd542x.h", } end diff --git a/scripts/target/mame/mame.lua b/scripts/target/mame/mame.lua index ed4f2eda6f8..44120517e4b 100644 --- a/scripts/target/mame/mame.lua +++ b/scripts/target/mame/mame.lua @@ -980,6 +980,7 @@ files { MAME_DIR .. "src/mame/drivers/pong.c", MAME_DIR .. "src/mame/drivers/nl_pong.c", MAME_DIR .. "src/mame/drivers/nl_pongd.c", + MAME_DIR .. "src/mame/drivers/nl_breakout.c", MAME_DIR .. "src/mame/drivers/poolshrk.c", MAME_DIR .. "src/mame/audio/poolshrk.c", MAME_DIR .. "src/mame/video/poolshrk.c", @@ -2427,6 +2428,7 @@ files { MAME_DIR .. "src/mame/machine/model3.c", MAME_DIR .. "src/mame/drivers/monacogp.c", MAME_DIR .. "src/mame/drivers/naomi.c", + MAME_DIR .. "src/mame/drivers/segasp.c", MAME_DIR .. "src/mame/machine/dc.c", MAME_DIR .. "src/mame/video/powervr2.c", MAME_DIR .. "src/mame/machine/naomi.c", diff --git a/scripts/target/mess/mess.lua b/scripts/target/mess/mess.lua index 176e84aa75a..c60b8f16d09 100644 --- a/scripts/target/mess/mess.lua +++ b/scripts/target/mess/mess.lua @@ -759,6 +759,7 @@ function linkProjects_mess_mess(_target, _subtarget) "nokia", "northstar", "novag", + "ns", "olivetti", "omnibyte", "orion", @@ -1875,6 +1876,12 @@ files { MAME_DIR .. "src/mess/drivers/m20.c", MAME_DIR .. "src/mess/drivers/m24.c", MAME_DIR .. "src/mess/machine/m24_kbd.c", + MAME_DIR .. "src/mess/machine/m24_z8000.c" +} + +createMESSProjects(_target, _subtarget, "ns") +files { + MAME_DIR .. "src/mess/drivers/hh_cop400.c", } createMESSProjects(_target, _subtarget, "omnibyte") diff --git a/scripts/target/ume/dummy.lua b/scripts/target/ume/dummy.lua new file mode 100644 index 00000000000..59ee39ae65d --- /dev/null +++ b/scripts/target/ume/dummy.lua @@ -0,0 +1,43 @@ +--------------------------------------------------------------------------- +-- +-- ume.lua +-- +-- Universal target makefile +-- +--------------------------------------------------------------------------- + +dofile("../mess/mess.lua") +dofile("../mame/mame.lua") + +function createProjects_ume_dummy(_target, _subtarget) + project ("ume_dummy") + targetsubdir(_target .."_" .. _subtarget) + kind "StaticLib" + uuid (os.uuid("drv-ume_dummy")) + + options { + "ForceCPP", + } + + includedirs { + MAME_DIR .. "src/osd", + MAME_DIR .. "src/emu", + MAME_DIR .. "src/mess", + MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/util", + MAME_DIR .. "3rdparty", + MAME_DIR .. "3rdparty/zlib", + GEN_DIR .. "mess/layout", + } + + files{ + MAME_DIR .. "src/mess/drivers/coleco.c", + MAME_DIR .. "src/mess/machine/coleco.c", + } +end + +function linkProjects_ume_dummy(_target, _subtarget) + links { + "ume_dummy", + } +end
\ No newline at end of file diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 7251a273ec6..86998b83813 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -362,25 +362,51 @@ function toolchain(_buildDir, _subDir) configuration { "x32", "vs*" } - targetdir (_buildDir .. "win32_" .. _ACTION .. "/bin/x32") - objdir (_buildDir .. "win32_" .. _ACTION .. "/obj") + objdir (_buildDir .. _ACTION .. "/obj") + + configuration { "x32", "vs*", "Release" } + targetdir (_buildDir .. _ACTION .. "/bin/x32/Release") + + configuration { "x32", "vs*", "Debug" } + targetdir (_buildDir .. _ACTION .. "/bin/x32/Debug") configuration { "x64", "vs*" } defines { "_WIN64" } - targetdir (_buildDir .. "win64_" .. _ACTION .. "/bin/x64") - objdir (_buildDir .. "win64_" .. _ACTION .. "/obj") + objdir (_buildDir .. _ACTION .. "/obj") + + configuration { "x64", "vs*", "Release" } + targetdir (_buildDir .. _ACTION .. "/bin/x64/Release") + + configuration { "x64", "vs*", "Debug" } + targetdir (_buildDir .. _ACTION .. "/bin/x64/Debug") configuration { "ARM", "vs*" } - targetdir (_buildDir .. "arm_" .. _ACTION .. "/bin/ARM") - objdir (_buildDir .. "arm_" .. _ACTION .. "/obj") + targetdir (_buildDir .. _ACTION .. "/bin/ARM") + objdir (_buildDir .. _ACTION .. "/obj") + + configuration { "ARM", "vs*", "Release" } + targetdir (_buildDir .. _ACTION .. "/bin/ARM/Release") + + configuration { "ARM", "vs*", "Debug" } + targetdir (_buildDir .. _ACTION .. "/bin/ARM/Debug") configuration { "x32", "vs*-clang" } - targetdir (_buildDir .. "win32_" .. _ACTION .. "-clang/bin/x32") - objdir (_buildDir .. "win32_" .. _ACTION .. "-clang/obj") + objdir (_buildDir .. _ACTION .. "-clang/obj") + + configuration { "x32", "vs*-clang", "Release" } + targetdir (_buildDir .. _ACTION .. "-clang/bin/x32/Release") + + configuration { "x32", "vs*-clang", "Debug" } + targetdir (_buildDir .. _ACTION .. "-clang/bin/x32/Debug") configuration { "x64", "vs*-clang" } - targetdir (_buildDir .. "win64_" .. _ACTION .. "-clang/bin/x64") - objdir (_buildDir .. "win64_" .. _ACTION .. "-clang/obj") + objdir (_buildDir .. _ACTION .. "-clang/obj") + + configuration { "x64", "vs*-clang", "Release" } + targetdir (_buildDir .. _ACTION .. "-clang/bin/x64/Release") + + configuration { "x64", "vs*-clang", "Debug" } + targetdir (_buildDir .. _ACTION .. "-clang/bin/x64/Debug") configuration { "vs*-clang" } buildoptions { @@ -391,15 +417,25 @@ function toolchain(_buildDir, _subDir) defines { "WIN32" } configuration { "x32", "mingw32-gcc" } - targetdir (_buildDir .. "win32_mingw-gcc" .. "/bin/x32") - objdir (_buildDir .. "win32_mingw-gcc" .. "/obj") + objdir (_buildDir .. "mingw-gcc" .. "/obj") buildoptions { "-m32" } + configuration { "x32", "mingw32-gcc", "Release" } + targetdir (_buildDir .. "mingw-gcc" .. "/bin/x32/Release") + + configuration { "x32", "mingw32-gcc", "Debug" } + targetdir (_buildDir .. "mingw-gcc" .. "/bin/x32/Debug") + configuration { "x64", "mingw64-gcc" } - targetdir (_buildDir .. "win64_mingw-gcc" .. "/bin/x64") - objdir (_buildDir .. "win64_mingw-gcc" .. "/obj") + objdir (_buildDir .. "mingw-gcc" .. "/obj") buildoptions { "-m64" } + configuration { "x64", "mingw64-gcc", "Release" } + targetdir (_buildDir .. "mingw-gcc" .. "/bin/x64/Release") + + configuration { "x64", "mingw64-gcc", "Debug" } + targetdir (_buildDir .. "mingw-gcc" .. "/bin/x64/Debug") + configuration { "mingw-clang" } linkoptions { "-Qunused-arguments", @@ -408,18 +444,22 @@ function toolchain(_buildDir, _subDir) } configuration { "x32", "mingw-clang" } - targetdir (_buildDir .. "win32_mingw-clang/bin/x32") - objdir ( _buildDir .. "win32_mingw-clang/obj") + objdir ( _buildDir .. "mingw-clang/obj") buildoptions { "-m32" } buildoptions { "-isystem$(MINGW32)/i686-w64-mingw32/include/c++", "-isystem$(MINGW32)/i686-w64-mingw32/include/c++/i686-w64-mingw32", "-isystem$(MINGW32)/i686-w64-mingw32/include", } + + configuration { "x32", "mingw-clang", "Release" } + targetdir (_buildDir .. "mingw-clang/bin/x32/Release") + + configuration { "x32", "mingw-clang", "Debug" } + targetdir (_buildDir .. "win32_mingw-clang/bin/x32/Debug") configuration { "x64", "mingw-clang" } - targetdir (_buildDir .. "win64_mingw-clang/bin/x64") - objdir (_buildDir .. "win64_mingw-clang/obj") + objdir (_buildDir .. "mingw-clang/obj") buildoptions { "-m64" } buildoptions { "-isystem$(MINGW64)/x86_64-w64-mingw32/include/c++", @@ -427,61 +467,106 @@ function toolchain(_buildDir, _subDir) "-isystem$(MINGW64)/x86_64-w64-mingw32/include", } + configuration { "x64", "mingw-clang", "Release" } + targetdir (_buildDir .. "mingw-clang/bin/x64/Release") + + configuration { "x64", "mingw-clang", "Debug" } + targetdir (_buildDir .. "mingw-clang/bin/x64/Debug") + configuration { "linux-gcc", "x32" } - targetdir (_buildDir .. "linux32_gcc" .. "/bin/x32") - objdir (_buildDir .. "linux32_gcc" .. "/obj") + objdir (_buildDir .. "linux_gcc" .. "/obj") buildoptions { "-m32", } + configuration { "linux-gcc", "x32", "Release" } + targetdir (_buildDir .. "linux_gcc" .. "/bin/x32/Release") + + configuration { "linux-gcc", "x32", "Debug" } + targetdir (_buildDir .. "linux_gcc" .. "/bin/x32/Debug") + configuration { "linux-gcc", "x64" } - targetdir (_buildDir .. "linux64_gcc" .. "/bin/x64") - objdir (_buildDir .. "linux64_gcc" .. "/obj") + objdir (_buildDir .. "linux_gcc" .. "/obj") buildoptions { "-m64", } + configuration { "linux-gcc", "x64", "Release" } + targetdir (_buildDir .. "linux_gcc" .. "/bin/x64/Release") + + configuration { "linux-gcc", "x64", "Debug" } + targetdir (_buildDir .. "linux_gcc" .. "/bin/x64/Debug") + configuration { "linux-clang", "x32" } - targetdir (_buildDir .. "linux32_clang" .. "/bin/x32") - objdir (_buildDir .. "linux32_clang" .. "/obj") + objdir (_buildDir .. "linux_clang" .. "/obj") buildoptions { "-m32", } + configuration { "linux-clang", "x32", "Release" } + targetdir (_buildDir .. "linux_clang" .. "/bin/x32/Release") + + configuration { "linux-clang", "x32", "Debug" } + targetdir (_buildDir .. "linux_clang" .. "/bin/x32/Debug") + configuration { "linux-clang", "x64" } - targetdir (_buildDir .. "linux64_clang" .. "/bin/x64") - objdir (_buildDir .. "linux64_clang" .. "/obj") + objdir (_buildDir .. "linux_clang" .. "/obj") buildoptions { "-m64", } + + configuration { "linux-clang", "x64", "Release" } + targetdir (_buildDir .. "linux_clang" .. "/bin/x64/Release") + + configuration { "linux-clang", "x64", "Debug" } + targetdir (_buildDir .. "linux_clang" .. "/bin/x64/Debug") configuration { "solaris", "x32" } - targetdir (_buildDir .. "solaris" .. "/bin/x32") objdir (_buildDir .. "solaris" .. "/obj") buildoptions { "-m32", } + configuration { "solaris", "x32", "Release" } + targetdir (_buildDir .. "solaris" .. "/bin/x32/Release") + + configuration { "solaris", "x32", "Debug" } + targetdir (_buildDir .. "solaris" .. "/bin/x32/Debug") + configuration { "solaris", "x64" } - targetdir (_buildDir .. "solaris" .. "/bin/x64") objdir (_buildDir .. "solaris" .. "/obj") buildoptions { "-m64", } + configuration { "solaris", "x64", "Release" } + targetdir (_buildDir .. "solaris" .. "/bin/x64/Release") + + configuration { "solaris", "x64", "Debug" } + targetdir (_buildDir .. "solaris" .. "/bin/x64/Debug") + configuration { "freebsd", "x32" } - targetdir (_buildDir .. "freebsd" .. "/bin/x32") objdir (_buildDir .. "freebsd" .. "/obj") buildoptions { "-m32", } + configuration { "freebsd", "x32", "Release" } + targetdir (_buildDir .. "freebsd" .. "/bin/x32/Release") + + configuration { "freebsd", "x32", "Debug" } + targetdir (_buildDir .. "freebsd" .. "/bin/x32/Debug") + configuration { "freebsd", "x64" } - targetdir (_buildDir .. "freebsd" .. "/bin/x64") objdir (_buildDir .. "freebsd" .. "/obj") buildoptions { "-m64", } + configuration { "freebsd", "x64", "Release" } + targetdir (_buildDir .. "freebsd" .. "/bin/x64/Release") + + configuration { "freebsd", "x64", "Debug" } + targetdir (_buildDir .. "freebsd" .. "/bin/x64/Debug") configuration { "android-*" } includedirs { @@ -680,19 +765,28 @@ function toolchain(_buildDir, _subDir) libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Release" } configuration { "osx*", "x32" } - targetdir (_buildDir .. "osx32_clang" .. "/bin") - objdir (_buildDir .. "osx32_clang" .. "/obj") + objdir (_buildDir .. "osx_clang" .. "/obj") buildoptions { "-m32", } + configuration { "osx*", "x32", "Release" } + targetdir (_buildDir .. "osx_clang" .. "/bin/x32/Release") + configuration { "osx*", "x32", "Debug" } + targetdir (_buildDir .. "osx_clang" .. "/bin/x32/Debug") + configuration { "osx*", "x64" } - targetdir (_buildDir .. "osx64_clang" .. "/bin") - objdir (_buildDir .. "osx64_clang" .. "/obj") + objdir (_buildDir .. "osx_clang" .. "/obj") buildoptions { "-m64", } + configuration { "osx*", "x64", "Release" } + targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Release") + + configuration { "osx*", "x64", "Debug" } + targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Debug") + configuration { "ios-arm" } targetdir (_buildDir .. "ios-arm" .. "/bin") objdir (_buildDir .. "ios-arm" .. "/obj") |