summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/osd/osdmini.lua
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
committer ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
commit9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch)
tree3911b611dd010a4108b90fb8b8c82116eec21117 /scripts/src/osd/osdmini.lua
parentdbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff)
parent1914702e6fae052668df5b068a502bca57c9a3b0 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
# Resolved Conflicts: # src/osd/modules/render/d3d/d3dhlsl.cpp # src/osd/windows/winmain.cpp
Diffstat (limited to 'scripts/src/osd/osdmini.lua')
-rw-r--r--scripts/src/osd/osdmini.lua46
1 files changed, 22 insertions, 24 deletions
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
index b05839e7873..cc794ae88df 100644
--- a/scripts/src/osd/osdmini.lua
+++ b/scripts/src/osd/osdmini.lua
@@ -58,8 +58,6 @@ project ("osd_" .. _OPTIONS["osd"])
}
files {
- MAME_DIR .. "src/osd/osdnet.cpp",
- MAME_DIR .. "src/osd/osdnet.h",
MAME_DIR .. "src/osd/osdmini/minimain.cpp",
MAME_DIR .. "src/osd/osdmini/osdmini.h",
MAME_DIR .. "src/osd/osdepend.h",
@@ -76,10 +74,24 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/midi/none.cpp",
MAME_DIR .. "src/osd/modules/sound/js_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/direct_sound.cpp",
- MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp",
+ MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/none.cpp",
MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_module.h",
+ MAME_DIR .. "src/osd/modules/input/input_common.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_common.h",
+ MAME_DIR .. "src/osd/modules/input/input_dinput.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_none.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_rawinput.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_win32.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_sdl.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_sdlcommon.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_sdlcommon.h",
+ MAME_DIR .. "src/osd/modules/input/input_x11.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_windows.cpp",
+ MAME_DIR .. "src/osd/modules/input/input_windows.h",
+ MAME_DIR .. "src/osd/modules/input/input_xinput.cpp",
}
project ("ocore_" .. _OPTIONS["osd"])
@@ -98,33 +110,19 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
}
-
- if _OPTIONS["targetos"]=="linux" then
- BASE_TARGETOS = "unix"
- SDLOS_TARGETOS = "unix"
- SYNC_IMPLEMENTATION = "tc"
- end
-
- if _OPTIONS["targetos"]=="windows" then
- BASE_TARGETOS = "win32"
- SDLOS_TARGETOS = "win32"
- SYNC_IMPLEMENTATION = "windows"
- end
-
- if _OPTIONS["targetos"]=="macosx" then
- BASE_TARGETOS = "unix"
- SDLOS_TARGETOS = "macosx"
- SYNC_IMPLEMENTATION = "ntc"
- end
-
+
files {
+ MAME_DIR .. "src/osd/osdnet.cpp",
+ MAME_DIR .. "src/osd/osdnet.h",
MAME_DIR .. "src/osd/osdcore.cpp",
MAME_DIR .. "src/osd/osdcore.h",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
- MAME_DIR .. "src/osd/modules/osdmodule.h",
+ 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/sync/work_mini.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",
}