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

Unified Diff: third_party/libsdl/android/sdl_android.gypi

Issue 1415453009: Wire up SDL on Android (Closed) Base URL: https://skia.googlesource.com/skia.git@sdl
Patch Set: fix appurify 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/android/SDL_config.h ('k') | third_party/libsdl/sdl.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libsdl/android/sdl_android.gypi
diff --git a/third_party/libsdl/linux/sdl_linux.gypi b/third_party/libsdl/android/sdl_android.gypi
similarity index 69%
copy from third_party/libsdl/linux/sdl_linux.gypi
copy to third_party/libsdl/android/sdl_android.gypi
index 37095bedd29e2ed2ff24dd1dfe5851be4fe9e16b..4f6365ea2be7b87aa3deae7c88a6a74e837db1a1 100644
--- a/third_party/libsdl/linux/sdl_linux.gypi
+++ b/third_party/libsdl/android/sdl_android.gypi
@@ -8,10 +8,11 @@
#TODO what is really necessary here
'link_settings': {
'libraries': [
- '-lm',
'-ldl',
- '-lpthread',
- '-lrt'
+ '-lGLESv1_CM',
+ '-lGLESv2',
+ '-llog',
+ '-landroid',
],
},
'sources': [
@@ -28,6 +29,8 @@
'<(src_dir)/src/audio/SDL_audiotypecvt.c',
'<(src_dir)/src/audio/SDL_mixer.c',
'<(src_dir)/src/audio/SDL_wave.c',
+ '<(src_dir)/src/audio/dummy/SDL_dummyaudio.c',
+ '<(src_dir)/src/audio/android/SDL_androidaudio.c',
'<(src_dir)/src/cpuinfo/SDL_cpuinfo.c',
'<(src_dir)/src/dynapi/SDL_dynapi.c',
'<(src_dir)/src/events/SDL_clipboardevents.c',
@@ -43,24 +46,10 @@
'<(src_dir)/src/haptic/SDL_haptic.c',
'<(src_dir)/src/joystick/SDL_gamecontroller.c',
'<(src_dir)/src/joystick/SDL_joystick.c',
- '<(src_dir)/src/libm/e_atan2.c',
- '<(src_dir)/src/libm/e_log.c',
- '<(src_dir)/src/libm/e_pow.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/s_scalbn.c',
- '<(src_dir)/src/libm/s_sin.c',
- '<(src_dir)/src/libm/s_tan.c',
+ '<(src_dir)/src/joystick/android/SDL_sysjoystick.c',
'<(src_dir)/src/power/SDL_power.c',
+ '<(src_dir)/src/power/android/SDL_syspower.c',
+ '<(src_dir)/src/loadso/dlopen/SDL_sysloadso.c',
'<(src_dir)/src/render/SDL_d3dmath.c',
'<(src_dir)/src/render/SDL_render.c',
'<(src_dir)/src/render/SDL_yuv_mmx.c',
@@ -107,47 +96,32 @@
'<(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/video/android/SDL_androidgl.c',
+ '<(src_dir)/src/video/android/SDL_androidkeyboard.c',
+ '<(src_dir)/src/video/android/SDL_androidwindow.c',
+ '<(src_dir)/src/video/android/SDL_androidmouse.c',
+ '<(src_dir)/src/video/android/SDL_androidvideo.c',
+ '<(src_dir)/src/video/android/SDL_androidclipboard.c',
+ '<(src_dir)/src/video/android/SDL_androidtouch.c',
+ '<(src_dir)/src/video/android/SDL_androidevents.c',
+ '<(src_dir)/src/video/android/SDL_androidmessagebox.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/filesystem/android/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/core/android/SDL_android.c',
'<(src_dir)/src/haptic/dummy/SDL_syshaptic.c',
- '<(src_dir)/src/main/dummy/SDL_dummy_main.c',
+ '<(src_dir)/src/main/android/SDL_android_main.c',
],
'defines': [
- '__LINUX__',
- '_REENTRANT'
+ 'GL_GLEXT_PROTOTYPES',
],
'cflags': [
'-fPIC',
'-O3',
- '-mmmx',
- '-m3dnow',
- '-msse',
- '-msse2',
'-fvisibility=hidden',
],
}
« no previous file with comments | « third_party/libsdl/android/SDL_config.h ('k') | third_party/libsdl/sdl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698