diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-03 14:51:12 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-03 14:51:12 +0300 |
commit | 529ca9297563d44db6f7354438c183ad8f1fe18d (patch) | |
tree | 96b93a70d0c73fe92dc09f2ca9e0f8f10340c30b /CMakeLists.txt | |
parent | 7345d558f9caa448dd1e63f0c2ae169345bb66df (diff) |
MinGW still uses SDL1 - will need to change this of course but no need
to keep compilation broken for now
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index abee2a9c1cd..99357507cbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1494,6 +1494,13 @@ elseif(WIN32) ) endif() + if(WITH_SDL) + set(SDL ${LIBDIR}/sdl) + set(SDL_INCLUDE_DIR ${SDL}/include) + set(SDL_LIBRARY SDL2) + set(SDL_LIBPATH ${SDL}/lib) + endif() + # used in many places so include globally, like OpenGL blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}") @@ -1723,6 +1730,13 @@ elseif(WIN32) set(OPENCOLORIO_DEFINITIONS) endif() + if(WITH_SDL) + set(SDL ${LIBDIR}/sdl) + set(SDL_INCLUDE_DIR ${SDL}/include) + set(SDL_LIBRARY SDL) + set(SDL_LIBPATH ${SDL}/lib) + endif() + set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152") ## DISABLE - causes linking errors @@ -1754,13 +1768,6 @@ elseif(WIN32) set(SNDFILE_LIBPATH ${SNDFILE}/lib) # TODO, deprecate endif() - if(WITH_SDL) - set(SDL ${LIBDIR}/sdl) - set(SDL_INCLUDE_DIR ${SDL}/include) - set(SDL_LIBRARY SDL2) - set(SDL_LIBPATH ${SDL}/lib) - endif() - if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) add_definitions(-D__SSE__ -D__MMX__) endif() |