diff options
| author |  Jim Van Verth <jvanverth@google.com> | 2017-07-11 12:03:01 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-11 16:34:21 +0000 |
| commit | 4c70c75d0ab6b2924204c6d70e03c6672c4934a4 (patch) | |
| tree | c3b02d2c11ecaff90fdde9b9d75169d8c0c5d510 /third_party/libsdl | |
| parent | 39ef556d7c6ea15f0c6afd7707d338cdfd41084a (diff) | |
Update SkiaSDLExample to latest Ganesh interfaces.
Also updates SDL to 2.0.5.
Change-Id: I3a3c8f69360fc20a3d543c19dcf82dd3f42f1309
Reviewed-on: https://skia-review.googlesource.com/22204
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'third_party/libsdl')
| -rw-r--r-- | third_party/libsdl/BUILD.gn | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/third_party/libsdl/BUILD.gn b/third_party/libsdl/BUILD.gn index 79893721a3..2df9d22971 100644 --- a/third_party/libsdl/BUILD.gn +++ b/third_party/libsdl/BUILD.gn @@ -129,6 +129,39 @@ third_party("libsdl") { ] } + if (is_linux) { + sources += [ + "../externals/sdl/src/filesystem/unix/SDL_sysfilesystem.c", + "../externals/sdl/src/video/x11/SDL_x11clipboard.c", + "../externals/sdl/src/video/x11/SDL_x11dyn.c", + "../externals/sdl/src/video/x11/SDL_x11events.c", + "../externals/sdl/src/video/x11/SDL_x11framebuffer.c", + "../externals/sdl/src/video/x11/SDL_x11keyboard.c", + "../externals/sdl/src/video/x11/SDL_x11messagebox.c", + "../externals/sdl/src/video/x11/SDL_x11modes.c", + "../externals/sdl/src/video/x11/SDL_x11mouse.c", + "../externals/sdl/src/video/x11/SDL_x11opengl.c", + "../externals/sdl/src/video/x11/SDL_x11opengles.c", + "../externals/sdl/src/video/x11/SDL_x11shape.c", + "../externals/sdl/src/video/x11/SDL_x11touch.c", + "../externals/sdl/src/video/x11/SDL_x11video.c", + "../externals/sdl/src/video/x11/SDL_x11window.c", + "../externals/sdl/src/video/x11/SDL_x11xinput2.c", + "../externals/sdl/src/video/x11/imKStoUCS.c", + ] + defines += [ + "SDL_FILESYSTEM_UNIX=1", + "SDL_VIDEO_DRIVER_X11=1", + "SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS=1", + "SDL_VIDEO_OPENGL_GLX=1", + ] + libs += [ + "GL", + "X11", + "Xext", + ] + } + if (is_mac) { sources += [ "../externals/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m", @@ -152,7 +185,10 @@ third_party("libsdl") { ] libs += [ "Carbon.framework", + "Cocoa.framework", + "Foundation.framework", "IOKit.framework", + "QuartzCore.framework", ] } } |