summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/osd/sdl.lua
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src/osd/sdl.lua')
-rw-r--r--scripts/src/osd/sdl.lua56
1 files changed, 22 insertions, 34 deletions
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