From 1d86ae41ea7f7e1948f3cee8c77f77fde5f5ee83 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 1 Aug 2014 23:46:43 +0200 Subject: [PATCH] Prepare the build-system for compiling with libSDL2 --- CMakeLists.txt | 33 ++++++--- cmake/FindSDL2.cmake | 161 +++++++++++++++++++++++++++++++++++++++++++ cmake/config-cmake.h | 4 +- configure | 7 ++ src/control.c | 2 +- 5 files changed, 196 insertions(+), 11 deletions(-) create mode 100644 cmake/FindSDL2.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 14843b38..f3cc148d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,10 +82,20 @@ endif(APPLE) # Check for libraries: # #################### -find_package(SDL REQUIRED) -if(NOT SDL_FOUND) - message(FATAL_ERROR "SDL library not found!") -endif(NOT SDL_FOUND) +if(ENABLE_SDL2) + find_package(SDL2 REQUIRED) + if(NOT SDL2_FOUND) + message(FATAL_ERROR "SDL2 library not found!") + endif(NOT SDL2_FOUND) + set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIR}) + set(SDL_LIBRARY ${SDL2_LIBRARY}) + set(SDLMAIN_LIBRARY ${SDL2MAIN_LIBRARY}) +else(ENABLE_SDL2) + find_package(SDL REQUIRED) + if(NOT SDL_FOUND) + message(FATAL_ERROR "SDL library not found!") + endif(NOT SDL_FOUND) +endif(ENABLE_SDL2) find_package(Math) @@ -136,9 +146,16 @@ if(DETECTED_LFS_CFLAGS) endif(DETECTED_LFS_CFLAGS) # Additional CFLAGS suggested by the SDL library: -execute_process(COMMAND pkg-config --cflags-only-other sdl - OUTPUT_VARIABLE DETECTED_SDL_CFLAGS - ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) +if(ENABLE_SDL2) + add_definitions(-DWITH_SDL2) + execute_process(COMMAND pkg-config --cflags-only-other sdl2 + OUTPUT_VARIABLE DETECTED_SDL_CFLAGS + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) +else(ENABLE_SDL2) + execute_process(COMMAND pkg-config --cflags-only-other sdl + OUTPUT_VARIABLE DETECTED_SDL_CFLAGS + ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) +endif(ENABLE_SDL2) if(DETECTED_SDL_CFLAGS) add_definitions(${DETECTED_SDL_CFLAGS}) # message(STATUS "Additional CFLAGS of SDL: ${DETECTED_SDL_CFLAGS}") @@ -151,7 +168,7 @@ endif(DETECTED_SDL_CFLAGS) check_include_files(termios.h HAVE_TERMIOS_H) check_include_files(strings.h HAVE_STRINGS_H) check_include_files(malloc.h HAVE_MALLOC_H) -check_include_files(SDL/SDL_config.h HAVE_SDL_SDL_CONFIG_H) +check_include_files(${SDL_INCLUDE_DIR}/SDL_config.h HAVE_SDL_CONFIG_H) check_include_files(sys/times.h HAVE_SYS_TIMES_H) check_include_files("sys/socket.h;sys/un.h" HAVE_UNIX_DOMAIN_SOCKETS) diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake new file mode 100644 index 00000000..87ddd7f2 --- /dev/null +++ b/cmake/FindSDL2.cmake @@ -0,0 +1,161 @@ +# Locate SDL2 library +# This module defines +# SDL2_LIBRARY, the name of the library to link against +# SDL2_FOUND, if false, do not try to link to SDL2 +# SDL2_INCLUDE_DIR, where to find SDL.h +# +# This module responds to the the flag: +# SDL2_BUILDING_LIBRARY +# If this is defined, then no SDL2main will be linked in because +# only applications need main(). +# Otherwise, it is assumed you are building an application and this +# module will attempt to locate and set the the proper link flags +# as part of the returned SDL2_LIBRARY variable. +# +# Don't forget to include SDLmain.h and SDLmain.m your project for the +# OS X framework based version. (Other versions link to -lSDL2main which +# this module will try to find on your behalf.) Also for OS X, this +# module will automatically add the -framework Cocoa on your behalf. +# +# +# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration +# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library +# (SDL2.dll, libsdl2.so, SDL2.framework, etc). +# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again. +# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value +# as appropriate. These values are used to generate the final SDL2_LIBRARY +# variable, but when these values are unset, SDL2_LIBRARY does not get created. +# +# +# $SDL2DIR is an environment variable that would +# correspond to the ./configure --prefix=$SDL2DIR +# used in building SDL2. +# l.e.galup 9-20-02 +# +# Modified by Eric Wing. +# Added code to assist with automated building by using environmental variables +# and providing a more controlled/consistent search behavior. +# Added new modifications to recognize OS X frameworks and +# additional Unix paths (FreeBSD, etc). +# Also corrected the header search path to follow "proper" SDL guidelines. +# Added a search for SDL2main which is needed by some platforms. +# Added a search for threads which is needed by some platforms. +# Added needed compile switches for MinGW. +# +# On OSX, this will prefer the Framework version (if found) over others. +# People will have to manually change the cache values of +# SDL2_LIBRARY to override this selection or set the CMake environment +# CMAKE_INCLUDE_PATH to modify the search paths. +# +# Note that the header path has changed from SDL2/SDL.h to just SDL.h +# This needed to change because "proper" SDL convention +# is #include "SDL.h", not . This is done for portability +# reasons because not all systems place things in SDL2/ (see FreeBSD). + +#============================================================================= +# Copyright 2003-2009 Kitware, Inc. +# +# Distributed under the OSI-approved BSD License (the "License"); +# see http://www.cmake.org/cmake/project/license.html for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= + +SET(SDL2_SEARCH_PATHS + ~/Library/Frameworks + /Library/Frameworks + /usr/local + /usr + /sw # Fink + /opt/local # DarwinPorts + /opt/csw # Blastwave + /opt +) + +FIND_PATH(SDL2_INCLUDE_DIR SDL_scancode.h + HINTS + $ENV{SDL2DIR} + PATH_SUFFIXES include/SDL2 include + PATHS ${SDL2_SEARCH_PATHS} +) + +FIND_LIBRARY(SDL2_LIBRARY_TEMP + NAMES SDL2 + HINTS + $ENV{SDL2DIR} + PATH_SUFFIXES lib64 lib + PATHS ${SDL2_SEARCH_PATHS} +) + +IF(NOT SDL2_BUILDING_LIBRARY) + IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework") + # Non-OS X framework versions expect you to also dynamically link to + # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms + # seem to provide SDL2main for compatibility even though they don't + # necessarily need it. + FIND_LIBRARY(SDL2MAIN_LIBRARY + NAMES SDL2main + HINTS + $ENV{SDL2DIR} + PATH_SUFFIXES lib64 lib + PATHS ${SDL2_SEARCH_PATHS} + ) + ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework") +ENDIF(NOT SDL2_BUILDING_LIBRARY) + +# SDL2 may require threads on your system. +# The Apple build may not need an explicit flag because one of the +# frameworks may already provide it. +# But for non-OSX systems, I will use the CMake Threads package. +IF(NOT APPLE) + FIND_PACKAGE(Threads) +ENDIF(NOT APPLE) + +# MinGW needs an additional library, mwindows +# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows +# (Actually on second look, I think it only needs one of the m* libraries.) +IF(MINGW) + SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW") +ENDIF(MINGW) + +IF(SDL2_LIBRARY_TEMP) + # For SDL2main + IF(NOT SDL2_BUILDING_LIBRARY) + IF(SDL2MAIN_LIBRARY) + SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP}) + ENDIF(SDL2MAIN_LIBRARY) + ENDIF(NOT SDL2_BUILDING_LIBRARY) + + # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa. + # CMake doesn't display the -framework Cocoa string in the UI even + # though it actually is there if I modify a pre-used variable. + # I think it has something to do with the CACHE STRING. + # So I use a temporary variable until the end so I can set the + # "real" variable in one-shot. + IF(APPLE) + SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa") + ENDIF(APPLE) + + # For threads, as mentioned Apple doesn't need this. + # In fact, there seems to be a problem if I used the Threads package + # and try using this line, so I'm just skipping it entirely for OS X. + IF(NOT APPLE) + SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT}) + ENDIF(NOT APPLE) + + # For MinGW library + IF(MINGW) + SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP}) + ENDIF(MINGW) + + # Set the final string here so the GUI reflects the final state. + SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found") + # Set the temp variable to INTERNAL so it is not seen in the CMake GUI + SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "") +ENDIF(SDL2_LIBRARY_TEMP) + +INCLUDE(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) diff --git a/cmake/config-cmake.h b/cmake/config-cmake.h index f1e186a4..c5b7d767 100644 --- a/cmake/config-cmake.h +++ b/cmake/config-cmake.h @@ -31,8 +31,8 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_STRINGS_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SDL_SDL_CONFIG_H 1 +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_SDL_CONFIG_H 1 /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_TIMES_H 1 diff --git a/configure b/configure index c3feb3fc..6d004b9f 100755 --- a/configure +++ b/configure @@ -20,6 +20,7 @@ print_help() echo " --disable-tracing Disable tracing messages for debugging" echo " --enable-winuae-cpu Enable WinUAE CPU core (experimental!)" echo " --disable-osx-bundle Disable application bundling on Mac OS X" + echo " --enable-sdl2 Compile with libsdl 2.0 instead of 1.2" echo " --cross-compile-win64_32 Build the 32 bit Windows version under linux using mingw-w64" echo " --cross-compile-win64_64 Build the 64 bit Windows version under linux using mingw-w64" echo @@ -81,6 +82,12 @@ do --disable-osx-bundle) cmake_args="$cmake_args -DENABLE_OSX_BUNDLE:BOOL=0" ;; + --enable-sdl2) + cmake_args="$cmake_args -DENABLE_SDL2:BOOL=1" + ;; + --disable-sdl2) + cmake_args="$cmake_args -DENABLE_SDL2:BOOL=0" + ;; --cross-compile-win64_32) cmake_args="$cmake_args -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-mingw32-win64_32.cmake" ;; diff --git a/src/control.c b/src/control.c index 62e59f06..583b8cf4 100644 --- a/src/control.c +++ b/src/control.c @@ -491,7 +491,7 @@ const char *Control_SetSocket(const char *socketpath) * SDL_syswm.h automatically includes everything else needed. */ -#if HAVE_SDL_SDL_CONFIG_H +#if HAVE_SDL_CONFIG_H #include #endif