Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libsdl/win/sdl_win.gypi

Issue 1438003004: bring up SDL on windows (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: disable sdl Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libsdl/win/README ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libsdl/win/sdl_win.gypi
diff --git a/third_party/libsdl/linux/sdl_linux.gypi b/third_party/libsdl/win/sdl_win.gypi
similarity index 65%
copy from third_party/libsdl/linux/sdl_linux.gypi
copy to third_party/libsdl/win/sdl_win.gypi
index 37095bedd29e2ed2ff24dd1dfe5851be4fe9e16b..ad3373190daa79cc7d0bb894e7bb38a710a0cb55 100644
--- a/third_party/libsdl/linux/sdl_linux.gypi
+++ b/third_party/libsdl/win/sdl_win.gypi
@@ -7,138 +7,144 @@
{
#TODO what is really necessary here
'link_settings': {
- 'libraries': [
- '-lm',
- '-ldl',
- '-lpthread',
- '-lrt'
+ 'libraries': [
+ "-lwinmm",
+ "-limm32",
+ "-lversion",
],
},
'sources': [
- '<(src_dir)/src/SDL.c',
- '<(src_dir)/src/SDL_assert.c',
- '<(src_dir)/src/SDL_error.c',
- '<(src_dir)/src/SDL_hints.c',
- '<(src_dir)/src/SDL_log.c',
- '<(src_dir)/src/atomic/SDL_atomic.c',
- '<(src_dir)/src/atomic/SDL_spinlock.c',
- '<(src_dir)/src/audio/SDL_audio.c',
- '<(src_dir)/src/audio/SDL_audiocvt.c',
- '<(src_dir)/src/audio/SDL_audiodev.c',
- '<(src_dir)/src/audio/SDL_audiotypecvt.c',
- '<(src_dir)/src/audio/SDL_mixer.c',
- '<(src_dir)/src/audio/SDL_wave.c',
- '<(src_dir)/src/cpuinfo/SDL_cpuinfo.c',
- '<(src_dir)/src/dynapi/SDL_dynapi.c',
- '<(src_dir)/src/events/SDL_clipboardevents.c',
- '<(src_dir)/src/events/SDL_dropevents.c',
- '<(src_dir)/src/events/SDL_events.c',
- '<(src_dir)/src/events/SDL_gesture.c',
- '<(src_dir)/src/events/SDL_keyboard.c',
- '<(src_dir)/src/events/SDL_mouse.c',
- '<(src_dir)/src/events/SDL_quit.c',
- '<(src_dir)/src/events/SDL_touch.c',
- '<(src_dir)/src/events/SDL_windowevents.c',
- '<(src_dir)/src/file/SDL_rwops.c',
- '<(src_dir)/src/haptic/SDL_haptic.c',
- '<(src_dir)/src/joystick/SDL_gamecontroller.c',
+ '<(src_dir)/src/joystick/windows/SDL_mmjoystick.c',
+ '<(src_dir)/src/joystick/windows/SDL_xinputjoystick.c',
+ '<(src_dir)/src/joystick/windows/SDL_dinputjoystick.c',
+ '<(src_dir)/src/joystick/windows/SDL_windowsjoystick.c',
'<(src_dir)/src/joystick/SDL_joystick.c',
- '<(src_dir)/src/libm/e_atan2.c',
+ '<(src_dir)/src/joystick/SDL_gamecontroller.c',
+ '<(src_dir)/src/SDL_log.c',
+ '<(src_dir)/src/core/windows/SDL_xinput.c',
+ '<(src_dir)/src/core/windows/SDL_windows.c',
+ '<(src_dir)/src/libm/s_fabs.c',
+ '<(src_dir)/src/libm/k_tan.c',
+ '<(src_dir)/src/libm/k_rem_pio2.c',
+ '<(src_dir)/src/libm/s_cos.c',
+ '<(src_dir)/src/libm/s_atan.c',
+ '<(src_dir)/src/libm/s_floor.c',
'<(src_dir)/src/libm/e_log.c',
+ '<(src_dir)/src/libm/s_tan.c',
+ '<(src_dir)/src/libm/s_sin.c',
+ '<(src_dir)/src/libm/e_atan2.c',
'<(src_dir)/src/libm/e_pow.c',
+ '<(src_dir)/src/libm/s_copysign.c',
'<(src_dir)/src/libm/e_rem_pio2.c',
- '<(src_dir)/src/libm/e_sqrt.c',
- '<(src_dir)/src/libm/k_cos.c',
- '<(src_dir)/src/libm/k_rem_pio2.c',
'<(src_dir)/src/libm/k_sin.c',
- '<(src_dir)/src/libm/k_tan.c',
- '<(src_dir)/src/libm/s_atan.c',
- '<(src_dir)/src/libm/s_copysign.c',
- '<(src_dir)/src/libm/s_cos.c',
- '<(src_dir)/src/libm/s_fabs.c',
- '<(src_dir)/src/libm/s_floor.c',
+ '<(src_dir)/src/libm/k_cos.c',
+ '<(src_dir)/src/libm/e_sqrt.c',
'<(src_dir)/src/libm/s_scalbn.c',
- '<(src_dir)/src/libm/s_sin.c',
- '<(src_dir)/src/libm/s_tan.c',
+ '<(src_dir)/src/events/SDL_dropevents.c',
+ '<(src_dir)/src/events/SDL_touch.c',
+ '<(src_dir)/src/events/SDL_quit.c',
+ '<(src_dir)/src/events/SDL_gesture.c',
+ '<(src_dir)/src/events/SDL_events.c',
+ '<(src_dir)/src/events/SDL_windowevents.c',
+ '<(src_dir)/src/events/SDL_keyboard.c',
+ '<(src_dir)/src/events/SDL_clipboardevents.c',
+ '<(src_dir)/src/events/SDL_mouse.c',
+ '<(src_dir)/src/power/windows/SDL_syspower.c',
'<(src_dir)/src/power/SDL_power.c',
- '<(src_dir)/src/render/SDL_d3dmath.c',
- '<(src_dir)/src/render/SDL_render.c',
+ '<(src_dir)/src/timer/SDL_timer.c',
+ '<(src_dir)/src/timer/windows/SDL_systimer.c',
+ '<(src_dir)/src/dynapi/SDL_dynapi.c',
+ '<(src_dir)/src/SDL_hints.c',
+ '<(src_dir)/src/thread/generic/SDL_syscond.c',
+ '<(src_dir)/src/thread/windows/SDL_systhread.c',
+ '<(src_dir)/src/thread/windows/SDL_syssem.c',
+ '<(src_dir)/src/thread/windows/SDL_sysmutex.c',
+ '<(src_dir)/src/thread/windows/SDL_systls.c',
+ '<(src_dir)/src/thread/SDL_thread.c',
+ '<(src_dir)/src/haptic/windows/SDL_windowshaptic.c',
+ '<(src_dir)/src/haptic/windows/SDL_xinputhaptic.c',
+ '<(src_dir)/src/haptic/windows/SDL_dinputhaptic.c',
+ '<(src_dir)/src/haptic/SDL_haptic.c',
'<(src_dir)/src/render/SDL_yuv_mmx.c',
- '<(src_dir)/src/render/SDL_yuv_sw.c',
+ '<(src_dir)/src/render/SDL_d3dmath.c',
'<(src_dir)/src/render/direct3d/SDL_render_d3d.c',
'<(src_dir)/src/render/direct3d11/SDL_render_d3d11.c',
+ '<(src_dir)/src/render/SDL_render.c',
'<(src_dir)/src/render/opengl/SDL_render_gl.c',
'<(src_dir)/src/render/opengl/SDL_shaders_gl.c',
- '<(src_dir)/src/render/opengles/SDL_render_gles.c',
- '<(src_dir)/src/render/opengles2/SDL_render_gles2.c',
- '<(src_dir)/src/render/opengles2/SDL_shaders_gles2.c',
- '<(src_dir)/src/render/psp/SDL_render_psp.c',
- '<(src_dir)/src/render/software/SDL_blendfillrect.c',
- '<(src_dir)/src/render/software/SDL_blendline.c',
- '<(src_dir)/src/render/software/SDL_blendpoint.c',
- '<(src_dir)/src/render/software/SDL_drawline.c',
- '<(src_dir)/src/render/software/SDL_drawpoint.c',
'<(src_dir)/src/render/software/SDL_render_sw.c',
+ '<(src_dir)/src/render/software/SDL_drawline.c',
'<(src_dir)/src/render/software/SDL_rotate.c',
+ '<(src_dir)/src/render/software/SDL_blendpoint.c',
+ '<(src_dir)/src/render/software/SDL_drawpoint.c',
+ '<(src_dir)/src/render/software/SDL_blendfillrect.c',
+ '<(src_dir)/src/render/software/SDL_blendline.c',
+ '<(src_dir)/src/render/opengles2/SDL_render_gles2.c',
+ '<(src_dir)/src/render/opengles2/SDL_shaders_gles2.c',
+ '<(src_dir)/src/render/SDL_yuv_sw.c',
+ '<(src_dir)/src/filesystem/windows/SDL_sysfilesystem.c',
+ '<(src_dir)/src/file/SDL_rwops.c',
'<(src_dir)/src/stdlib/SDL_getenv.c',
'<(src_dir)/src/stdlib/SDL_iconv.c',
- '<(src_dir)/src/stdlib/SDL_malloc.c',
- '<(src_dir)/src/stdlib/SDL_qsort.c',
'<(src_dir)/src/stdlib/SDL_stdlib.c',
'<(src_dir)/src/stdlib/SDL_string.c',
- '<(src_dir)/src/thread/SDL_thread.c',
- '<(src_dir)/src/timer/SDL_timer.c',
- '<(src_dir)/src/video/SDL_RLEaccel.c',
- '<(src_dir)/src/video/SDL_blit.c',
- '<(src_dir)/src/video/SDL_blit_0.c',
- '<(src_dir)/src/video/SDL_blit_1.c',
- '<(src_dir)/src/video/SDL_blit_A.c',
- '<(src_dir)/src/video/SDL_blit_N.c',
- '<(src_dir)/src/video/SDL_blit_auto.c',
- '<(src_dir)/src/video/SDL_blit_copy.c',
- '<(src_dir)/src/video/SDL_blit_slow.c',
+ '<(src_dir)/src/stdlib/SDL_malloc.c',
+ '<(src_dir)/src/stdlib/SDL_qsort.c',
+ '<(src_dir)/src/SDL_assert.c',
+ '<(src_dir)/src/SDL.c',
+ '<(src_dir)/src/atomic/SDL_atomic.c',
+ '<(src_dir)/src/atomic/SDL_spinlock.c',
+ '<(src_dir)/src/loadso/windows/SDL_sysloadso.c',
+ '<(src_dir)/src/audio/dummy/SDL_dummyaudio.c',
+ '<(src_dir)/src/audio/SDL_audiocvt.c',
+ '<(src_dir)/src/audio/SDL_audio.c',
+ '<(src_dir)/src/audio/xaudio2/SDL_xaudio2.c',
+ '<(src_dir)/src/audio/SDL_audiodev.c',
+ '<(src_dir)/src/audio/SDL_audiotypecvt.c',
+ '<(src_dir)/src/audio/disk/SDL_diskaudio.c',
+ '<(src_dir)/src/audio/SDL_wave.c',
+ '<(src_dir)/src/audio/winmm/SDL_winmm.c',
+ '<(src_dir)/src/audio/SDL_mixer.c',
+ '<(src_dir)/src/audio/directsound/SDL_directsound.c',
+ '<(src_dir)/src/cpuinfo/SDL_cpuinfo.c',
+ '<(src_dir)/src/SDL_error.c',
'<(src_dir)/src/video/SDL_bmp.c',
- '<(src_dir)/src/video/SDL_clipboard.c',
- '<(src_dir)/src/video/SDL_egl.c',
- '<(src_dir)/src/video/SDL_fillrect.c',
+ '<(src_dir)/src/video/dummy/SDL_nullevents.c',
+ '<(src_dir)/src/video/dummy/SDL_nullvideo.c',
+ '<(src_dir)/src/video/dummy/SDL_nullframebuffer.c',
+ '<(src_dir)/src/video/SDL_blit_auto.c',
+ '<(src_dir)/src/video/SDL_shape.c',
+ '<(src_dir)/src/video/SDL_blit_N.c',
+ '<(src_dir)/src/video/windows/SDL_windowsframebuffer.c',
+ '<(src_dir)/src/video/windows/SDL_windowskeyboard.c',
+ '<(src_dir)/src/video/windows/SDL_windowsshape.c',
+ '<(src_dir)/src/video/windows/SDL_windowswindow.c',
+ '<(src_dir)/src/video/windows/SDL_windowsopengl.c',
+ '<(src_dir)/src/video/windows/SDL_windowsvideo.c',
+ '<(src_dir)/src/video/windows/SDL_windowsmessagebox.c',
+ '<(src_dir)/src/video/windows/SDL_windowsopengles.c',
+ '<(src_dir)/src/video/windows/SDL_windowsevents.c',
+ '<(src_dir)/src/video/windows/SDL_windowsmodes.c',
+ '<(src_dir)/src/video/windows/SDL_windowsmouse.c',
+ '<(src_dir)/src/video/windows/SDL_windowsclipboard.c',
+ '<(src_dir)/src/video/SDL_blit_A.c',
'<(src_dir)/src/video/SDL_pixels.c',
'<(src_dir)/src/video/SDL_rect.c',
- '<(src_dir)/src/video/SDL_shape.c',
+ '<(src_dir)/src/video/SDL_video.c',
'<(src_dir)/src/video/SDL_stretch.c',
'<(src_dir)/src/video/SDL_surface.c',
- '<(src_dir)/src/video/SDL_video.c',
- '<(src_dir)/src/loadso/dlopen/SDL_sysloadso.c',
- '<(src_dir)/src/video/x11/SDL_x11clipboard.c',
- '<(src_dir)/src/video/x11/SDL_x11dyn.c',
- '<(src_dir)/src/video/x11/SDL_x11events.c',
- '<(src_dir)/src/video/x11/SDL_x11framebuffer.c',
- '<(src_dir)/src/video/x11/SDL_x11keyboard.c',
- '<(src_dir)/src/video/x11/SDL_x11messagebox.c',
- '<(src_dir)/src/video/x11/SDL_x11modes.c',
- '<(src_dir)/src/video/x11/SDL_x11mouse.c',
- '<(src_dir)/src/video/x11/SDL_x11opengl.c',
- '<(src_dir)/src/video/x11/SDL_x11opengles.c',
- '<(src_dir)/src/video/x11/SDL_x11shape.c',
- '<(src_dir)/src/video/x11/SDL_x11touch.c',
- '<(src_dir)/src/video/x11/SDL_x11video.c',
- '<(src_dir)/src/video/x11/SDL_x11window.c',
- '<(src_dir)/src/video/x11/SDL_x11xinput2.c',
- '<(src_dir)/src/video/x11/edid-parse.c',
- '<(src_dir)/src/video/x11/imKStoUCS.c',
- '<(src_dir)/src/thread/pthread/SDL_systhread.c',
- '<(src_dir)/src/thread/pthread/SDL_syssem.c',
- '<(src_dir)/src/thread/pthread/SDL_sysmutex.c',
- '<(src_dir)/src/thread/pthread/SDL_syscond.c',
- '<(src_dir)/src/thread/pthread/SDL_systls.c',
- '<(src_dir)/src/filesystem/unix/SDL_sysfilesystem.c',
- '<(src_dir)/src/timer/unix/SDL_systimer.c',
- '<(src_dir)/src/core/linux/SDL_evdev.c',
- '<(src_dir)/src/joystick/dummy/SDL_sysjoystick.c',
- '<(src_dir)/src/haptic/dummy/SDL_syshaptic.c',
- '<(src_dir)/src/main/dummy/SDL_dummy_main.c',
+ '<(src_dir)/src/video/SDL_fillrect.c',
+ '<(src_dir)/src/video/SDL_blit_copy.c',
+ '<(src_dir)/src/video/SDL_blit_1.c',
+ '<(src_dir)/src/video/SDL_egl.c',
+ '<(src_dir)/src/video/SDL_RLEaccel.c',
+ '<(src_dir)/src/video/SDL_blit_slow.c',
+ '<(src_dir)/src/video/SDL_blit.c',
+ '<(src_dir)/src/video/SDL_clipboard.c',
+ '<(src_dir)/src/video/SDL_blit_0.c',
+ '<(src_dir)/src/main/windows/SDL_windows_main.c',
],
'defines': [
- '__LINUX__',
'_REENTRANT'
],
'cflags': [
« no previous file with comments | « third_party/libsdl/win/README ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698