summaryrefslogtreecommitdiff
path: root/cmake
AgeCommit message (Collapse)AuthorFilesLines
2016-01-03CMake: Don't link directly to libGL on Unix.Ryan C. Gordon1-1/+0
(we always dynamically load it at runtime when appropriate.)
2015-06-08configure/cmake/x11: Removed SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 test.Ryan C. Gordon1-8/+0
This was the only thing that made SDL_config.h generate differently between 32 and 64-bit versions of Linux, so instead we force a function cast in our X11 code to match our dynamic loader version, which removes the compile error on some machines that prompted this test in the first place. Xlib never wrote to this data, so if you're on an older Xlib where this param wasn't const, your data should still be intact when we force the caller to think it was actually const after all. Fixes Bugzilla #1893.
2015-04-07CMake: fix CHECK_OBJC_SOURCE_COMPILES to work with GCC (thanks, Ivan!).Ryan C. Gordon1-1/+1
Apparently -ObjC works with Clang, but -x objective-c works with both. Fixes Bugzilla #2392.
2015-03-20Whoops, lost a newline in here.Ryan C. Gordon1-1/+2
2015-03-20Several corrections to the CMake project files (thanks, Ozkan!).Ryan C. Gordon1-5/+8
Fixes Bugzilla #2732.
2015-03-20CMake project files no longer force you to link against Wayland or Mir libs.Ryan C. Gordon1-5/+48
2014-12-13CMake: Replace "else(condition)" with "else()", etc.Ryan C. Gordon1-130/+130
Bumped required CMake version to 2.8. Thanks to the SDL/Emscripten porting team for this cleanup.
2014-10-17Fixed syntax error in cmake file.Philipp Wiesemann1-1/+1
2014-10-15Expanded the iMX6 video driver into a general Vivante video driver that ↵Sam Lantinga1-11/+22
works across multiple SoCs
2014-09-10Freescale i.MX6 video drivermastermind1-0/+20
--- CMakeLists.txt | 2 + cmake/sdlchecks.cmake | 20 +++ configure | 51 +++++++ configure.in | 28 ++++ include/SDL_config.h.cmake | 1 + include/SDL_config.h.in | 1 + src/video/SDL_sysvideo.h | 3 + src/video/SDL_video.c | 3 + src/video/mx6/SDL_mx6events.c | 45 ++++++ src/video/mx6/SDL_mx6events_c.h | 31 +++++ src/video/mx6/SDL_mx6opengles.c | 211 ++++++++++++++++++++++++++++ src/video/mx6/SDL_mx6opengles.h | 68 +++++++++ src/video/mx6/SDL_mx6video.c | 301 ++++++++++++++++++++++++++++++++++++++++ src/video/mx6/SDL_mx6video.h | 78 +++++++++++ 14 files changed, 843 insertions(+) create mode 100644 src/video/mx6/SDL_mx6events.c create mode 100644 src/video/mx6/SDL_mx6events_c.h create mode 100644 src/video/mx6/SDL_mx6opengles.c create mode 100644 src/video/mx6/SDL_mx6opengles.h create mode 100644 src/video/mx6/SDL_mx6video.c create mode 100644 src/video/mx6/SDL_mx6video.h
2014-08-16Fixed bug 2683 - Raspberry PI support using CMakeSam Lantinga1-0/+29
Tobias Himmer this patch adds a check to the CMake build script to detect whether the VideoCore API is available. If it is found, it enables SDL_VIDEO_DRIVER_RPI and will also add the needed include/library directory flags to CMAKE_C_FLAGS so the subsequent check for GLES succeeds in picking up the headers. Seems to work fine on Raspbian.
2014-07-07Fixed bug 2618 - incomplete pthread-based lock support should be removedSam Lantinga1-7/+0
binarycrusader Since changeset 358696c354a8, SDL 2.0 has been broken on Solaris when compiling with the Solaris Studio compiler (which uses the pthread implementation of SDL_AtomicLock). Notably, it gets stuck at the MemoryBarrierRelease in SDL_GetErrBuf: 6585 # 218 6586 if (!tls_errbuf && !tls_being_created) { 6587 SDL_AtomicLock_REAL ( & tls_lock ); 6588 if (!tls_errbuf) { 6589 SDL_TLSID slot; 6590 tls_being_created = SDL_TRUE; 6591 slot = SDL_TLSCreate_REAL ( ); 6592 tls_being_created = SDL_FALSE; 6593 { SDL_SpinLock _tmp = 0 ; SDL_AtomicLock_REAL ( & _tmp ) ; SDL_AtomicUnlock_REAL ( & _tmp ) ; }; ^^^ loops forever above 6594 tls_errbuf = slot; 6595 } 6596 SDL_AtomicUnlock_REAL ( & tls_lock ); 6597 } Running: testthread (process id 28926) ^Cdbx: warning: Interrupt ignored but forwarded to child. signal INT (Interrupt) in __nanosleep at 0xfe52a875 0xfe52a875: __nanosleep+0x0015: jae __nanosleep+0x23 [ 0xfe52a883, .+0xe ] Current function is SDL_Delay_REAL 204 was_error = nanosleep(&tv, &elapsed); (dbx) where [1] __nanosleep(0xfeffe848, 0xfeffe850, 0xfe75a5ac, 0xfe5169d8), at 0xfe52a875 [2] nanosleep(0xfeffe848, 0xfeffe850), at 0xfe516a3b =>[3] SDL_Delay_REAL(ms = 0), line 204 in "SDL_systimer.c" [4] SDL_AtomicLock_REAL(lock = 0xfeffe88c), line 104 in "SDL_spinlock.c" [5] SDL_GetErrBuf(), line 225 in "SDL_thread.c" [6] SDL_ClearError_REAL(), line 216 in "SDL_error.c" [7] SDL_InitSubSystem_REAL(flags = 0), line 116 in "SDL.c" [8] SDL_Init_REAL(flags = 0), line 244 in "SDL.c" [9] SDL_Init(a = 0), line 89 in "SDL_dynapi_procs.h" [10] main(argc = 1, argv = 0xfeffe948), line 65 in "testthread.c" As far as I can tell, this is because pthread_spin_trylock() always returns EBUSY for this particular lock; since it works in other places, I'm suspicious. Different Solaris Studio compiler versions seem to make no difference. I've verified this is broken on Linux as well if SDL_spinlock.c is modified to use the pthread implementation. This appears to be because pthread_spin_init() and pthread_spin_destroy() are not used with the locks as required.
2014-02-23CMake: Just assume Apple platforms have Cocoa support.Ryan C. Gordon1-3/+3
Fixes Bugzilla #2056.
2014-02-03Hooked up dynamic loading for Mir.Ryan C. Gordon1-0/+2
2014-02-02Added Mir video target (thanks, Brandon!).Ryan C. Gordon1-0/+21
2014-01-21Fixed XF86 VidMode extension dynamic loading with CMake project.Ryan C. Gordon1-5/+5
2013-12-14Wayland supportGabriel Jacobo1-0/+23
Based on the original port to Wayland by: Joel Teichroeb, Benjamin Franzke, Scott Moreau, et al. Additional changes in this commit, done by me: * Wayland uses the common EGL framework * EGL can now create a desktop OpenGL context * testgl2 loads GL functions dynamically, no need to link to libGL anymore * Assorted fixes to the Wayland backend Tested on the Weston Compositor (v1.0.5) that ships with Ubuntu 13.10, running Weston under X. Tests ran: testrendercopyex (all backends), testgl2, testgles2,testintersections
2013-11-19Fixed SONAME lookup for runtime loading of shared libraries in CMake project.Ryan C. Gordon1-38/+57
Fixes Bugzilla #2249.
2013-11-19-fvisibility=hidden is no longer a requirement for dynamic X11.Ryan C. Gordon1-11/+0
We don't clash with Xlib symbols anymore.
2013-11-14Renamed things named after BeOS to be named after Haiku instead.Ryan C. Gordon1-1/+1
2013-11-13Started BeOS removal: merged BeOS thread and pthread code.Ryan C. Gordon1-0/+3
Haiku uses most of the standard pthread API, with a few #ifdefs where we still need to fallback onto the old BeOS APIs. BeOS, however, does not support pthreads (or maybe doesn't support it well), so I'm unplugging support for the platform with this changeset. Be Inc went out of business in 2001.
2013-10-18Fixed bug 2108 - CMake does not set X11 includes properly for sdl2-config ↵Sam Lantinga1-0/+8
and friends Marcus von Appen The autotools-based code uses X_CFLAGS and some hackish x_includes code to add some necessary includes to SDL_CFLAGS for proper X11 and OpenGL include handling. At the moment, the cmake-baed build code does not do that. Below is a patch, which provides the necessary changes to add a proper include to the SDL_CFLAGS.
2013-08-22Separate EGL / GL ES detection in CMakeGabriel Jacobo1-15/+19
2013-07-26Fix cmake breakage (thanks Marcus)Jørgen P. Tjernø1-1/+1
My recent change broke the sdlcheck.cmake by not escaping some quotes properly. Thanks to Marcus von Appen for pointing it out and providing the patch.
2013-07-23Mac: Codify SDK and OS requirements, and clean up.Jørgen P. Tjernø1-4/+4
This #errors if you're using an SDK or deployment target that is less than 10.6 and 10.5, respectively, and cleans up uses of MAC_OS_X_VERSION_MIN_REQUIRED and MAC_OS_X_VERSION_MAX_ALLOWED according to those requirements.
2013-07-13Explicitly check for Xext.h in the CMake project, fail if missing.Ryan C. Gordon1-0/+5
Added to match configure script change in hg changeset 8f118396264b.
2013-07-11Added src/thread/pthread/SDL_systls.c to the CMake scripts.Ryan C. Gordon1-0/+1
2013-07-07Added an SDL2 OpenBSD sndio(7) audio target.Ryan C. Gordon1-0/+31
2013-06-02Fix compilation with libX11 >= 1.5.99.902.Azamat H. Hackimov1-0/+8
These changes fixes bug #1769 for SDL2 (http://bugzilla.libsdl.org/show_bug.cgi?id=1769).
2013-05-16Fixed bug 1839 - SDL2 Cmake: VIDEO_COCOA check fails on OS X; VIDEO_COCOA ↵Sam Lantinga2-1/+10
sources aren't compiled.
2013-04-19Fixes bug #1709, pthread tests fixes for CMake (Thanks Scott Percival!)Gabriel Jacobo1-2/+5
2012-11-16Adds CMake build system by Marcus Von Appen (bug #1597)Gabriel Jacobo2-0/+873