Permalink
Browse files

Merge branch 'develop' of github.com:spring/spring into develop

  • Loading branch information...
2 parents 33e14aa + 72246d6 commit 8c31dead5097ce7a534188ad82353be36e44887b rt committed Sep 25, 2012
Showing with 4 additions and 12 deletions.
  1. +2 −7 rts/CMakeLists.txt
  2. +1 −0 rts/System/Sync/FPUCheck.cpp
  3. +1 −5 rts/builds/dedicated/CMakeLists.txt
View
@@ -72,15 +72,10 @@ IF (UNIX AND NOT MINGW)
LIST(APPEND engineCommonLibraries dl)
ENDIF (UNIX AND NOT MINGW)
+FIND_PACKAGE_STATIC(ZLIB REQUIRED)
LIST(APPEND engineCommonLibraries ${DEVIL_IL_LIBRARY} ${JPEG_LIBRARY} ${PNG_LIBRARY})
LIST(APPEND engineCommonLibraries ${Boost_REGEX_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SIGNALS_LIBRARY})
-LIST(APPEND engineCommonLibraries lua luasocket 7zip oscpack ${SPRING_MINIZIP_LIBRARY} streflop lobby assimp)
-
-IF (PREFER_STATIC_LIBS)
- # dependency of minizip
- FIND_PACKAGE_STATIC(ZLIB REQUIRED)
- LIST(APPEND engineCommonLibraries ${ZLIB_LIBRARY})
-ENDIF (PREFER_STATIC_LIBS)
+LIST(APPEND engineCommonLibraries lua luasocket 7zip oscpack ${SPRING_MINIZIP_LIBRARY} ${ZLIB_LIBRARY} streflop lobby assimp)
IF (MINGW)
LIST(APPEND engineCommonLibraries ${WIN32_LIBRARIES} mingw32)
@@ -10,6 +10,7 @@
#include "lib/gml/gml_base.h"
#include "System/OpenMP_cond.h"
#include "System/Log/ILog.h"
+#include "System/Platform/errorhandler.h"
#include "System/Platform/Threading.h"
/**
@@ -20,16 +20,12 @@ SET(ENGINE_SRC_ROOT_DIR "${CMAKE_SOURCE_DIR}/rts")
### Assemble libraries
LIST(APPEND engineDedicatedLibraries ${Boost_REGEX_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY})
-LIST(APPEND engineDedicatedLibraries 7zip ${SPRING_MINIZIP_LIBRARY} lua)
+LIST(APPEND engineDedicatedLibraries 7zip ${SPRING_MINIZIP_LIBRARY} ${ZLIB_LIBRARY} lua)
LIST(APPEND engineDedicatedLibraries headlessStubs)
IF (UNIX)
# Needed for dynamically loading shared libraries (on some OS)
LIST(APPEND engineDedicatedLibraries dl)
ENDIF (UNIX)
-IF (PREFER_STATIC_LIBS)
- # dependency of minizip
- LIST(APPEND engineDedicatedLibraries ${ZLIB_LIBRARY})
-ENDIF (PREFER_STATIC_LIBS)
IF (MINGW OR APPLE)
# Windows:

0 comments on commit 8c31dea

Please sign in to comment.