diff options
author | 2016-03-21 08:27:06 +0100 | |
---|---|---|
committer | 2016-03-21 08:27:06 +0100 | |
commit | a99df788017c2bf5a56034d4f9152bf8ab95a168 (patch) | |
tree | 3beec27b413c75b8f9f88199519e45fd07959bf8 /scripts/src | |
parent | b224d9a77ad6483daf2b60b75dbdc323a3bcd4b0 (diff) | |
parent | 3afd990226a2c647290579bebb5537bd0fd3faac (diff) |
Merge with master
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 9 | ||||
-rw-r--r-- | scripts/src/bus.lua | 44 | ||||
-rw-r--r-- | scripts/src/cpu.lua | 35 | ||||
-rw-r--r-- | scripts/src/emu.lua | 12 | ||||
-rw-r--r-- | scripts/src/machine.lua | 2 | ||||
-rw-r--r-- | scripts/src/main.lua | 4 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 6 | ||||
-rw-r--r-- | scripts/src/osd/osdmini.lua | 2 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 31 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 2 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 12 | ||||
-rw-r--r-- | scripts/src/osd/windows_cfg.lua | 2 | ||||
-rw-r--r-- | scripts/src/sound.lua | 11 | ||||
-rw-r--r-- | scripts/src/tests.lua | 4 | ||||
-rw-r--r-- | scripts/src/tools.lua | 119 |
15 files changed, 205 insertions, 90 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 525789a92f1..9925c36658d 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -726,6 +726,14 @@ end "-Wno-uninitialized", "-Wno-unused-function", } + configuration { "rpi" } + buildoptions { + "-Wno-unused-but-set-variable", + "-Wno-unused-variable", + } + defines { + "__STDC_VERSION__=199901L", + } configuration { } @@ -769,6 +777,7 @@ end MAME_DIR .. "3rdparty/bgfx/src/renderer_null.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_vk.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderdoc.cpp", + MAME_DIR .. "3rdparty/bgfx/src/shader.cpp", MAME_DIR .. "3rdparty/bgfx/src/shader_dxbc.cpp", MAME_DIR .. "3rdparty/bgfx/src/shader_dx9bc.cpp", MAME_DIR .. "3rdparty/bgfx/src/shader_spirv.cpp", diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 1379c572fa8..b83adb41fae 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -2587,3 +2587,47 @@ if (BUSES["NEWBRAIN"]~=null) then MAME_DIR .. "src/devices/bus/newbrain/fdc.h", } end + +--------------------------------------------------- +-- +--@src/devices/bus/svi3x8/expander/expander.h,BUSES["SVI_EXPANDER"] = true +--------------------------------------------------- + +if (BUSES["SVI_EXPANDER"]~=null) then + files { + MAME_DIR .. "src/devices/bus/svi3x8/expander/expander.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/expander/expander.h", + MAME_DIR .. "src/devices/bus/svi3x8/expander/modules.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/expander/modules.h", + MAME_DIR .. "src/devices/bus/svi3x8/expander/sv601.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/expander/sv601.h", + MAME_DIR .. "src/devices/bus/svi3x8/expander/sv602.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/expander/sv602.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/bus/svi3x8/slot/slot.h,BUSES["SVI_SLOT"] = true +--------------------------------------------------- + +if (BUSES["SVI_SLOT"]~=null) then + files { + MAME_DIR .. "src/devices/bus/svi3x8/slot/slot.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/slot.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/cards.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/cards.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv801.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv801.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv802.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv802.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv803.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv803.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv805.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv805.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv806.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv806.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv807.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv807.h", + } +end diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index ed6378f93f8..4d3f98a3e4c 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -1842,19 +1842,39 @@ if (CPUS["AVR8"]~=null or _OPTIONS["with-tools"]) then end -------------------------------------------------- --- Texas Instruments TMS0980 ---@src/devices/cpu/tms0980/tms0980.h,CPUS["TMS0980"] = true +-- Texas Instruments TMS1000 series +--@src/devices/cpu/tms1000/tms1000.h,CPUS["TMS1000"] = true +--@src/devices/cpu/tms1000/tms1100.h,CPUS["TMS1000"] = true +--@src/devices/cpu/tms1000/tms1400.h,CPUS["TMS1000"] = true +--@src/devices/cpu/tms1000/tms0970.h,CPUS["TMS1000"] = true +--@src/devices/cpu/tms1000/tms0980.h,CPUS["TMS1000"] = true +--@src/devices/cpu/tms1000/tms0270.h,CPUS["TMS1000"] = true +--@src/devices/cpu/tms1000/tp0320.h,CPUS["TMS1000"] = true -------------------------------------------------- -if (CPUS["TMS0980"]~=null) then +if (CPUS["TMS1000"]~=null) then files { - MAME_DIR .. "src/devices/cpu/tms0980/tms0980.cpp", - MAME_DIR .. "src/devices/cpu/tms0980/tms0980.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms1k_base.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms1k_base.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms1000.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms1000.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms1100.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms1100.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms1400.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms1400.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms0970.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms0970.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms0980.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms0980.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms0270.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms0270.h", + MAME_DIR .. "src/devices/cpu/tms1000/tp0320.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tp0320.h", } end -if (CPUS["TMS0980"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms0980/tms0980d.cpp") +if (CPUS["TMS1000"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms1000/tms1k_dasm.cpp") end -------------------------------------------------- @@ -1879,7 +1899,6 @@ end --@src/devices/cpu/tms9900/tms9900.h,CPUS["TMS9900"] = true --@src/devices/cpu/tms9900/tms9980a.h,CPUS["TMS9900"] = true --@src/devices/cpu/tms9900/tms9995.h,CPUS["TMS9900"] = true - -------------------------------------------------- if (CPUS["TMS9900"]~=null) then diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index e71103a26b6..1ca5fa25281 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -412,15 +412,9 @@ dependency { } -if (_OPTIONS["targetos"]=="asmjs") then - custombuildtask { - { MAME_DIR .. "src/emu/uismall.png" , GEN_DIR .. "emu/uismall.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uismall.png...", PYTHON .. " $(1) $(<) temp.bdc", PYTHON .. " $(2) temp.bdc $(@) font_uismall UINT8" }}, - } -else - custombuildtask { - { MAME_DIR .. "scripts/font/NotoSans-Bold.bdc", GEN_DIR .. "emu/uismall.fh", { MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting NotoSans-Bold.bdc...", PYTHON .. " $(1) $(<) $(@) font_uismall UINT8" }}, - } -end +custombuildtask { + { MAME_DIR .. "scripts/font/NotoSans-Bold.bdc", GEN_DIR .. "emu/uismall.fh", { MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting NotoSans-Bold.bdc...", PYTHON .. " $(1) $(<) $(@) font_uismall UINT8" }}, +} custombuildtask { { MAME_DIR .. "src/emu/ui/uicmd14.png" , GEN_DIR .. "emu/ui/uicmd14.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 UINT8" }}, diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 0b38879b20c..009b75c6e7d 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -1709,6 +1709,8 @@ if (MACHINES["PCI"]~=null) then MAME_DIR .. "src/devices/machine/lpc-pit.h", MAME_DIR .. "src/devices/machine/vrc4373.cpp", MAME_DIR .. "src/devices/machine/vrc4373.h", + MAME_DIR .. "src/devices/machine/gt64xxx.cpp", + MAME_DIR .. "src/devices/machine/gt64xxx.h", } end diff --git a/scripts/src/main.lua b/scripts/src/main.lua index c9c99a354c3..a517c39092b 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -103,12 +103,16 @@ end configuration { "mingw*" or "vs*" } targetextension ".exe" + configuration { "rpi" } + targetextension "" + configuration { "asmjs" } targetextension ".bc" if os.getenv("EMSCRIPTEN") then local emccopts = "" emccopts = emccopts .. " -O3" emccopts = emccopts .. " -s USE_SDL=2" + emccopts = emccopts .. " -s USE_SDL_TTF=2" emccopts = emccopts .. " --memory-init-file 0" emccopts = emccopts .. " -s ALLOW_MEMORY_GROWTH=0" emccopts = emccopts .. " -s TOTAL_MEMORY=268435456" diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 6f4d0a7f674..dcce1a8e07b 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -91,6 +91,12 @@ function osdmodulesbuild() MAME_DIR .. "3rdparty/winpcap/Include", MAME_DIR .. "3rdparty/compat/mingw", } + + if _OPTIONS["MODERN_WIN_API"]~="1" then + includedirs { + MAME_DIR .. "3rdparty/compat/winsdk-override", + } + end end if _OPTIONS["NO_OPENGL"]=="1" then diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua index 52a28147c32..7748ff8a419 100644 --- a/scripts/src/osd/osdmini.lua +++ b/scripts/src/osd/osdmini.lua @@ -120,9 +120,9 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", MAME_DIR .. "src/osd/osdmini/minidir.cpp", - MAME_DIR .. "src/osd/osdmini/minifile.cpp", MAME_DIR .. "src/osd/osdmini/minimisc.cpp", MAME_DIR .. "src/osd/osdmini/minitime.cpp", + MAME_DIR .. "src/osd/modules/file/stdfile.cpp", MAME_DIR .. "src/osd/modules/sync/osdsync.cpp", MAME_DIR .. "src/osd/modules/sync/osdsync.h", MAME_DIR .. "src/osd/modules/sync/work_osd.cpp", diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index fa3e85c2454..47a8b0ff3b6 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -94,7 +94,7 @@ function maintargetosdoptions(_target,_subtarget) links { "psapi", } - configuration { "mingw*-gcc" } + configuration { "mingw*" } linkoptions{ "-municode", } @@ -360,6 +360,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/osd/modules/render", MAME_DIR .. "3rdparty", MAME_DIR .. "src/osd/sdl", @@ -460,10 +461,6 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.cpp", MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/sdl/sdldir.cpp", - MAME_DIR .. "src/osd/sdl/sdlfile.cpp", - MAME_DIR .. "src/osd/sdl/sdlfile.h", - MAME_DIR .. "src/osd/sdl/sdlptty_" .. BASE_TARGETOS ..".cpp", - MAME_DIR .. "src/osd/sdl/sdlsocket.cpp", MAME_DIR .. "src/osd/sdl/sdlos_" .. SDLOS_TARGETOS .. ".cpp", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", @@ -474,6 +471,30 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/sync/work_osd.cpp", } + if BASE_TARGETOS=="unix" then + files { + MAME_DIR .. "src/osd/modules/file/posixfile.cpp", + MAME_DIR .. "src/osd/modules/file/posixfile.h", + MAME_DIR .. "src/osd/modules/file/posixptty.cpp", + MAME_DIR .. "src/osd/modules/file/posixsocket.cpp", + } + elseif BASE_TARGETOS=="win32" then + includedirs { + MAME_DIR .. "src/osd/windows", + } + files { + MAME_DIR .. "src/osd/modules/file/winfile.cpp", + MAME_DIR .. "src/osd/modules/file/winfile.h", + MAME_DIR .. "src/osd/modules/file/winptty.cpp", + MAME_DIR .. "src/osd/modules/file/winsocket.cpp", + MAME_DIR .. "src/osd/windows/winutil.cpp", -- FIXME put the necessary functions somewhere more appropriate + } + else + files { + MAME_DIR .. "src/osd/modules/file/stdfile.cpp", + } + end + if _OPTIONS["targetos"]=="macosx" then files { MAME_DIR .. "src/osd/sdl/osxutils.h", diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index 3d5a84783f4..7a692522297 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -101,7 +101,7 @@ if BASE_TARGETOS=="unix" then end if _OPTIONS["targetos"]=="windows" then - configuration { "mingw*-gcc or vs*" } + configuration { "mingw* or vs*" } defines { "UNICODE", "_UNICODE", diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 80360ac2ecb..97880e4a260 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -15,7 +15,7 @@ dofile("modules.lua") function maintargetosdoptions(_target,_subtarget) osdmodulestargetconf() - configuration { "mingw*-gcc" } + configuration { "mingw*" } linkoptions { "-municode", } @@ -144,6 +144,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/osd/modules/render", MAME_DIR .. "3rdparty", } @@ -220,6 +221,7 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "3rdparty", MAME_DIR .. "src/emu", MAME_DIR .. "src/osd", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } @@ -245,19 +247,19 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/strconv.h", MAME_DIR .. "src/osd/windows/main.cpp", MAME_DIR .. "src/osd/windows/windir.cpp", - MAME_DIR .. "src/osd/windows/winfile.cpp", MAME_DIR .. "src/osd/modules/sync/osdsync.cpp", MAME_DIR .. "src/osd/modules/sync/osdsync.h", MAME_DIR .. "src/osd/windows/winutf8.cpp", MAME_DIR .. "src/osd/windows/winutf8.h", MAME_DIR .. "src/osd/windows/winutil.cpp", MAME_DIR .. "src/osd/windows/winutil.h", - MAME_DIR .. "src/osd/windows/winfile.h", MAME_DIR .. "src/osd/windows/winclip.cpp", - MAME_DIR .. "src/osd/windows/winsocket.cpp", - MAME_DIR .. "src/osd/windows/winptty.cpp", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/file/winfile.cpp", + MAME_DIR .. "src/osd/modules/file/winfile.h", + MAME_DIR .. "src/osd/modules/file/winptty.cpp", + MAME_DIR .. "src/osd/modules/file/winsocket.cpp", MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp", MAME_DIR .. "src/osd/modules/sync/work_osd.cpp", } diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua index 3e656017816..b7636e5b435 100644 --- a/scripts/src/osd/windows_cfg.lua +++ b/scripts/src/osd/windows_cfg.lua @@ -5,7 +5,7 @@ defines { "OSD_WINDOWS", } -configuration { "mingw*-gcc or vs*" } +configuration { "mingw* or vs*" } defines { "UNICODE", "_UNICODE", diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua index 6fd7e6398d7..b3d605d9dc7 100644 --- a/scripts/src/sound.lua +++ b/scripts/src/sound.lua @@ -1314,3 +1314,14 @@ if (SOUNDS["VRC6"]~=null) then } end +--------------------------------------------------- +-- AD1848 +--@src/devices/sound/ad1848.h,SOUNDS["AD1848"] = true +--------------------------------------------------- + +if (SOUNDS["AD1848"]~=null) then + files { + MAME_DIR .. "src/devices/sound/ad1848.cpp", + MAME_DIR .. "src/devices/sound/ad1848.h", + } +end diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua index baba88df28c..e69888d53a4 100644 --- a/scripts/src/tests.lua +++ b/scripts/src/tests.lua @@ -40,7 +40,7 @@ end } -project("tests") +project("mametests") uuid ("66d4c639-196b-4065-a411-7ee9266564f5") kind "ConsoleApp" @@ -70,11 +70,13 @@ project("tests") includedirs { MAME_DIR .. "3rdparty/googletest/googletest/include", MAME_DIR .. "src/osd", + MAME_DIR .. "src/emu", MAME_DIR .. "src/lib/util", } files { MAME_DIR .. "tests/main.cpp", MAME_DIR .. "tests/lib/util/corestr.cpp", + MAME_DIR .. "tests/emu/attotime.cpp", } diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index af134d0e77a..0339e9920b2 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -15,19 +15,20 @@ project("romcmp") uuid ("1b40275b-194c-497b-8abd-9338775a21b8") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", "expat", + "7z", "ocore_" .. _OPTIONS["osd"], } @@ -64,13 +65,13 @@ strip() project("chdman") uuid ("7d948868-42db-432a-9bb5-70ce5c5f4620") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -126,13 +127,13 @@ strip() project("jedutil") uuid ("bda60edb-f7f5-489f-b232-23d33c43dda1") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -175,13 +176,13 @@ strip() project("unidasm") uuid ("65f81d3b-299a-4b08-a3fa-d5241afa9fd1") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -189,7 +190,7 @@ links { "dasm", "utils", "expat", - "7z", + "7z", "ocore_" .. _OPTIONS["osd"], } @@ -238,20 +239,20 @@ strip() project("ldresample") uuid ("3401561a-4407-4e13-9c6d-c0801330f7cc") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", "expat", - "7z", + "7z", "ocore_" .. _OPTIONS["osd"], } @@ -299,20 +300,20 @@ strip() project("ldverify") uuid ("3e66560d-b928-4227-928b-eadd0a10f00a") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", "expat", - "7z", + "7z", "ocore_" .. _OPTIONS["osd"], } @@ -360,13 +361,13 @@ strip() project("regrep") uuid ("7f6de580-d800-4e8d-bed6-9fc86829584d") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -409,13 +410,13 @@ strip() project("srcclean") uuid ("4dd58139-313a-42c5-965d-f378bdeed220") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -458,13 +459,13 @@ strip() project("src2html") uuid ("b31e963a-09ef-4696-acbd-e663e35ce6f7") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -507,13 +508,13 @@ strip() project("split") uuid ("8ef6ff18-3199-4cc2-afd0-d64033070faa") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -567,13 +568,13 @@ strip() project("pngcmp") uuid ("61f647d9-b129-409b-9c62-8acf98ed39be") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -616,13 +617,13 @@ strip() project("nltool") uuid ("853a03b7-fa37-41a8-8250-0dc23dd935d6") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -678,13 +679,13 @@ strip() project("nlwav") uuid ("7c5396d1-2a1a-4c93-bed6-6b8fa182054a") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -718,13 +719,13 @@ strip() project("castool") uuid ("7d9ed428-e2ba-4448-832d-d882a64d5c22") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -758,7 +759,7 @@ end includedirs { MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } @@ -780,13 +781,13 @@ strip() project("floptool") uuid ("85d8e3a6-1661-4ac9-8c21-281d20cbaf5b") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -821,7 +822,7 @@ end includedirs { MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } @@ -843,13 +844,13 @@ strip() project("imgtool") uuid ("f3707807-e587-4297-a5d8-bc98f3d0b1ca") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -884,10 +885,10 @@ end includedirs { MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty/zlib", - MAME_DIR .. "src/tools/imgtool", + MAME_DIR .. "src/tools/imgtool", } files { @@ -908,21 +909,21 @@ files { MAME_DIR .. "src/tools/imgtool/imgtool.cpp", MAME_DIR .. "src/tools/imgtool/imgtool.h", MAME_DIR .. "src/tools/imgtool/imgterrs.cpp", - MAME_DIR .. "src/tools/imgtool/imgterrs.h", - MAME_DIR .. "src/tools/imgtool/imghd.cpp", + MAME_DIR .. "src/tools/imgtool/imgterrs.h", + MAME_DIR .. "src/tools/imgtool/imghd.cpp", MAME_DIR .. "src/tools/imgtool/imghd.h", MAME_DIR .. "src/tools/imgtool/charconv.cpp", MAME_DIR .. "src/tools/imgtool/charconv.h", MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.cpp", MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h", MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.cpp", - MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h", + MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h", MAME_DIR .. "src/tools/imgtool/modules/amiga.cpp", MAME_DIR .. "src/tools/imgtool/modules/macbin.cpp", MAME_DIR .. "src/tools/imgtool/modules/rsdos.cpp", MAME_DIR .. "src/tools/imgtool/modules/os9.cpp", MAME_DIR .. "src/tools/imgtool/modules/mac.cpp", - MAME_DIR .. "src/tools/imgtool/modules/ti99.cpp", + MAME_DIR .. "src/tools/imgtool/modules/ti99.cpp", MAME_DIR .. "src/tools/imgtool/modules/ti990hd.cpp", MAME_DIR .. "src/tools/imgtool/modules/concept.cpp", MAME_DIR .. "src/tools/imgtool/modules/fat.cpp", |