summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua587
-rw-r--r--scripts/src/emu.lua10
-rw-r--r--scripts/src/machine.lua12
-rw-r--r--scripts/src/main.lua56
-rw-r--r--scripts/src/osd/modules.lua65
-rw-r--r--scripts/src/osd/osdmini.lua4
-rw-r--r--scripts/src/osd/sdl.lua241
-rw-r--r--scripts/src/osd/sdl_cfg.lua69
-rw-r--r--scripts/src/osd/windows.lua10
-rw-r--r--scripts/src/osd/windows_cfg.lua2
-rw-r--r--scripts/src/tools.lua111
11 files changed, 957 insertions, 210 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 16b86dcbe21..85e69a27591 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -280,6 +280,11 @@ end
buildoptions {
"-Wno-enum-conversion",
}
+ if _OPTIONS["targetos"]=="macosx" then
+ buildoptions_c {
+ "-Wno-unknown-attributes",
+ }
+ end
end
configuration { }
@@ -398,8 +403,10 @@ end
configuration { }
defines {
"LUA_COMPAT_ALL",
+ "LUA_COMPAT_5_1",
+ "LUA_COMPAT_5_2",
}
- if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then
+ if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") and not (_OPTIONS["targetos"]=="pnacl") then
defines {
"LUA_USE_POSIX",
}
@@ -458,20 +465,24 @@ links {
end
--------------------------------------------------
--- sqlite3 lua library objects
+-- small lua library objects
--------------------------------------------------
-project "lsqlite3"
+project "lualibs"
uuid "1d84edab-94cf-48fb-83ee-b75bc697660e"
kind "StaticLib"
- -- options {
- -- "ForceCPP",
- -- }
-
configuration { "vs*" }
buildoptions {
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
+ "/wd4055", -- warning C4055: 'type cast': from data pointer 'void *' to function pointer 'xxx'
+ "/wd4152", -- warning C4152: nonstandard extension, function/data pointer conversion in expression
+ "/wd4130", -- warning C4130: '==': logical operation on address of string constant
+ }
+
+ configuration { "pnacl"}
+ buildoptions {
+ "-Wno-char-subscripts",
}
configuration { }
@@ -487,12 +498,77 @@ project "lsqlite3"
MAME_DIR .. "3rdparty/lua/src",
}
end
+ if _OPTIONS["with-bundled-zlib"] then
+ includedirs {
+ MAME_DIR .. "3rdparty/zlib",
+ }
+ end
files {
MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c",
+ MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c",
+ MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c",
}
--------------------------------------------------
+-- luv lua library objects
+--------------------------------------------------
+if _OPTIONS["USE_LIBUV"]=="1" then
+project "luv"
+ uuid "d98ec5ca-da2a-4a50-88a2-52061ca53871"
+ kind "StaticLib"
+
+ if _OPTIONS["targetos"]=="windows" then
+ defines {
+ "_WIN32_WINNT=0x0600",
+ }
+ end
+
+ configuration { "vs*" }
+ buildoptions {
+ "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
+ }
+
+ configuration { "gmake" }
+ buildoptions_c {
+ "-Wno-unused-function",
+ "-Wno-strict-prototypes",
+ "-Wno-unused-variable",
+ "-Wno-undef",
+ }
+
+ configuration { "not android-*" }
+ buildoptions_c {
+ "-Wno-maybe-uninitialized",
+ }
+
+ configuration { "vs2015" }
+ buildoptions {
+ "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
+ "/wd4703", -- warning C4703: potentially uninitialized local pointer variable 'xxx' used
+ }
+
+ configuration { }
+ defines {
+ "LUA_COMPAT_ALL",
+ }
+
+ includedirs {
+ MAME_DIR .. "3rdparty/lua/src",
+ MAME_DIR .. "3rdparty/libuv/include",
+ }
+ if _OPTIONS["with-bundled-lua"] then
+ includedirs {
+ MAME_DIR .. "3rdparty/luv/deps/lua/src",
+ }
+ end
+
+ files {
+ MAME_DIR .. "3rdparty/luv/src/luv.c",
+ MAME_DIR .. "3rdparty/luv/src/luv.h",
+ }
+end
+--------------------------------------------------
-- SQLite3 library objects
--------------------------------------------------
@@ -515,7 +591,10 @@ if _OPTIONS["vs"]=="intel-15" then
"/Qwd2557", -- remark #2557: comparison between signed and unsigned operands
}
end
-
+ configuration { "pnacl" }
+ defines {
+ "SQLITE_OMIT_LOAD_EXTENSION",
+ }
configuration { "vs2015" }
buildoptions {
"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
@@ -639,7 +718,6 @@ end
-- BGFX library objects
--------------------------------------------------
-if (USE_BGFX == 1) then
project "bgfx"
uuid "d3e7e119-35cf-4f4f-aba0-d3bdcd1b879a"
kind "StaticLib"
@@ -664,10 +742,19 @@ end
MAME_DIR .. "3rdparty/bgfx/include",
MAME_DIR .. "3rdparty/bgfx/3rdparty",
MAME_DIR .. "3rdparty/bx/include",
- MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
MAME_DIR .. "3rdparty/bgfx/3rdparty/dxsdk/include",
}
+ configuration { "not steamlink"}
+ includedirs {
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
+ }
+
+ configuration { "android-*"}
+ buildoptions {
+ "-Wno-macro-redefined",
+ }
+
configuration { "vs*" }
includedirs {
MAME_DIR .. "3rdparty/bx/include/compat/msvc",
@@ -677,7 +764,7 @@ end
MAME_DIR .. "3rdparty/bx/include/compat/mingw",
}
- configuration { "osx*" }
+ configuration { "osx* or xcode4" }
includedirs {
MAME_DIR .. "3rdparty/bx/include/compat/osx",
}
@@ -763,7 +850,6 @@ end
MAME_DIR .. "3rdparty/bgfx/src/renderer_mtl.mm",
}
end
-end
--------------------------------------------------
-- PortAudio library objects
@@ -810,7 +896,7 @@ end
local version = str_to_version(_OPTIONS["gcc_version"])
if (_OPTIONS["gcc"]~=nil) then
- if string.find(_OPTIONS["gcc"], "clang") then
+ if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
buildoptions_c {
"-Wno-unknown-warning-option",
"-Wno-absolute-value",
@@ -921,6 +1007,7 @@ end
--------------------------------------------------
-- libuv library objects
--------------------------------------------------
+if _OPTIONS["USE_LIBUV"]=="1" then
project "uv"
uuid "cd2afe7f-139d-49c3-9000-fc9119f3cea0"
kind "StaticLib"
@@ -944,7 +1031,7 @@ project "uv"
local version = str_to_version(_OPTIONS["gcc_version"])
if (_OPTIONS["gcc"]~=nil) then
- if string.find(_OPTIONS["gcc"], "clang") then
+ if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
buildoptions_c {
"-Wno-unknown-warning-option",
"-Wno-unknown-attributes",
@@ -1070,6 +1157,25 @@ project "uv"
MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c",
}
end
+
+ if _OPTIONS["targetos"]=="android" then
+ defines {
+ "_GNU_SOURCE",
+ }
+ buildoptions {
+ "-Wno-header-guard",
+ }
+ files {
+ MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/linux-core.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/linux-inotify.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.h",
+ MAME_DIR .. "3rdparty/libuv/src/unix/pthread-fixes.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/android-ifaddrs.c",
+ }
+ end
+
if _OPTIONS["targetos"]=="solaris" then
defines {
"__EXTENSIONS__",
@@ -1091,7 +1197,7 @@ project "uv"
"-Wshadow"
}
end
-
+end
--------------------------------------------------
-- HTTP parser library objects
--------------------------------------------------
@@ -1110,3 +1216,454 @@ project "http-parser"
"-Wshadow"
}
end
+
+--------------------------------------------------
+-- SDL2 library
+--------------------------------------------------
+if _OPTIONS["with-bundled-sdl2"] then
+project "SDL2"
+ uuid "caab3327-574f-4abf-b25b-74d5238ae59b"
+ kind "StaticLib"
+
+ configuration { }
+
+ files {
+ MAME_DIR .. "3rdparty/SDL2/include/begin_code.h",
+ MAME_DIR .. "3rdparty/SDL2/include/close_code.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_assert.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_atomic.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_audio.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_bits.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_blendmode.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_clipboard.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_config.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_config_windows.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_copying.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_cpuinfo.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_egl.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_endian.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_error.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_events.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_filesystem.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_gamecontroller.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_gesture.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_haptic.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_hints.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_joystick.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_keyboard.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_keycode.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_loadso.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_log.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_main.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_messagebox.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_mouse.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_mutex.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_name.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengl.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengl_glext.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2_gl2.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2_gl2ext.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2_gl2platform.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2_khrplatform.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_pixels.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_platform.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_power.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_quit.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_rect.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_render.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_revision.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_rwops.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_scancode.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_shape.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_stdinc.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_surface.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_system.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_syswm.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_assert.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_common.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_compare.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_crc32.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_font.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_fuzzer.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_harness.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_images.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_log.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_md5.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_test_random.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_thread.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_timer.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_touch.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_types.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_version.h",
+ MAME_DIR .. "3rdparty/SDL2/include/SDL_video.h",
+
+
+ MAME_DIR .. "3rdparty/SDL2/src/atomic/SDL_atomic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/atomic/SDL_spinlock.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/disk/SDL_diskaudio.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/disk/SDL_diskaudio.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/dummy/SDL_dummyaudio.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/dummy/SDL_dummyaudio.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audio.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audio_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiocvt.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiodev.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiodev_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiomem.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiotypecvt.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_mixer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_sysaudio.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_wave.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_wave.h",
+ MAME_DIR .. "3rdparty/SDL2/src/cpuinfo/SDL_cpuinfo.c",
+ MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi.c",
+ MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi.h",
+ MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi_overrides.h",
+ MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi_procs.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/blank_cursor.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/default_cursor.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_clipboardevents.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_clipboardevents_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_dropevents.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_dropevents_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_events.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_events_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_gesture.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_gesture_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_keyboard.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_keyboard_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_mouse.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_mouse_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_quit.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_sysevents.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_touch.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_touch_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_windowevents.c",
+ MAME_DIR .. "3rdparty/SDL2/src/events/SDL_windowevents_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/file/SDL_rwops.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/SDL_haptic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/SDL_syshaptic.h",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/SDL_gamecontroller.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/SDL_joystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/SDL_joystick_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/SDL_sysjoystick.h",
+ MAME_DIR .. "3rdparty/SDL2/src/loadso/windows/SDL_sysloadso.c",
+ MAME_DIR .. "3rdparty/SDL2/src/power/SDL_power.c",
+ MAME_DIR .. "3rdparty/SDL2/src/power/windows/SDL_syspower.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/direct3d/SDL_render_d3d.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/direct3d11/SDL_render_d3d11.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/mmx.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengl/SDL_render_gl.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengl/SDL_shaders_gl.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengl/SDL_shaders_gl.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengles2/SDL_render_gles2.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengles2/SDL_shaders_gles2.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_d3dmath.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_d3dmath.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_render.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_sysrender.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_yuv_mmx.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_yuv_sw.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/SDL_yuv_sw_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendfillrect.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendfillrect.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendline.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendline.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendpoint.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendpoint.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_draw.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_drawline.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_drawline.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_drawpoint.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_drawpoint.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_render_sw.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_render_sw_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_rotate.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_rotate.h",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL.c",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL_assert.c",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL_error.c",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL_error_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL_hints.c",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL_hints_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/SDL_log.c",
+ MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_getenv.c",
+ MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_iconv.c",
+ MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_malloc.c",
+ MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_qsort.c",
+ MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_stdlib.c",
+ MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_string.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/generic/SDL_syscond.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/SDL_systhread.h",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/SDL_thread.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/SDL_thread_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/SDL_systimer.h",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/SDL_timer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/SDL_timer_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullevents.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullevents_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullframebuffer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullframebuffer_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullvideo.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullvideo.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_0.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_1.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_A.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_auto.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_auto.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_copy.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_copy.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_N.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_slow.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_slow.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_bmp.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_clipboard.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_egl.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_fillrect.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_glesfuncs.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_glfuncs.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_pixels.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_pixels_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_rect.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_rect_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_RLEaccel.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_RLEaccel_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_shape.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_shape_internals.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_stretch.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_surface.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_sysvideo.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/SDL_video.c",
+
+ }
+ if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="windows" then
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/libm/e_atan2.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/e_log.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/e_pow.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/e_rem_pio2.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/e_sqrt.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/k_cos.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/k_rem_pio2.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/k_sin.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/k_tan.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/math.h",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/math_private.h",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_atan.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_copysign.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_cos.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_fabs.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_floor.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_scalbn.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_sin.c",
+ MAME_DIR .. "3rdparty/SDL2/src/libm/s_tan.c",
+ }
+ end
+ if _OPTIONS["targetos"]~="windows" then
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengles/SDL_render_gles.c",
+ MAME_DIR .. "3rdparty/SDL2/src/render/opengles/SDL_glesfuncs.h",
+ }
+ end
+
+ if _OPTIONS["targetos"]=="android" then
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/audio/android/SDL_androidaudio.c",
+ MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.c",
+ MAME_DIR .. "3rdparty/SDL2/src/filesystem/android/SDL_sysfilesystem.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/dummy/SDL_syshaptic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/android/SDL_sysjoystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/loadso/dlopen/SDL_sysloadso.c",
+ MAME_DIR .. "3rdparty/SDL2/src/power/android/SDL_syspower.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syscond.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syssem.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systhread.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systls.c",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/unix/SDL_systimer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidclipboard.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidevents.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidgl.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidkeyboard.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmessagebox.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmouse.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidtouch.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidvideo.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidwindow.c",
+ }
+ end
+
+ if _OPTIONS["targetos"]=="macosx" then
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/audio/coreaudio/SDL_coreaudio.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/coreaudio/SDL_coreaudio.h",
+ MAME_DIR .. "3rdparty/SDL2/src/file/cocoa/SDL_rwopsbundlesupport.m",
+ MAME_DIR .. "3rdparty/SDL2/src/file/cocoa/SDL_rwopsbundlesupport.h",
+ MAME_DIR .. "3rdparty/SDL2/src/filesystem/cocoa/SDL_sysfilesystem.m",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/darwin/SDL_syshaptic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/darwin/SDL_syshaptic_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/darwin/SDL_sysjoystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/darwin/SDL_sysjoystick_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/loadso/dlopen/SDL_sysloadso.c",
+ MAME_DIR .. "3rdparty/SDL2/src/power/macosx/SDL_syspower.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syscond.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syssem.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systhread.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systhread_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systls.c",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/unix/SDL_systimer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaclipboard.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaclipboard.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaevents.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaevents.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoakeyboard.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoakeyboard.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamessagebox.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamessagebox.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamodes.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamodes.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamouse.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamouse.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamousetap.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamousetap.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaopengl.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaopengl.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoashape.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoashape.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoavideo.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoavideo.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoawindow.m",
+ MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoawindow.h",
+
+ }
+ end
+
+ if _OPTIONS["targetos"]=="windows" then
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/audio/directsound/SDL_directsound.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/directsound/SDL_directsound.h",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/winmm/SDL_winmm.c",
+ MAME_DIR .. "3rdparty/SDL2/src/audio/winmm/SDL_winmm.h",
+ MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_directx.h",
+ MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_windows.c",
+ MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_windows.h",
+ MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_xinput.c",
+ MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_xinput.h",
+ MAME_DIR .. "3rdparty/SDL2/src/filesystem/windows/SDL_sysfilesystem.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_dinputhaptic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_dinputhaptic_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_windowshaptic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_windowshaptic_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_xinputhaptic.c",
+ MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_xinputhaptic_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_dinputjoystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_dinputjoystick_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_mmjoystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_windowsjoystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_windowsjoystick_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_xinputjoystick.c",
+ MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_xinputjoystick_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_sysmutex.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_syssem.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_systhread.c",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_systhread_c.h",
+ MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_systls.c",
+ MAME_DIR .. "3rdparty/SDL2/src/timer/windows/SDL_systimer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_vkeys.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsclipboard.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsclipboard.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsevents.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsevents.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsframebuffer.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsframebuffer.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowskeyboard.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowskeyboard.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmessagebox.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmessagebox.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmodes.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmodes.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmouse.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmouse.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsopengl.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsopengl.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsopengles.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsshape.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsshape.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsvideo.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsvideo.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowswindow.c",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowswindow.h",
+ MAME_DIR .. "3rdparty/SDL2/src/video/windows/wmmsg.h",
+ MAME_DIR .. "3rdparty/SDL2/src/main/windows/version.rc",
+ }
+ end
+
+ configuration { "vs*" }
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/audio/xaudio2/SDL_xaudio2.c",
+ }
+
+ buildoptions {
+ "/wd4200", -- warning C4200: nonstandard extension used: zero-sized array in struct/union
+ "/wd4055", -- warning C4055: 'type cast': from data pointer 'void *' to function pointer 'xxx'
+ "/wd4152", -- warning C4152: nonstandard extension, function/data pointer conversion in expression
+ "/wd4057", -- warning C4057: 'function': 'xxx' differs in indirection to slightly different base types from 'xxx'
+ "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
+ "/wd4204", -- warning C4204: nonstandard extension used: non-constant aggregate initializer
+ "/wd4054", -- warning C4054: 'type cast': from function pointer 'xxx' to data pointer 'xxx'
+ }
+ defines {
+ "HAVE_LIBC",
+ }
+
+ configuration { "mingw*"}
+ includedirs {
+ MAME_DIR .. "3rdparty/SDL2-override/mingw",
+ MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
+ }
+ buildoptions_c {
+ "-Wno-undef",
+ "-Wno-strict-prototypes",
+ "-Wno-bad-function-cast",
+ "-Wno-discarded-qualifiers",
+ "-Wno-unused-but-set-variable",
+ }
+
+ configuration { "osx*"}
+ buildoptions {
+ "-Wno-undef",
+ }
+ buildoptions_objc {
+ "-x objective-c",
+ "-std=c99",
+ }
+
+ buildoptions_c {
+ "-Wno-bad-function-cast",
+ }
+
+ configuration { "android-*"}
+ defines {
+ "GL_GLEXT_PROTOTYPES",
+ }
+ buildoptions_c {
+ "-Wno-bad-function-cast",
+ "-Wno-incompatible-pointer-types-discards-qualifiers",
+ "-Wno-unneeded-internal-declaration",
+ "-Wno-unused-const-variable",
+ }
+
+ configuration { }
+ includedirs {
+ MAME_DIR .. "3rdparty/SDL2/include",
+ }
+
+end \ No newline at end of file
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index e0358285114..683e4a2e16f 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -16,7 +16,9 @@ kind (LIBTYPE)
addprojectflags()
precompiledheaders()
-
+options {
+ "ArchiveSplit",
+}
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
@@ -149,6 +151,8 @@ files {
MAME_DIR .. "src/emu/inpttype.h",
MAME_DIR .. "src/emu/luaengine.cpp",
MAME_DIR .. "src/emu/luaengine.h",
+ MAME_DIR .. "src/emu/language.cpp",
+ MAME_DIR .. "src/emu/language.h",
MAME_DIR .. "src/emu/mame.cpp",
MAME_DIR .. "src/emu/mame.h",
MAME_DIR .. "src/emu/machine.cpp",
@@ -407,8 +411,8 @@ dependency {
}
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" }},
- { 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" }},
+ { 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" }},
+ { 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" }},
layoutbuildtask("emu/layout", "dualhovu"),
layoutbuildtask("emu/layout", "dualhsxs"),
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 5a97d22d015..fbc923b3073 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -773,6 +773,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/hp_taco.h,MACHINES["HP_TACO"] = true
+---------------------------------------------------
+
+if (MACHINES["HP_TACO"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/hp_taco.cpp",
+ MAME_DIR .. "src/devices/machine/hp_taco.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/i2cmem.h,MACHINES["I2CMEM"] = true
---------------------------------------------------
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 2397a489e00..cf4e311ef59 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -25,6 +25,25 @@ else
end
uuid (os.uuid(_target .."_" .. _subtarget))
kind "ConsoleApp"
+
+ configuration { "android*" }
+ targetextension ".so"
+ linkoptions {
+ "-shared",
+ }
+ links {
+ "EGL",
+ "GLESv2",
+ }
+ configuration { "pnacl" }
+ kind "ConsoleApp"
+ targetextension ".pexe"
+ links {
+ "ppapi",
+ "ppapi_gles2",
+ "pthread",
+ }
+ configuration { }
addprojectflags()
flags {
@@ -87,8 +106,21 @@ end
configuration { "asmjs" }
targetextension ".bc"
if os.getenv("EMSCRIPTEN") then
+ local emccopts = ""
+ emccopts = emccopts .. " -O3"
+ emccopts = emccopts .. " -s USE_SDL=2"
+ emccopts = emccopts .. " --memory-init-file 0"
+ emccopts = emccopts .. " -s ALLOW_MEMORY_GROWTH=0"
+ emccopts = emccopts .. " -s TOTAL_MEMORY=268435456"
+ emccopts = emccopts .. " -s DISABLE_EXCEPTION_CATCHING=2"
+ emccopts = emccopts .. " -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\"]'"
+ emccopts = emccopts .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN10ui_manager12set_show_fpsEb', '__ZNK10ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\""
+ emccopts = emccopts .. " --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js"
+ emccopts = emccopts .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/sdl/emscripten_post.js"
+ emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx@bgfx"
+ emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "shaders/gles@shaders/gles"
postbuildcommands {
- os.getenv("EMSCRIPTEN") .. "/emcc -O3 -s DISABLE_EXCEPTION_CATCHING=2 -s USE_SDL=2 --memory-init-file 0 -s ALLOW_MEMORY_GROWTH=0 -s TOTAL_MEMORY=268435456 -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\"]' -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN10ui_manager12set_show_fpsEb', '__ZNK10ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\" $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js --post-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/sdl/emscripten_post.js",
+ os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js",
}
end
@@ -128,11 +160,16 @@ end
"jpeg",
"7z",
"lua",
- "lsqlite3",
- "uv",
- "http-parser",
+ "lualibs",
}
+ if _OPTIONS["USE_LIBUV"]=="1" then
+ links {
+ "luv",
+ "uv",
+ "http-parser",
+ }
+ end
if _OPTIONS["with-bundled-zlib"] then
links {
"zlib",
@@ -168,12 +205,8 @@ end
"portmidi",
}
end
- if (USE_BGFX == 1) then
- links {
- "bgfx"
- }
- end
- links{
+ links {
+ "bgfx",
"ocore_" .. _OPTIONS["osd"],
}
@@ -274,8 +307,7 @@ end
"@echo Emitting ".. rctarget .. "vers.rc...",
PYTHON .. " " .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.cpp","\\") .. " > " .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") ,
}
-
-
+
configuration { }
debugdir (MAME_DIR)
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index c7ebb399be8..6be181c46a8 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -102,7 +102,6 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.h",
MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.h",
MAME_DIR .. "src/osd/modules/opengl/osd_opengl.h",
- MAME_DIR .. "src/osd/modules/opengl/SDL1211_opengl.h",
}
defines {
"USE_OPENGL=1",
@@ -114,18 +113,40 @@ function osdmodulesbuild()
end
end
- if USE_BGFX == 1 then
- files {
- MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp",
- }
- defines {
- "USE_BGFX"
- }
- includedirs {
- MAME_DIR .. "3rdparty/bgfx/include",
- MAME_DIR .. "3rdparty/bx/include",
- }
- end
+ files {
+ MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp",
+ MAME_DIR .. "src/osd/modules/render/binpacker.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/blendreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/cullreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/depthreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/effect.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/effectmanager.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/effectreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chain.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainmanager.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainentry.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/chainentryreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/inputpair.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/shadermanager.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/statereader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/slider.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/sliderreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/parameter.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/paramreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/target.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/targetmanager.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/texture.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/texturemanager.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/uniform.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/uniformreader.cpp",
+ MAME_DIR .. "src/osd/modules/render/bgfx/writereader.cpp",
+ }
+ includedirs {
+ MAME_DIR .. "3rdparty/bgfx/include",
+ MAME_DIR .. "3rdparty/bx/include",
+ MAME_DIR .. "3rdparty/rapidjson/include",
+ }
if _OPTIONS["NO_USE_MIDI"]=="1" then
defines {
@@ -369,14 +390,6 @@ newoption {
},
}
-if not _OPTIONS["NO_OPENGL"] then
- if _OPTIONS["targetos"]=="os2" then
- _OPTIONS["NO_OPENGL"] = "1"
- else
- _OPTIONS["NO_OPENGL"] = "0"
- end
-end
-
newoption {
trigger = "USE_DISPATCH_GL",
description = "Use GL-dispatching",
@@ -387,11 +400,7 @@ newoption {
}
if not _OPTIONS["USE_DISPATCH_GL"] then
- if USE_BGFX == 1 then
- _OPTIONS["USE_DISPATCH_GL"] = "0"
- else
- _OPTIONS["USE_DISPATCH_GL"] = "1"
- end
+ _OPTIONS["USE_DISPATCH_GL"] = "0"
end
newoption {
@@ -404,7 +413,7 @@ newoption {
}
if not _OPTIONS["NO_USE_MIDI"] then
- if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then
+ if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then
_OPTIONS["NO_USE_MIDI"] = "1"
else
_OPTIONS["NO_USE_MIDI"] = "0"
@@ -459,7 +468,7 @@ newoption {
if not _OPTIONS["USE_QTDEBUG"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then
_OPTIONS["USE_QTDEBUG"] = "0"
else
_OPTIONS["USE_QTDEBUG"] = "1"
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
index b05839e7873..76bb2ac97de 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",
@@ -118,6 +116,8 @@ project ("ocore_" .. _OPTIONS["osd"])
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",
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 6f52f1879ba..5a64013ffdf 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -39,34 +39,61 @@ function maintargetosdoptions(_target,_subtarget)
end
if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" then
- if _OPTIONS["SDL_LIBVER"]=="sdl2" then
- links {
- "SDL2_ttf",
- }
- else
- links {
- "SDL_ttf",
- }
- end
+ links {
+ "SDL2_ttf",
+ }
local str = backtick("pkg-config --libs fontconfig")
addlibfromstring(str)
addoptionsfromstring(str)
end
if _OPTIONS["targetos"]=="windows" then
- if _OPTIONS["SDL_LIBVER"]=="sdl2" then
- links {
- "SDL2.dll",
- }
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
+ configuration { "mingw*"}
+ links {
+ "SDL2",
+ "Imm32",
+ "Version",
+ "Ole32",
+ "OleAut32",
+ }
+ configuration { "vs*" }
+ links {
+ "SDL2",
+ "Imm32",
+ "Version",
+ }
+ configuration { }
else
- links {
- "SDL.dll",
- }
+ if _OPTIONS["USE_LIBSDL"]~="1" then
+ configuration { "mingw*"}
+ links {
+ "SDL2.dll",
+ }
+ configuration { "vs*" }
+ links {
+ "SDL2",
+ "Imm32",
+ "Version",
+ }
+ configuration { }
+ else
+ local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
+ end
+ configuration { "x32", "vs*" }
+ libdirs {
+ path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86")
+ }
+ configuration { "x64", "vs*" }
+ libdirs {
+ path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64")
+ }
end
links {
"psapi",
}
-
configuration { "mingw*-gcc" }
linkoptions{
"-municode",
@@ -75,14 +102,6 @@ function maintargetosdoptions(_target,_subtarget)
flags {
"Unicode",
}
- configuration { "x32", "vs*" }
- libdirs {
- path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86")
- }
- configuration { "x64", "vs*" }
- libdirs {
- path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64")
- }
configuration {}
elseif _OPTIONS["targetos"]=="haiku" then
links {
@@ -93,16 +112,29 @@ function maintargetosdoptions(_target,_subtarget)
configuration { "mingw*" or "vs*" }
targetprefix "sdl"
-
+ links {
+ "psapi"
+ }
configuration { }
+
+ if _OPTIONS["targetos"]=="macosx" then
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
+ links {
+ "SDL2",
+ }
+ end
+ end
+
end
function sdlconfigcmd()
- if not _OPTIONS["SDL_INSTALL_ROOT"] then
- return _OPTIONS["SDL_LIBVER"] .. "-config"
+ if _OPTIONS["targetos"]=="asmjs" then
+ return "sdl2-config"
+ elseif not _OPTIONS["SDL_INSTALL_ROOT"] then
+ return _OPTIONS['TOOLCHAIN'] .. "pkg-config sdl2"
else
- return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin",_OPTIONS["SDL_LIBVER"]) .. "-config"
+ return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin","sdl2") .. "-config"
end
end
@@ -127,7 +159,7 @@ newoption {
}
if not _OPTIONS["NO_X11"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="os2" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" then
_OPTIONS["NO_X11"] = "1"
else
_OPTIONS["NO_X11"] = "0"
@@ -148,23 +180,6 @@ if not _OPTIONS["NO_USE_XINPUT"] then
end
newoption {
- trigger = "SDL_LIBVER",
- description = "Choose SDL version",
- allowed = {
- { "sdl", "SDL" },
- { "sdl2", "SDL 2" },
- },
-}
-
-if not _OPTIONS["SDL_LIBVER"] then
- if _OPTIONS["targetos"]=="os2" then
- _OPTIONS["SDL_LIBVER"] = "sdl"
- else
- _OPTIONS["SDL_LIBVER"] = "sdl2"
- end
-end
-
-newoption {
trigger = "SDL2_MULTIAPI",
description = "Use couriersud's multi-keyboard patch for SDL 2.1? (this API was removed prior to the 2.0 release)",
allowed = {
@@ -192,16 +207,16 @@ if not _OPTIONS["SDL_FRAMEWORK_PATH"] then
end
newoption {
- trigger = "MACOSX_USE_LIBSDL",
- description = "Use SDL library on OS (rather than framework)",
+ trigger = "USE_LIBSDL",
+ description = "Use SDL library on OS (rather than framework/dll)",
allowed = {
- { "0", "Use framework" },
+ { "0", "Use framework/dll" },
{ "1", "Use library" },
},
}
-if not _OPTIONS["MACOSX_USE_LIBSDL"] then
- _OPTIONS["MACOSX_USE_LIBSDL"] = "0"
+if not _OPTIONS["USE_LIBSDL"] then
+ _OPTIONS["USE_LIBSDL"] = "0"
end
@@ -229,16 +244,13 @@ elseif _OPTIONS["targetos"]=="macosx" then
SDLOS_TARGETOS = "macosx"
SYNC_IMPLEMENTATION = "ntc"
SDL_NETWORK = "pcap"
-elseif _OPTIONS["targetos"]=="os2" then
- BASE_TARGETOS = "os2"
- SDLOS_TARGETOS = "os2"
- SYNC_IMPLEMENTATION = "os2"
end
-if _OPTIONS["SDL_LIBVER"]=="sdl" then
- USE_BGFX = 0
+if _OPTIONS["with-bundled-sdl2"]~=nil then
+ includedirs {
+ GEN_DIR .. "includes",
+ }
end
-
if BASE_TARGETOS=="unix" then
if _OPTIONS["targetos"]=="macosx" then
local os_version = str_to_version(backtick("sw_vers -productVersion"))
@@ -250,48 +262,56 @@ if BASE_TARGETOS=="unix" then
"-framework QuartzCore",
"-framework OpenGL",
}
+
+
if os_version>=101100 then
linkoptions {
"-weak_framework Metal",
}
end
- if _OPTIONS["MACOSX_USE_LIBSDL"]~="1" then
- linkoptions {
- "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
- }
- if _OPTIONS["SDL_LIBVER"]=="sdl2" then
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
+ linkoptions {
+ "-framework AudioUnit",
+ "-framework CoreAudio",
+ "-framework Carbon",
+ "-framework ForceFeedback",
+ "-framework IOKit",
+ "-framework CoreVideo",
+ }
+ else
+ if _OPTIONS["USE_LIBSDL"]~="1" then
+ linkoptions {
+ "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
+ }
links {
"SDL2.framework",
}
else
- links {
- "SDL.framework",
- }
+ local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
end
- else
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'")
- addlibfromstring(str)
- addoptionsfromstring(str)
end
else
if _OPTIONS["NO_X11"]=="1" then
_OPTIONS["USE_QTDEBUG"] = "0"
- USE_BGFX = 0
else
libdirs {
"/usr/X11/lib",
"/usr/X11R6/lib",
"/usr/openwin/lib",
}
- if _OPTIONS["SDL_LIBVER"]=="sdl" then
- links {
- "X11",
- }
- end
end
- local str = backtick(sdlconfigcmd() .. " --libs")
- addlibfromstring(str)
- addoptionsfromstring(str)
+ if _OPTIONS["with-bundled-sdl2"]~=nil then
+ links {
+ "SDL2",
+ }
+ else
+ local str = backtick(sdlconfigcmd() .. " --libs")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
+ end
+
if _OPTIONS["targetos"]~="haiku" then
links {
"m",
@@ -309,13 +329,6 @@ if BASE_TARGETOS=="unix" then
end
end
end
-elseif BASE_TARGETOS=="os2" then
- local str = backtick(sdlconfigcmd() .. " --libs")
- addlibfromstring(str)
- addoptionsfromstring(str)
- links {
- "pthread"
- }
end
project ("qtdbg_" .. _OPTIONS["osd"])
@@ -404,13 +417,6 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/debugosx.h",
}
- if _OPTIONS["SDL_LIBVER"]=="sdl" then
- -- SDLMain_tmpl isn't necessary for SDL2
- files {
- MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.mm",
- MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.h",
- }
- end
end
files {
@@ -423,18 +429,17 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/sdl/video.h",
MAME_DIR .. "src/osd/sdl/window.cpp",
MAME_DIR .. "src/osd/sdl/window.h",
+ MAME_DIR .. "src/osd/modules/osdwindow.cpp",
MAME_DIR .. "src/osd/modules/osdwindow.h",
MAME_DIR .. "src/osd/sdl/output.cpp",
MAME_DIR .. "src/osd/sdl/watchdog.cpp",
MAME_DIR .. "src/osd/sdl/watchdog.h",
MAME_DIR .. "src/osd/modules/render/drawsdl.cpp",
}
- if _OPTIONS["SDL_LIBVER"]=="sdl2" then
- files {
- MAME_DIR .. "src/osd/modules/render/draw13.cpp",
- MAME_DIR .. "src/osd/modules/render/blit13.h",
- }
- end
+ files {
+ MAME_DIR .. "src/osd/modules/render/draw13.cpp",
+ MAME_DIR .. "src/osd/modules/render/blit13.h",
+ }
project ("ocore_" .. _OPTIONS["osd"])
@@ -527,14 +532,22 @@ if _OPTIONS["with-tools"] then
}
if _OPTIONS["targetos"] == "windows" then
- if _OPTIONS["SDL_LIBVER"] == "sdl2" then
- links {
- "SDL2.dll",
- }
+ if _OPTIONS["USE_LIBSDL"]~="1" then
+ configuration { "mingw*"}
+ links {
+ "SDL2.dll",
+ }
+ configuration { "vs*" }
+ links {
+ "SDL2",
+ "Imm32",
+ "Version",
+ }
+ configuration { }
else
- links {
- "SDL.dll",
- }
+ local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
end
links {
"psapi",
@@ -545,12 +558,14 @@ if _OPTIONS["with-tools"] then
files {
MAME_DIR .. "src/osd/sdl/main.cpp",
}
- 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.mm",
- }
end
+
+ configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+ configuration { }
+
+ strip()
end
@@ -592,4 +607,6 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then
files {
MAME_DIR .. "src/osd/sdl/aueffectutil.mm",
}
+
+ strip()
end
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 2dc1a7e465a..641a00b924e 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -56,18 +56,12 @@ if _OPTIONS["NO_USE_MIDI"]~="1" and _OPTIONS["targetos"]=="linux" then
}
end
-if _OPTIONS["SDL_LIBVER"]=="sdl2" then
- defines {
- "SDLMAME_SDL2=1",
- }
- if _OPTIONS["SDL2_MULTIAPI"]=="1" then
- defines {
- "SDL2_MULTIAPI",
- }
- end
-else
+defines {
+ "SDLMAME_SDL2=1",
+}
+if _OPTIONS["SDL2_MULTIAPI"]=="1" then
defines {
- "SDLMAME_SDL2=0",
+ "SDL2_MULTIAPI",
}
end
@@ -81,18 +75,20 @@ if BASE_TARGETOS=="unix" then
"SDLMAME_UNIX",
}
if _OPTIONS["targetos"]=="macosx" then
- if _OPTIONS["MACOSX_USE_LIBSDL"]~="1" then
- buildoptions {
- "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
- }
- else
- defines {
- "MACOSX_USE_LIBSDL",
- }
- buildoptions {
- backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
- }
- end
+ if _OPTIONS["with-bundled-sdl2"]==nil then
+ if _OPTIONS["USE_LIBSDL"]~="1" then
+ buildoptions {
+ "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
+ }
+ else
+ defines {
+ "MACOSX_USE_LIBSDL",
+ }
+ buildoptions {
+ backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
+ }
+ end
+ end
else
buildoptions {
backtick(sdlconfigcmd() .. " --cflags"),
@@ -117,10 +113,6 @@ if _OPTIONS["targetos"]=="windows" then
defines {
"MALLOC_DEBUG",
}
- configuration { "vs*" }
- includedirs {
- path.join(_OPTIONS["SDL_INSTALL_ROOT"],"include")
- }
configuration { }
elseif _OPTIONS["targetos"]=="linux" then
@@ -143,11 +135,22 @@ elseif _OPTIONS["targetos"]=="freebsd" then
-- /usr/local/include is not considered a system include director on FreeBSD. GL.h resides there and throws warnings
"-isystem /usr/local/include",
}
-elseif _OPTIONS["targetos"]=="os2" then
- defines {
- "SDLMAME_OS2",
+end
+
+configuration { "osx*" }
+ includedirs {
+ MAME_DIR .. "3rdparty/bx/include/compat/osx",
}
- buildoptions {
- backtick(sdlconfigcmd() .. " --cflags"),
+
+configuration { "freebsd" }
+ includedirs {
+ MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
}
-end
+
+configuration { "netbsd" }
+ includedirs {
+ MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
+ }
+
+configuration { }
+
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 2957f7ade9f..059c46ccbb4 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -152,16 +152,17 @@ project ("osd_" .. _OPTIONS["osd"])
}
files {
- MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
- MAME_DIR .. "src/osd/modules/render/drawd3d.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp",
+ MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h",
- MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
- MAME_DIR .. "src/osd/modules/render/drawdd.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawd3d.h",
MAME_DIR .. "src/osd/modules/render/drawgdi.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawgdi.h",
MAME_DIR .. "src/osd/modules/render/drawnone.cpp",
+ MAME_DIR .. "src/osd/modules/render/drawnone.h",
MAME_DIR .. "src/osd/windows/input.h",
MAME_DIR .. "src/osd/windows/output.cpp",
MAME_DIR .. "src/osd/windows/output.h",
@@ -169,6 +170,7 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/windows/video.h",
MAME_DIR .. "src/osd/windows/window.cpp",
MAME_DIR .. "src/osd/windows/window.h",
+ MAME_DIR .. "src/osd/modules/osdwindow.cpp",
MAME_DIR .. "src/osd/modules/osdwindow.h",
MAME_DIR .. "src/osd/windows/winmenu.cpp",
MAME_DIR .. "src/osd/windows/winmain.cpp",
diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua
index 19ef05c3ce9..3e656017816 100644
--- a/scripts/src/osd/windows_cfg.lua
+++ b/scripts/src/osd/windows_cfg.lua
@@ -50,7 +50,7 @@ end
if _OPTIONS["USE_SDL"]=="1" then
defines {
- "SDLMAME_SDL2=0",
+ "SDLMAME_SDL2=1",
"USE_XINPUT=0",
"USE_SDL=1",
"USE_SDL_SOUND",
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 19942651f0c..421f5cc76b5 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -50,6 +50,13 @@ files {
MAME_DIR .. "src/tools/romcmp.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- chdman
--------------------------------------------------
@@ -104,6 +111,13 @@ files {
MAME_DIR .. "src/version.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- jedutil
--------------------------------------------------
@@ -145,6 +159,13 @@ files {
MAME_DIR .. "src/tools/jedutil.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- unidasm
--------------------------------------------------
@@ -201,6 +222,12 @@ files {
MAME_DIR .. "src/emu/emucore.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
--------------------------------------------------
-- ldresample
@@ -255,6 +282,13 @@ files {
MAME_DIR .. "src/tools/ldresample.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- ldverify
--------------------------------------------------
@@ -308,6 +342,13 @@ files {
MAME_DIR .. "src/tools/ldverify.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- regrep
--------------------------------------------------
@@ -349,6 +390,13 @@ files {
MAME_DIR .. "src/tools/regrep.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- srcclean
---------------------------------------------------
@@ -390,6 +438,13 @@ files {
MAME_DIR .. "src/tools/srcclean.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- src2html
--------------------------------------------------
@@ -431,6 +486,13 @@ files {
MAME_DIR .. "src/tools/src2html.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- split
--------------------------------------------------
@@ -483,6 +545,13 @@ files {
MAME_DIR .. "src/tools/split.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- pngcmp
--------------------------------------------------
@@ -524,6 +593,13 @@ files {
MAME_DIR .. "src/tools/pngcmp.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- nltool
--------------------------------------------------
@@ -578,6 +654,13 @@ files {
MAME_DIR .. "src/lib/netlist/prg/nltool.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- nlwav
--------------------------------------------------
@@ -610,6 +693,13 @@ files {
MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- castool
--------------------------------------------------
@@ -664,6 +754,13 @@ files {
MAME_DIR .. "src/tools/castool.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- floptool
--------------------------------------------------
@@ -719,6 +816,13 @@ files {
MAME_DIR .. "src/tools/floptool.cpp",
}
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()
+
--------------------------------------------------
-- imgtool
--------------------------------------------------
@@ -822,3 +926,10 @@ files {
MAME_DIR .. "src/tools/imgtool/modules/bml3.cpp",
MAME_DIR .. "src/tools/imgtool/modules/hp48.cpp",
}
+
+configuration { "mingw*" or "vs*" }
+ targetextension ".exe"
+
+configuration { }
+
+strip()