diff options
author | 2016-03-02 21:49:49 +0100 | |
---|---|---|
committer | 2016-03-02 21:49:49 +0100 | |
commit | 9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch) | |
tree | 3911b611dd010a4108b90fb8b8c82116eec21117 /scripts/src | |
parent | dbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff) | |
parent | 1914702e6fae052668df5b068a502bca57c9a3b0 (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')
-rw-r--r-- | scripts/src/3rdparty.lua | 536 | ||||
-rw-r--r-- | scripts/src/bus.lua | 15 | ||||
-rw-r--r-- | scripts/src/emu.lua | 6 | ||||
-rw-r--r-- | scripts/src/lib.lua | 2 | ||||
-rw-r--r-- | scripts/src/main.lua | 77 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 20 | ||||
-rw-r--r-- | scripts/src/osd/osdmini.lua | 46 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 166 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 38 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 16 |
10 files changed, 743 insertions, 179 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 8ef18689e66..82fb09947de 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -60,7 +60,7 @@ project "zlib" local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then - configuration { "gmake or xcode4" } + configuration { "gmake" } if (version >= 30700) then buildoptions { "-Wno-shift-negative-value", @@ -85,7 +85,7 @@ end "verbose=-1", } - configuration { "gmake or xcode4" } + configuration { "gmake" } buildoptions_c { "-Wno-strict-prototypes", } @@ -271,7 +271,7 @@ end "HAVE_CONFIG_H=1", } - configuration { "gmake or xcode4"} + configuration { "gmake"} buildoptions_c { "-Wno-unused-function", "-O0", @@ -384,7 +384,7 @@ project "lua" -- "ForceCPP", --} - configuration { "gmake or xcode4" } + configuration { "gmake" } buildoptions_c { "-Wno-bad-function-cast" } @@ -406,7 +406,7 @@ end "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", } @@ -480,6 +480,11 @@ project "lualibs" "/wd4130", -- warning C4130: '==': logical operation on address of string constant } + configuration { "pnacl"} + buildoptions { + "-Wno-char-subscripts", + } + configuration { } defines { "LUA_COMPAT_ALL", @@ -508,7 +513,7 @@ project "lualibs" -------------------------------------------------- -- luv lua library objects -------------------------------------------------- - +if _OPTIONS["USE_LIBUV"]=="1" then project "luv" uuid "d98ec5ca-da2a-4a50-88a2-52061ca53871" kind "StaticLib" @@ -518,20 +523,25 @@ project "luv" "_WIN32_WINNT=0x0600", } end + configuration { "vs*" } buildoptions { "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data } - configuration { "gmake or xcode4" } + configuration { "gmake" } buildoptions_c { "-Wno-unused-function", "-Wno-strict-prototypes", "-Wno-unused-variable", - "-Wno-maybe-uninitialized", "-Wno-undef", } + configuration { "not android-*" } + buildoptions_c { + "-Wno-maybe-uninitialized", + } + configuration { "vs2015" } buildoptions { "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used @@ -557,7 +567,7 @@ project "luv" MAME_DIR .. "3rdparty/luv/src/luv.c", MAME_DIR .. "3rdparty/luv/src/luv.h", } - +end -------------------------------------------------- -- SQLite3 library objects -------------------------------------------------- @@ -581,14 +591,17 @@ 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 } - configuration { "gmake or xcode4" } + configuration { "gmake" } buildoptions_c { "-Wno-bad-function-cast", "-Wno-undef", @@ -737,6 +750,11 @@ end MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", } + configuration { "android-*"} + buildoptions { + "-Wno-macro-redefined", + } + configuration { "vs*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/msvc", @@ -761,7 +779,7 @@ end MAME_DIR .. "3rdparty/bx/include/compat/freebsd", } - configuration { "gmake or xcode4" } + configuration { "gmake" } buildoptions { "-Wno-uninitialized", "-Wno-unused-function", @@ -864,7 +882,7 @@ end "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } - configuration { "gmake or xcode4" } + configuration { "gmake" } buildoptions_c { "-Wno-strict-prototypes", "-Wno-bad-function-cast", @@ -878,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", @@ -989,6 +1007,7 @@ end -------------------------------------------------- -- libuv library objects -------------------------------------------------- +if _OPTIONS["USE_LIBUV"]=="1" then project "uv" uuid "cd2afe7f-139d-49c3-9000-fc9119f3cea0" kind "StaticLib" @@ -999,7 +1018,7 @@ project "uv" MAME_DIR .. "3rdparty/libuv/src/win", } - configuration { "gmake or xcode4" } + configuration { "gmake" } buildoptions_c { "-Wno-strict-prototypes", "-Wno-bad-function-cast", @@ -1012,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", @@ -1138,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__", @@ -1159,7 +1197,7 @@ project "uv" "-Wshadow" } end - +end -------------------------------------------------- -- HTTP parser library objects -------------------------------------------------- @@ -1178,3 +1216,467 @@ 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/audio/android/SDL_androidaudio.h", + MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.c", + MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.h", + 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_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/timer/unix/SDL_systimer_c.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidclipboard.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidclipboard.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidevents.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidevents.h", + 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_androidkeyboard.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmessagebox.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmessagebox.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmouse.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmouse.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidtouch.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidtouch.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidvideo.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidvideo.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidwindow.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidwindow.h", + } + 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/bus.lua b/scripts/src/bus.lua index 9514e9f5a74..1379c572fa8 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -2572,3 +2572,18 @@ if (BUSES["M5"]~=null) then } end +--------------------------------------------------- +-- +--@src/devices/bus/newbrain/exp.h,BUSES["NEWBRAIN"] = true +--------------------------------------------------- + +if (BUSES["NEWBRAIN"]~=null) then + files { + MAME_DIR .. "src/devices/bus/newbrain/exp.cpp", + MAME_DIR .. "src/devices/bus/newbrain/exp.h", + MAME_DIR .. "src/devices/bus/newbrain/eim.cpp", + MAME_DIR .. "src/devices/bus/newbrain/eim.h", + MAME_DIR .. "src/devices/bus/newbrain/fdc.cpp", + MAME_DIR .. "src/devices/bus/newbrain/fdc.h", + } +end diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index c4bb8ece0cf..c834c314c77 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -87,6 +87,7 @@ files { MAME_DIR .. "src/emu/devfind.h", MAME_DIR .. "src/emu/device.cpp", MAME_DIR .. "src/emu/device.h", + MAME_DIR .. "src/emu/device.ipp", MAME_DIR .. "src/emu/didisasm.cpp", MAME_DIR .. "src/emu/didisasm.h", MAME_DIR .. "src/emu/diexec.cpp", @@ -157,6 +158,7 @@ files { MAME_DIR .. "src/emu/mame.h", MAME_DIR .. "src/emu/machine.cpp", MAME_DIR .. "src/emu/machine.h", + MAME_DIR .. "src/emu/machine.ipp", MAME_DIR .. "src/emu/mconfig.cpp", MAME_DIR .. "src/emu/mconfig.h", MAME_DIR .. "src/emu/memarray.cpp", @@ -411,8 +413,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/lib.lua b/scripts/src/lib.lua index 7620389f5dc..6890bceb5bc 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -85,6 +85,7 @@ project "utils" MAME_DIR .. "src/lib/util/pool.h", MAME_DIR .. "src/lib/util/sha1.cpp", MAME_DIR .. "src/lib/util/sha1.h", + MAME_DIR .. "src/lib/util/strformat.h", MAME_DIR .. "src/lib/util/tagmap.h", MAME_DIR .. "src/lib/util/unicode.cpp", MAME_DIR .. "src/lib/util/unicode.h", @@ -94,6 +95,7 @@ project "utils" MAME_DIR .. "src/lib/util/un7z.h", MAME_DIR .. "src/lib/util/vbiparse.cpp", MAME_DIR .. "src/lib/util/vbiparse.h", + MAME_DIR .. "src/lib/util/vecstream.h", MAME_DIR .. "src/lib/util/xmlfile.cpp", MAME_DIR .. "src/lib/util/xmlfile.h", MAME_DIR .. "src/lib/util/zippath.cpp", diff --git a/scripts/src/main.lua b/scripts/src/main.lua index b8125bf1989..eafcc59f72e 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 { @@ -142,11 +161,15 @@ end "7z", "lua", "lualibs", - "luv", - "uv", - "http-parser", } + if _OPTIONS["USE_LIBUV"]=="1" then + links { + "luv", + "uv", + "http-parser", + } + end if _OPTIONS["with-bundled-zlib"] then links { "zlib", @@ -257,15 +280,42 @@ end } if (_OPTIONS["SOURCES"] == nil) then - dependency { - { "../../../../generated/mame/mame/drivlist.cpp", MAME_DIR .. "src/mame/mess.lst", true }, - { "../../../../generated/mame/mame/drivlist.cpp" , MAME_DIR .. "src/mame/arcade.lst", true}, - } - custombuildtask { - { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, - } + + if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt") then + dependency { + { + GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, + } + custombuildtask { + { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) $(2) $(<) > $(@)" }}, + } + else + if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst") then + custombuildtask { + { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, + } + else + dependency { + { + GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, + } + custombuildtask { + { MAME_DIR .. "src/".._target .."/" .. _target ..".lst" , GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, + } + end + end end +if (_OPTIONS["SOURCES"] ~= nil) then + dependency { + { + GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, + } + custombuildtask { + { GEN_DIR .. _target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) $(2) $(<) > $(@)" }}, + } +end + if _OPTIONS["FORCE_VERSION_COMPILE"]=="1" then configuration { "gmake" } dependency { @@ -285,13 +335,6 @@ end 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", "\\") , } - if (_OPTIONS["osd"] == "sdl") then - configuration { "x64","vs*" } - prelinkcommands { "copy " .. path.translate(MAME_DIR .."3rdparty/sdl2/lib/x64/SDL2.dll", "\\") .. " " .. path.translate(MAME_DIR .."SDL2.dll","\\") .. " /Y" } - configuration { "x32","vs*" } - prelinkcommands { "copy " .. path.translate(MAME_DIR .."3rdparty/sdl2/lib/x86/SDL2.dll", "\\") .. " " .. path.translate(MAME_DIR .."SDL2.dll","\\") .. " /Y" } - end - configuration { } debugdir (MAME_DIR) diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 1dfa4317a48..54443d4f618 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -56,6 +56,7 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp", MAME_DIR .. "src/osd/modules/font/font_sdl.cpp", MAME_DIR .. "src/osd/modules/font/font_windows.cpp", + MAME_DIR .. "src/osd/modules/font/font_dwrite.cpp", MAME_DIR .. "src/osd/modules/font/font_osx.cpp", MAME_DIR .. "src/osd/modules/font/font_none.cpp", MAME_DIR .. "src/osd/modules/netdev/taptun.cpp", @@ -69,6 +70,20 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp", MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp", MAME_DIR .. "src/osd/modules/sound/none.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", } if _OPTIONS["targetos"]=="windows" then @@ -110,6 +125,7 @@ function osdmodulesbuild() 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", @@ -399,7 +415,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" @@ -454,7 +470,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..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", } diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 76947ad777a..fa3e85c2454 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -48,34 +48,52 @@ function maintargetosdoptions(_target,_subtarget) end if _OPTIONS["targetos"]=="windows" then - if _OPTIONS["USE_LIBSDL"]~="1" then + if _OPTIONS["with-bundled-sdl2"]~=nil then configuration { "mingw*"} links { - "SDL2.dll", - } - configuration { "x64","vs*" } - libdirs { - MAME_DIR .. "3rdparty/sdl2/lib/x64", - } - configuration { "x32","vs*" } - libdirs { - MAME_DIR .. "3rdparty/sdl2/lib/x86", + "SDL2", + "Imm32", + "Version", + "Ole32", + "OleAut32", } - - configuration { "vs*"} + configuration { "vs*" } links { "SDL2", + "Imm32", + "Version", } configuration { } else - local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") - addlibfromstring(str) - addoptionsfromstring(str) + 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", @@ -84,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 { @@ -105,8 +115,16 @@ function maintargetosdoptions(_target,_subtarget) links { "psapi" } - configuration { } + + if _OPTIONS["targetos"]=="macosx" then + if _OPTIONS["with-bundled-sdl2"]~=nil then + links { + "SDL2", + } + end + end + end @@ -141,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" @@ -204,34 +222,28 @@ end BASE_TARGETOS = "unix" SDLOS_TARGETOS = "unix" -SYNC_IMPLEMENTATION = "tc" SDL_NETWORK = "" if _OPTIONS["targetos"]=="linux" then SDL_NETWORK = "taptun" elseif _OPTIONS["targetos"]=="openbsd" then - SYNC_IMPLEMENTATION = "ntc" elseif _OPTIONS["targetos"]=="netbsd" then - SYNC_IMPLEMENTATION = "ntc" SDL_NETWORK = "pcap" elseif _OPTIONS["targetos"]=="haiku" then - SYNC_IMPLEMENTATION = "ntc" elseif _OPTIONS["targetos"]=="asmjs" then - SYNC_IMPLEMENTATION = "mini" elseif _OPTIONS["targetos"]=="windows" then BASE_TARGETOS = "win32" SDLOS_TARGETOS = "win32" - SYNC_IMPLEMENTATION = "windows" SDL_NETWORK = "pcap" 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["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")) @@ -243,22 +255,35 @@ if BASE_TARGETOS=="unix" then "-framework QuartzCore", "-framework OpenGL", } + + if os_version>=101100 then linkoptions { "-weak_framework Metal", } end - if _OPTIONS["USE_LIBSDL"]~="1" then - linkoptions { - "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], - } - links { - "SDL2.framework", - } + if _OPTIONS["with-bundled-sdl2"]~=nil then + linkoptions { + "-framework AudioUnit", + "-framework CoreAudio", + "-framework Carbon", + "-framework ForceFeedback", + "-framework IOKit", + "-framework CoreVideo", + } else - local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'") - addlibfromstring(str) - addoptionsfromstring(str) + if _OPTIONS["USE_LIBSDL"]~="1" then + linkoptions { + "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], + } + links { + "SDL2.framework", + } + else + local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'") + addlibfromstring(str) + addoptionsfromstring(str) + end end else if _OPTIONS["NO_X11"]=="1" then @@ -270,9 +295,16 @@ if BASE_TARGETOS=="unix" then "/usr/openwin/lib", } 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", @@ -290,13 +322,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"]) @@ -393,8 +418,6 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/sdl/sdlprefix.h", MAME_DIR .. "src/osd/sdl/sdlmain.cpp", MAME_DIR .. "src/osd/osdepend.h", - MAME_DIR .. "src/osd/sdl/input.cpp", - MAME_DIR .. "src/osd/sdl/input.h", MAME_DIR .. "src/osd/sdl/video.cpp", MAME_DIR .. "src/osd/sdl/video.h", MAME_DIR .. "src/osd/sdl/window.cpp", @@ -446,20 +469,11 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/osdmodule.h", MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp", MAME_DIR .. "src/osd/modules/lib/osdlib.h", - MAME_DIR .. "src/osd/modules/sync/sync_" .. SYNC_IMPLEMENTATION .. ".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", } - if _OPTIONS["NOASM"]=="1" then - files { - MAME_DIR .. "src/osd/modules/sync/work_mini.cpp", - } - else - files { - MAME_DIR .. "src/osd/modules/sync/work_osd.cpp", - } - end - if _OPTIONS["targetos"]=="macosx" then files { MAME_DIR .. "src/osd/sdl/osxutils.h", @@ -507,17 +521,11 @@ if _OPTIONS["with-tools"] then links { "SDL2.dll", } - configuration { "x64","vs*" } - libdirs { - MAME_DIR .. "3rdparty/sdl2/lib/x64", - } - configuration { "x32","vs*" } - libdirs { - MAME_DIR .. "3rdparty/sdl2/lib/x86", - } - configuration { "vs*"} + configuration { "vs*" } links { "SDL2", + "Imm32", + "Version", } configuration { } else diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index e3a6f913e75..3d5a84783f4 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -67,7 +67,6 @@ end defines { "OSD_SDL", - "SYNC_IMPLEMENTATION=" .. SYNC_IMPLEMENTATION, } if BASE_TARGETOS=="unix" then @@ -75,18 +74,20 @@ if BASE_TARGETOS=="unix" then "SDLMAME_UNIX", } if _OPTIONS["targetos"]=="macosx" 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 + 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"), @@ -111,10 +112,6 @@ if _OPTIONS["targetos"]=="windows" then defines { "MALLOC_DEBUG", } - configuration { "vs*" } - includedirs { - MAME_DIR .. "3rdparty/sdl2/include", - } configuration { } elseif _OPTIONS["targetos"]=="linux" then @@ -137,13 +134,6 @@ 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", - } - buildoptions { - backtick(sdlconfigcmd() .. " --cflags"), - } end configuration { "osx*" } diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index 154d4732bc1..877d1503915 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -163,8 +163,6 @@ project ("osd_" .. _OPTIONS["osd"]) 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.cpp", - MAME_DIR .. "src/osd/windows/input.h", MAME_DIR .. "src/osd/windows/output.cpp", MAME_DIR .. "src/osd/windows/output.h", MAME_DIR .. "src/osd/windows/video.cpp", @@ -226,7 +224,6 @@ project ("ocore_" .. _OPTIONS["osd"]) BASE_TARGETOS = "win32" SDLOS_TARGETOS = "win32" - SYNC_IMPLEMENTATION = "windows" includedirs { MAME_DIR .. "src/osd/windows", @@ -247,7 +244,7 @@ project ("ocore_" .. _OPTIONS["osd"]) 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/sync_windows.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", @@ -260,18 +257,9 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp", + MAME_DIR .. "src/osd/modules/sync/work_osd.cpp", } - if _OPTIONS["NOASM"] == "1" then - files { - MAME_DIR .. "src/osd/modules/sync/work_mini.cpp", - } - else - files { - MAME_DIR .. "src/osd/modules/sync/work_osd.cpp", - } - end - -------------------------------------------------- -- ledutil |