summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua512
-rw-r--r--scripts/src/main.lua14
-rw-r--r--scripts/src/osd/modules.lua12
-rw-r--r--scripts/src/osd/sdl.lua108
-rw-r--r--scripts/src/osd/sdl_cfg.lua28
-rw-r--r--scripts/src/tools.lua50
6 files changed, 79 insertions, 645 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index fb79e05a44d..3ce8267723c 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -750,6 +750,11 @@ if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") and str_to_ver
}
end
+ configuration { "android-*" }
+ buildoptions {
+ "-Wno-misleading-indentation",
+ }
+
configuration { "asmjs" }
buildoptions {
"-Wno-misleading-indentation",
@@ -1656,513 +1661,6 @@ links {
end
end
-
---------------------------------------------------
--- SDL2 library
---------------------------------------------------
-if _OPTIONS["with-bundled-sdl2"] then
-project "SDL2"
- uuid "caab3327-574f-4abf-b25b-74d5238ae59b"
-if _OPTIONS["targetos"]=="android" then
- kind "SharedLib"
- targetextension ".so"
- targetprefix "lib"
- links {
- "GLESv1_CM",
- "GLESv2",
- "log",
- "OpenSLES",
- "c++_static"
- }
- linkoptions {
- "-Wl,-soname,libSDL2.so",
- }
-
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- if _OPTIONS["PLATFORM"]=="arm" then
- targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a")
- end
- if _OPTIONS["PLATFORM"]=="arm64" then
- targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a")
- end
- if _OPTIONS["PLATFORM"]=="x86" then
- targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86")
- end
- if _OPTIONS["PLATFORM"]=="x64" then
- targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86_64")
- end
- end
-
- strip()
-else
- kind "StaticLib"
-end
-
- 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_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/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/opensl_io.h",
- MAME_DIR .. "3rdparty/SDL2/src/audio/android/opensl_io.c",
- MAME_DIR .. "3rdparty/SDL2/src/audio/android/SDL_androidaudio.h",
- 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/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.m",
- 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/thread/generic/SDL_syscond.c",
- 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-bad-function-cast",
- "-Wno-discarded-qualifiers",
- "-Wno-format",
- "-Wno-format-security",
- "-Wno-pointer-to-int-cast",
- "-Wno-strict-prototypes",
- "-Wno-undef",
- "-Wno-unused-but-set-variable",
- }
-
- configuration { "mingw-clang"}
- buildoptions_c {
- "-Wno-incompatible-pointer-types-discards-qualifiers"
- }
-
- configuration { "osx*"}
- buildoptions {
- "-Wno-undef",
- }
- buildoptions_objc {
- "-x objective-c",
- "-std=c99",
- }
-
- buildoptions_c {
- "-Wno-bad-function-cast",
- "-Wno-strict-prototypes",
- }
-
- 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
-
-
--------------------------------------------------
-- linenoise library
--------------------------------------------------
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index cf81aabbd42..53b496cdfad 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -76,26 +76,30 @@ end
configuration { }
if _OPTIONS["targetos"]=="android" then
- includedirs {
- MAME_DIR .. "3rdparty/SDL2/include",
- }
-
files {
- MAME_DIR .. "3rdparty/SDL2/src/main/android/SDL_android_main.c",
+ MAME_DIR .. "src/osd/sdl/android_main.cpp",
}
targetsuffix ""
if _OPTIONS["SEPARATE_BIN"]~="1" then
if _OPTIONS["PLATFORM"]=="arm" then
targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a")
+ os.copyfile(_OPTIONS["SDL_INSTALL_ROOT"] .. "/lib/libSDL2.so", MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a/libSDL2.so")
+ os.copyfile(androidToolchainRoot() .. "/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so", MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a/libc++_shared.so")
end
if _OPTIONS["PLATFORM"]=="arm64" then
targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a")
+ os.copyfile(_OPTIONS["SDL_INSTALL_ROOT"] .. "/lib/libSDL2.so", MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a/libSDL2.so")
+ os.copyfile(androidToolchainRoot() .. "/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so", MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a/libc++_shared.so")
end
if _OPTIONS["PLATFORM"]=="x86" then
targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86")
+ os.copyfile(_OPTIONS["SDL_INSTALL_ROOT"] .. "/lib/libSDL2.so", MAME_DIR .. "android-project/app/src/main/libs/x86/libSDL2.so")
+ os.copyfile(androidToolchainRoot() .. "/sysroot/usr/lib/i686-linux-android/libc++_shared.so", MAME_DIR .. "android-project/app/src/main/libs/x86/libc++_shared.so")
end
if _OPTIONS["PLATFORM"]=="x64" then
targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86_64")
+ os.copyfile(_OPTIONS["SDL_INSTALL_ROOT"] .. "/lib/libSDL2.so", MAME_DIR .. "android-project/app/src/main/libs/x86_64/libSDL2.so")
+ os.copyfile(androidToolchainRoot() .. "/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so", MAME_DIR .. "android-project/app/src/main/libs/x86_64/libc++_shared.so")
end
end
else
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 3f4b65b4d06..6cb47db91a6 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -562,6 +562,14 @@ newoption {
},
}
+if not _OPTIONS["NO_OPENGL"] then
+ if _OPTIONS["targetos"] == "android" then
+ _OPTIONS["NO_OPENGL"] = "1"
+ else
+ _OPTIONS["NO_OPENGL"] = "0"
+ end
+end
+
newoption {
trigger = "USE_DISPATCH_GL",
description = "Use GL-dispatching",
@@ -585,7 +593,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" 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"] == "android" then
_OPTIONS["NO_USE_MIDI"] = "1"
else
_OPTIONS["NO_USE_MIDI"] = "0"
@@ -667,7 +675,7 @@ if not _OPTIONS["USE_PCAP"] then
end
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" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="android" then
_OPTIONS["USE_QTDEBUG"] = "0"
else
_OPTIONS["USE_QTDEBUG"] = "1"
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 3aa046b8ab1..abf4a90fd97 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -54,14 +54,11 @@ function maintargetosdoptions(_target,_subtarget)
end
if _OPTIONS["targetos"]=="windows" then
- if _OPTIONS["with-bundled-sdl2"]~=nil then
+ if _OPTIONS["USE_LIBSDL"]~="1" then
configuration { "mingw*"}
links {
+ "SDL2main",
"SDL2",
- "imm32",
- "version",
- "ole32",
- "oleaut32",
}
configuration { "vs*" }
links {
@@ -71,34 +68,20 @@ function maintargetosdoptions(_target,_subtarget)
}
configuration { }
else
- if _OPTIONS["USE_LIBSDL"]~="1" then
- configuration { "mingw*"}
- links {
- "SDL2main",
- "SDL2",
- }
- 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")
- }
- configuration { }
+ 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")
+ }
+ configuration { }
+
links {
"dinput8",
"psapi",
@@ -117,15 +100,6 @@ function maintargetosdoptions(_target,_subtarget)
"ole32",
}
configuration { }
-
- if _OPTIONS["targetos"]=="macosx" then
- if _OPTIONS["with-bundled-sdl2"]~=nil then
- links {
- "SDL2",
- }
- end
- end
-
end
@@ -160,7 +134,7 @@ newoption {
}
if not _OPTIONS["NO_X11"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="android" then
_OPTIONS["NO_X11"] = "1"
else
_OPTIONS["NO_X11"] = "0"
@@ -177,7 +151,7 @@ newoption {
}
if not _OPTIONS["NO_USE_XINPUT"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="android" then
_OPTIONS["NO_USE_XINPUT"] = "1"
else
_OPTIONS["NO_USE_XINPUT"] = "0"
@@ -252,11 +226,6 @@ elseif _OPTIONS["targetos"]=="macosx" then
SDLOS_TARGETOS = "macosx"
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"))
@@ -276,29 +245,17 @@ if BASE_TARGETOS=="unix" then
"-weak_framework Metal",
}
end
- if _OPTIONS["with-bundled-sdl2"]~=nil then
+ if _OPTIONS["USE_LIBSDL"]~="1" then
linkoptions {
- "-framework AudioToolbox",
- "-framework AudioUnit",
- "-framework CoreAudio",
- "-framework Carbon",
- "-framework ForceFeedback",
- "-framework IOKit",
- "-framework CoreVideo",
+ "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
+ }
+ links {
+ "SDL2.framework",
}
else
- 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
+ local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
end
else
if _OPTIONS["NO_X11"]=="1" then
@@ -310,17 +267,9 @@ if BASE_TARGETOS=="unix" then
"/usr/openwin/lib",
}
end
- if _OPTIONS["with-bundled-sdl2"]~=nil then
- if _OPTIONS["targetos"]~="android" then
- links {
- "SDL2",
- }
- end
- else
- local str = backtick(sdlconfigcmd() .. " --libs")
- addlibfromstring(str)
- addoptionsfromstring(str)
- end
+ local str = backtick(sdlconfigcmd() .. " --libs")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
if _OPTIONS["targetos"]~="haiku" and _OPTIONS["targetos"]~="android" then
links {
@@ -441,7 +390,6 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/sdl/window.h",
}
-
project ("ocore_" .. _OPTIONS["osd"])
targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"])
uuid (os.uuid("ocore_" .. _OPTIONS["osd"]))
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 26850d4ec85..6b93c9a831e 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -95,20 +95,22 @@ if BASE_TARGETOS=="unix" then
"SDLMAME_UNIX",
}
if _OPTIONS["targetos"]=="macosx" then
- 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:/SDL2::'"),
- }
- end
+ if _OPTIONS["USE_LIBSDL"]~="1" then
+ buildoptions {
+ "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
+ }
+ else
+ defines {
+ "MACOSX_USE_LIBSDL",
+ }
+ buildoptions {
+ backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL2::'"),
+ }
end
+ elseif _OPTIONS["targetos"]=="android" then
+ buildoptions {
+ backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL2::'"),
+ }
else
buildoptions {
backtick(sdlconfigcmd() .. " --cflags"),
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index b6c09e3f8ef..6b30fc951c0 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -782,14 +782,11 @@ if (_OPTIONS["osd"] == "sdl") then
}
if _OPTIONS["targetos"]=="windows" then
- if _OPTIONS["with-bundled-sdl2"]~=nil then
+ if _OPTIONS["USE_LIBSDL"]~="1" then
configuration { "mingw*"}
links {
+ "SDL2main",
"SDL2",
- "imm32",
- "version",
- "ole32",
- "oleaut32",
}
configuration { "vs*" }
links {
@@ -799,41 +796,18 @@ if (_OPTIONS["osd"] == "sdl") then
}
configuration { }
else
- if _OPTIONS["USE_LIBSDL"]~="1" then
- configuration { "mingw*"}
- links {
- "SDL2main",
- "SDL2",
- }
- 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")
- }
+ local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
+ addlibfromstring(str)
+ addoptionsfromstring(str)
end
- end
-
- if BASE_TARGETOS=="unix" then
- if _OPTIONS["with-bundled-sdl2"]~=nil then
- links {
- "SDL2",
+ 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
end
dofile("osd/sdl_cfg.lua")