From a17d1385c44228d21829098a50cdef08f6f795d2 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 28 Feb 2016 12:58:04 +0100 Subject: [PATCH] Separated windows only part in SDL2 build and prepared osx one (nw) --- scripts/src/3rdparty.lua | 168 ++++++++++++++++++++++++++------------- 1 file changed, 113 insertions(+), 55 deletions(-) diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 3a7f8eb6112..869ae05a0a2 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -1300,10 +1300,10 @@ project "SDL2" 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/directsound/SDL_directsound.c", - MAME_DIR .. "3rdparty/SDL2/src/audio/directsound/SDL_directsound.h", 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", @@ -1319,13 +1319,6 @@ project "SDL2" 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/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/cpuinfo/SDL_cpuinfo.c", MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi.c", MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi.h", @@ -1352,26 +1345,12 @@ project "SDL2" 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/filesystem/windows/SDL_sysfilesystem.c", MAME_DIR .. "3rdparty/SDL2/src/haptic/SDL_haptic.c", MAME_DIR .. "3rdparty/SDL2/src/haptic/SDL_syshaptic.h", - 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/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/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/libm/e_atan2.c", MAME_DIR .. "3rdparty/SDL2/src/libm/e_log.c", MAME_DIR .. "3rdparty/SDL2/src/libm/e_pow.c", @@ -1441,15 +1420,9 @@ project "SDL2" 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/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/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/timer/windows/SDL_systimer.c", 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", @@ -1486,33 +1459,118 @@ project "SDL2" 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", - 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", + } + + 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/render/opengles/SDL_render_gles.c", + MAME_DIR .. "3rdparty/SDL2/src/render/opengles/SDL_glesfuncs.h", + 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",