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

Unified Diff: third_party/libsdl/mac/sdl_mac.gypi

Issue 1428633003: Wire up SDL on mac (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: tweaks 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/mac/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/mac/sdl_mac.gypi
diff --git a/third_party/libsdl/linux/sdl_linux.gypi b/third_party/libsdl/mac/sdl_mac.gypi
similarity index 73%
copy from third_party/libsdl/linux/sdl_linux.gypi
copy to third_party/libsdl/mac/sdl_mac.gypi
index 37095bedd29e2ed2ff24dd1dfe5851be4fe9e16b..19970cc2ffd82c5cc7188e2750c1b8875efd72bd 100644
--- a/third_party/libsdl/linux/sdl_linux.gypi
+++ b/third_party/libsdl/mac/sdl_mac.gypi
@@ -2,20 +2,23 @@
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# Linux specific files and settings for SDL
+# Mac specific files and settings for SDL
{
#TODO what is really necessary here
'link_settings': {
'libraries': [
'-lm',
- '-ldl',
+ '-liconv',
+ '-lobjc',
'-lpthread',
- '-lrt'
+ '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
+ '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
+ '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
+ '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
],
},
'sources': [
- '<(src_dir)/src/SDL.c',
'<(src_dir)/src/SDL_assert.c',
'<(src_dir)/src/SDL_error.c',
'<(src_dir)/src/SDL_hints.c',
@@ -108,37 +111,46 @@
'<(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/cocoa/SDL_cocoaclipboard.m',
+ '<(src_dir)/src/video/cocoa/SDL_cocoaevents.m',
+ '<(src_dir)/src/video/cocoa/SDL_cocoakeyboard.m',
+ '<(src_dir)/src/video/cocoa/SDL_cocoamessagebox.m',
+ '<(src_dir)/src/video/cocoa/SDL_cocoamodes.m',
+ '<(src_dir)/src/video/cocoa/SDL_cocoamouse.m',
+ '<(src_dir)/src/video/cocoa/SDL_cocoamousetap.m',
+ '<(src_dir)/src/video/cocoa/SDL_cocoaopengl.m',
+ '<(src_dir)/src/video/cocoa/SDL_cocoashape.m',
+ '<(src_dir)/src/video/cocoa/SDL_cocoavideo.m',
+ '<(src_dir)/src/video/cocoa/SDL_cocoawindow.m',
'<(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/cocoa/SDL_sysfilesystem.m',
'<(src_dir)/src/timer/unix/SDL_systimer.c',
- '<(src_dir)/src/core/linux/SDL_evdev.c',
+ '<(src_dir)/src/file/cocoa/SDL_rwopsbundlesupport.m',
'<(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/test/SDL_test_assert.c',
+ '<(src_dir)/src/test/SDL_test_common.c',
+ '<(src_dir)/src/test/SDL_test_compare.c',
+ '<(src_dir)/src/test/SDL_test_crc32.c',
+ '<(src_dir)/src/test/SDL_test_font.c',
+ '<(src_dir)/src/test/SDL_test_fuzzer.c',
+ '<(src_dir)/src/test/SDL_test_harness.c',
+ '<(src_dir)/src/test/SDL_test_imageBlit.c',
+ '<(src_dir)/src/test/SDL_test_imageBlitBlend.c',
+ '<(src_dir)/src/test/SDL_test_imageFace.c',
+ '<(src_dir)/src/test/SDL_test_imagePrimitives.c',
+ '<(src_dir)/src/test/SDL_test_imagePrimitivesBlend.c',
+ '<(src_dir)/src/test/SDL_test_log.c',
+ '<(src_dir)/src/test/SDL_test_md5.c',
+ '<(src_dir)/src/test/SDL_test_random.c',
+ '<(src_dir)/src/SDL.c',
],
'defines': [
- '__LINUX__',
'_REENTRANT'
],
'cflags': [
« no previous file with comments | « third_party/libsdl/mac/SDL_config.h ('k') | third_party/libsdl/sdl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698