Permalink
Browse files

give up to static link SDL

  • Loading branch information...
jK
jK committed Aug 21, 2012
1 parent af355a6 commit 53070bcb36e230b409c8482bef558707f104ab00
View
@@ -209,7 +209,7 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
# Note the missing REQUIRED, as headless & dedi may not depend on those.
# So req. checks are done in the build target's CMakeLists.txt.
-FIND_PACKAGE_STATIC(SDL)
+FIND_PACKAGE(SDL)
FIND_PACKAGE_STATIC(DevIL)
IF (PREFER_STATIC_LIBS)
# dependencies of DevIL
@@ -39,7 +39,7 @@ IF (MINGW OR APPLE)
# OS X:
# Cocoa requires the SDL libary, whenever the SDL headers are used,
# due to some #define magic, which is practically impossible to workaround.
- FIND_PACKAGE_STATIC(SDL REQUIRED)
+ FIND_PACKAGE(SDL REQUIRED)
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
ELSE (MINGW OR APPLE)
# Use a direct copy of the GL and SDL headers,
@@ -9,7 +9,7 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
### Assemble libraries
-FIND_PACKAGE_STATIC(SDL REQUIRED)
+FIND_PACKAGE(SDL REQUIRED)
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
LIST(APPEND engineLibraries ${SDL_LIBRARY})
@@ -22,7 +22,7 @@ IF (MINGW OR APPLE)
# due to some #define magic, which is practically impossible to workaround.
FIND_PACKAGE(OpenGL REQUIRED)
FIND_PACKAGE(GLU REQUIRED)
- FIND_PACKAGE_STATIC(SDL REQUIRED)
+ FIND_PACKAGE(SDL REQUIRED)
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
ELSE (MINGW OR APPLE)
# Use a direct copy of the GL and SDL headers,
@@ -22,7 +22,7 @@ endif (USE_GML_DEBUG)
### Assemble libraries
-FIND_PACKAGE_STATIC(SDL REQUIRED)
+FIND_PACKAGE(SDL REQUIRED)
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
LIST(APPEND engineLibraries ${SDL_LIBRARY})
@@ -11,7 +11,7 @@ if (USE_GML_DEBUG)
ADD_DEFINITIONS(-DUSE_GML_DEBUG)
endif (USE_GML_DEBUG)
-FIND_PACKAGE_STATIC(SDL REQUIRED)
+FIND_PACKAGE(SDL REQUIRED)
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
SET(gmlSources
View
@@ -9,7 +9,7 @@ Else (NOT Boost_FOUND)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
- FIND_PACKAGE_STATIC(SDL REQUIRED)
+ FIND_PACKAGE(SDL REQUIRED)
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
SET(ENGINE_SOURCE_DIR "${CMAKE_SOURCE_DIR}/rts")
@@ -19,7 +19,7 @@ IF (MINGW)
# We still need these header files,
# even if we are not going to link with SDL.
# We have them available anyway (mingwlibs).
- FIND_PACKAGE_STATIC(SDL REQUIRED)
+ FIND_PACKAGE(SDL REQUIRED)
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
ELSE (MINGW)
# Use a direct copy of the GL and SDL headers,

0 comments on commit 53070bc

Please sign in to comment.