diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/build/makedep.py | 10 | ||||
-rw-r--r-- | scripts/src/3rdparty.lua | 8 | ||||
-rw-r--r-- | scripts/src/devices.lua | 5 | ||||
-rw-r--r-- | scripts/src/emu.lua | 3 | ||||
-rw-r--r-- | scripts/src/lib.lua | 5 | ||||
-rw-r--r-- | scripts/src/main.lua | 3 | ||||
-rw-r--r-- | scripts/src/netlist.lua | 4 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 4 | ||||
-rw-r--r-- | scripts/src/osd/osdmini.lua | 8 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 56 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 7 | ||||
-rw-r--r-- | scripts/src/tests.lua | 4 | ||||
-rw-r--r-- | scripts/src/tools.lua | 64 | ||||
-rw-r--r-- | scripts/target/ldplayer/ldplayer.lua | 4 | ||||
-rw-r--r-- | scripts/target/mame/arcade.lua | 4 | ||||
-rw-r--r-- | scripts/target/mame/dummy.lua | 4 | ||||
-rw-r--r-- | scripts/target/mame/mess.lua | 4 | ||||
-rw-r--r-- | scripts/target/mame/nl.lua | 4 | ||||
-rw-r--r-- | scripts/target/mame/tiny.lua | 4 |
19 files changed, 25 insertions, 180 deletions
diff --git a/scripts/build/makedep.py b/scripts/build/makedep.py index ac5506e28eb..54be719a807 100644 --- a/scripts/build/makedep.py +++ b/scripts/build/makedep.py @@ -45,7 +45,7 @@ def add_c_if_exists(root, fullname): def add_rest_if_exists(root, srcfile,folder): t = srcfile.rsplit('/', 2) if t[1]=='includes': - t[2] = t[2].replace('.h','.c') + t[2] = t[2].replace('.h','.cpp') t[1] = 'drivers' add_c_if_exists(root,"/".join(t)) parse_file_for_deps(root, "/".join(t), folder) @@ -102,7 +102,7 @@ def parse_file_for_deps(root, srcfile, folder): continue if fullname!='': deps_files_included.append(fullname) - add_c_if_exists(root, fullname.replace('.h','.c')) + add_c_if_exists(root, fullname.replace('.h','.cpp')) add_rest_if_exists(root, fullname,folder) newfolder = fullname.rsplit('/', 1)[0] + '/' parse_file_for_deps(root, fullname, newfolder) @@ -161,7 +161,7 @@ def parse_file(root, srcfile, folder): newfolder = fullname.rsplit('/', 1)[0] + '/' parse_file(root, fullname, newfolder) if (fullname.endswith('.h')): - parse_file(root, fullname.replace('.h','.c'), newfolder) + parse_file(root, fullname.replace('.h','.cpp'), newfolder) continue fp.close() return 0 @@ -280,10 +280,6 @@ if sys.argv[3]=='target': sys.stdout.write(' kind (LIBTYPE)\n') sys.stdout.write(' uuid (os.uuid("drv-mame-%s"))\n' % sys.argv[4]) sys.stdout.write(' \n') - sys.stdout.write(' options {\n') - sys.stdout.write(' "ForceCPP",\n') - sys.stdout.write(' }\n') - sys.stdout.write(' \n') sys.stdout.write(' includedirs {\n') sys.stdout.write(' MAME_DIR .. "src/osd",\n') sys.stdout.write(' MAME_DIR .. "src/emu",\n') diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 06fbc35e71c..665033419d8 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -22,10 +22,6 @@ project "expat" } configuration { } - options { - "ForceCPP", - } - files { MAME_DIR .. "3rdparty/expat/lib/xmlparse.c", MAME_DIR .. "3rdparty/expat/lib/xmlrole.c", @@ -475,10 +471,6 @@ project "jsoncpp" configuration { } - options { - "ForceCPP", - } - includedirs { MAME_DIR .. "3rdparty/jsoncpp/include", } diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua index c46d0db8427..698ff75baee 100644 --- a/scripts/src/devices.lua +++ b/scripts/src/devices.lua @@ -12,7 +12,6 @@ function devicesProject(_target, _subtarget) kind (LIBTYPE) targetsubdir(_target .."_" .. _subtarget) options { - "ForceCPP", "ArchiveSplit", } @@ -53,7 +52,6 @@ if (_OPTIONS["SOURCES"] == nil) then kind (LIBTYPE) targetsubdir(_target .."_" .. _subtarget) options { - "ForceCPP", "ArchiveSplit", } @@ -90,9 +88,6 @@ if #disasm_files > 0 then uuid ("f2d28b0a-6da5-4f78-b629-d834aa00429d") kind (LIBTYPE) targetsubdir(_target .."_" .. _subtarget) - options { - "ForceCPP", - } includedirs { MAME_DIR .. "src/osd", diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index fe22234b18e..2e2361f2572 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -5,9 +5,6 @@ project ("emu") targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"]) uuid ("e6fa15e4-a354-4526-acef-13c8e80fcacf") kind (LIBTYPE) -options { - "ForceCPP", -} includedirs { MAME_DIR .. "src/osd", diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index f4739324d72..85e71249938 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -5,10 +5,6 @@ project "utils" uuid "22489ad0-4cb2-4d91-ad81-24b0d80ca30a" kind (LIBTYPE) - options { - "ForceCPP", - } - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -102,7 +98,6 @@ project "formats" kind (LIBTYPE) options { - "ForceCPP", "ArchiveSplit", } diff --git a/scripts/src/main.lua b/scripts/src/main.lua index e3c7052183c..bcab0964661 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -18,9 +18,6 @@ end uuid (os.uuid(_target .."_" .. _subtarget)) kind "ConsoleApp" - options { - "ForceCPP", - } flags { "NoManifest", "Symbols", -- always include minimum symbols for executables diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 346aea46e18..4634338e96d 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -5,10 +5,6 @@ project "netlist" uuid "665ef8ac-2a4c-4c3e-a05f-fd1e5db11de9" kind (LIBTYPE) - options { - "ForceCPP", - } - includedirs { MAME_DIR .. "src/lib/netlist", MAME_DIR .. "src/osd", diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 658b80d681c..f7911a05047 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -33,10 +33,6 @@ function osdmodulesbuild() "SingleOutputDir", } - options { - "ForceCPP", - } - files { MAME_DIR .. "src/osd/osdnet.cpp", MAME_DIR .. "src/osd/modules/lib/osdobj_common.cpp", diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua index b0c250eac1d..6ec296090e1 100644 --- a/scripts/src/osd/osdmini.lua +++ b/scripts/src/osd/osdmini.lua @@ -13,10 +13,6 @@ project ("osd_" .. _OPTIONS["osd"]) "SingleOutputDir", } - options { - "ForceCPP", - } - dofile("osdmini_cfg.lua") includedirs { @@ -56,10 +52,6 @@ project ("ocore_" .. _OPTIONS["osd"]) uuid (os.uuid("ocore_" .. _OPTIONS["osd"])) kind (LIBTYPE) - options { - "ForceCPP", - } - removeflags { "SingleOutputDir", } diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index c903579426e..e1a002c02b8 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -327,29 +327,29 @@ project ("osd_" .. _OPTIONS["osd"]) if _OPTIONS["targetos"]=="macosx" then files { - MAME_DIR .. "src/osd/modules/debugger/debugosx.m", - MAME_DIR .. "src/osd/modules/debugger/osx/breakpointsview.m", - MAME_DIR .. "src/osd/modules/debugger/osx/consoleview.m", - MAME_DIR .. "src/osd/modules/debugger/osx/debugcommandhistory.m", - MAME_DIR .. "src/osd/modules/debugger/osx/debugconsole.m", - MAME_DIR .. "src/osd/modules/debugger/osx/debugview.m", - MAME_DIR .. "src/osd/modules/debugger/osx/debugwindowhandler.m", - MAME_DIR .. "src/osd/modules/debugger/osx/deviceinfoviewer.m", - MAME_DIR .. "src/osd/modules/debugger/osx/devicesviewer.m", - MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyview.m", - MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyviewer.m", - MAME_DIR .. "src/osd/modules/debugger/osx/errorlogview.m", - MAME_DIR .. "src/osd/modules/debugger/osx/errorlogviewer.m", - MAME_DIR .. "src/osd/modules/debugger/osx/memoryview.m", - MAME_DIR .. "src/osd/modules/debugger/osx/memoryviewer.m", - MAME_DIR .. "src/osd/modules/debugger/osx/pointsviewer.m", - MAME_DIR .. "src/osd/modules/debugger/osx/registersview.m", - MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.m", + MAME_DIR .. "src/osd/modules/debugger/debugosx.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/breakpointsview.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/consoleview.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/debugcommandhistory.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/debugconsole.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/debugview.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/debugwindowhandler.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/deviceinfoviewer.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/devicesviewer.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyview.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/disassemblyviewer.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/errorlogview.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/errorlogviewer.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/memoryview.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/memoryviewer.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/pointsviewer.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/registersview.mm", + MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.mm", } if _OPTIONS["SDL_LIBVER"]=="sdl" then -- SDLMain_tmpl isn't necessary for SDL2 files { - MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.m", + MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.mm", } end end @@ -375,10 +375,6 @@ project ("ocore_" .. _OPTIONS["osd"]) uuid (os.uuid("ocore_" .. _OPTIONS["osd"])) kind (LIBTYPE) - options { - "ForceCPP", - } - removeflags { "SingleOutputDir", } @@ -418,7 +414,7 @@ project ("ocore_" .. _OPTIONS["osd"]) if _OPTIONS["targetos"]=="macosx" then files { - MAME_DIR .. "src/osd/sdl/osxutils.m", + MAME_DIR .. "src/osd/sdl/osxutils.mm", } end @@ -432,10 +428,6 @@ if _OPTIONS["with-tools"] then uuid ("744cec21-c3b6-4d69-93cb-6811fed0ffe3") kind "ConsoleApp" - options { - "ForceCPP", - } - flags { "Symbols", -- always include minimum symbols for executables } @@ -482,7 +474,7 @@ if _OPTIONS["with-tools"] then elseif _OPTIONS["targetos"] == "macosx" and _OPTIONS["SDL_LIBVER"] == "sdl" then -- SDLMain_tmpl isn't necessary for SDL2 files { - MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.m", + MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.mm", } end end @@ -497,10 +489,6 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then uuid ("3db8316d-fad7-4f5b-b46a-99373c91550e") kind "ConsoleApp" - options { - "ForceCPP", - } - flags { "Symbols", -- always include minimum symbols for executables } @@ -528,6 +516,6 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then } files { - MAME_DIR .. "src/osd/sdl/aueffectutil.m", + MAME_DIR .. "src/osd/sdl/aueffectutil.mm", } end diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index c822be8c2d1..69e3e6d173a 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -160,9 +160,6 @@ project ("ocore_" .. _OPTIONS["osd"]) uuid (os.uuid("ocore_" .. _OPTIONS["osd"])) kind (LIBTYPE) - options { - "ForceCPP", - } removeflags { "SingleOutputDir", } @@ -221,10 +218,6 @@ if _OPTIONS["with-tools"] then uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0") kind "ConsoleApp" - options { - "ForceCPP", - } - flags { "Symbols", -- always include minimum symbols for executables } diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua index 4dab11a4c10..dceec272600 100644 --- a/scripts/src/tests.lua +++ b/scripts/src/tests.lua @@ -9,10 +9,6 @@ project("tests") uuid ("66d4c639-196b-4065-a411-7ee9266564f5") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 6fe29e1ca89..de0b72a04d0 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -9,10 +9,6 @@ project("romcmp") uuid ("1b40275b-194c-497b-8abd-9338775a21b8") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -54,10 +50,6 @@ project("chdman") uuid ("7d948868-42db-432a-9bb5-70ce5c5f4620") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -112,10 +104,6 @@ project("jedutil") uuid ("bda60edb-f7f5-489f-b232-23d33c43dda1") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -157,10 +145,6 @@ project("unidasm") uuid ("65f81d3b-299a-4b08-a3fa-d5241afa9fd1") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -218,10 +202,6 @@ project("ldresample") uuid ("3401561a-4407-4e13-9c6d-c0801330f7cc") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -275,10 +255,6 @@ project("ldverify") uuid ("3e66560d-b928-4227-928b-eadd0a10f00a") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -332,10 +308,6 @@ project("regrep") uuid ("7f6de580-d800-4e8d-bed6-9fc86829584d") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -377,10 +349,6 @@ project("srcclean") uuid ("4dd58139-313a-42c5-965d-f378bdeed220") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -422,10 +390,6 @@ project("src2html") uuid ("b31e963a-09ef-4696-acbd-e663e35ce6f7") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -467,10 +431,6 @@ project("split") uuid ("8ef6ff18-3199-4cc2-afd0-d64033070faa") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -523,10 +483,6 @@ project("pngcmp") uuid ("61f647d9-b129-409b-9c62-8acf98ed39be") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -568,10 +524,6 @@ project("nltool") uuid ("853a03b7-fa37-41a8-8250-0dc23dd935d6") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -626,10 +578,6 @@ project("nlwav") uuid ("7c5396d1-2a1a-4c93-bed6-6b8fa182054a") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -662,10 +610,6 @@ project("castool") uuid ("7d9ed428-e2ba-4448-832d-d882a64d5c22") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -720,10 +664,6 @@ project("floptool") uuid ("85d8e3a6-1661-4ac9-8c21-281d20cbaf5b") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } @@ -779,10 +719,6 @@ project("imgtool") uuid ("f3707807-e587-4297-a5d8-bc98f3d0b1ca") kind "ConsoleApp" -options { - "ForceCPP", -} - flags { "Symbols", -- always include minimum symbols for executables } diff --git a/scripts/target/ldplayer/ldplayer.lua b/scripts/target/ldplayer/ldplayer.lua index c4649576c3b..1f4aafcd69f 100644 --- a/scripts/target/ldplayer/ldplayer.lua +++ b/scripts/target/ldplayer/ldplayer.lua @@ -57,10 +57,6 @@ function createProjects_ldplayer_ldplayer(_target, _subtarget) kind (LIBTYPE) uuid (os.uuid("drvldplayer")) - options { - "ForceCPP", - } - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index f1efb799c8e..5c05c22f717 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -765,10 +765,6 @@ function createMAMEProjects(_target, _subtarget, _name) kind (LIBTYPE) uuid (os.uuid("drv-" .. _target .."_" .. _subtarget .. "_" .._name)) - options { - "ForceCPP", - } - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", diff --git a/scripts/target/mame/dummy.lua b/scripts/target/mame/dummy.lua index 9b86a52633d..26635ba80a5 100644 --- a/scripts/target/mame/dummy.lua +++ b/scripts/target/mame/dummy.lua @@ -18,10 +18,6 @@ function createProjects_mame_dummy(_target, _subtarget) kind (LIBTYPE) uuid (os.uuid("drv-mame_dummy")) - options { - "ForceCPP", - } - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index c6816a22b1c..a7481cb3e73 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -880,10 +880,6 @@ function createMESSProjects(_target, _subtarget, _name) kind (LIBTYPE) uuid (os.uuid("drv-" .. _target .."_" .. _subtarget .. "_" .._name)) - options { - "ForceCPP", - } - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua index e7baf905f7f..d6eacd7a707 100644 --- a/scripts/target/mame/nl.lua +++ b/scripts/target/mame/nl.lua @@ -85,10 +85,6 @@ function createProjects_mame_nl(_target, _subtarget) kind (LIBTYPE) uuid (os.uuid("drv-mame-nl")) - options { - "ForceCPP", - } - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua index 99529931e65..589f1452d9a 100644 --- a/scripts/target/mame/tiny.lua +++ b/scripts/target/mame/tiny.lua @@ -81,10 +81,6 @@ function createProjects_mame_tiny(_target, _subtarget) kind (LIBTYPE) uuid (os.uuid("drv-mame-tiny")) - options { - "ForceCPP", - } - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", |