From ebba25b06f643819425b59765a8f6c2055a4c9c6 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 16 Dec 2011 06:24:21 +0000 Subject: [PATCH] - updated so streflop can be totally ignored when that cmake switch is off --- source/configurator/CMakeLists.txt | 17 +++++++++--- source/g3d_viewer/CMakeLists.txt | 17 +++++++++--- source/glest_game/CMakeLists.txt | 22 ++++++++++++--- source/glest_game/game/game.cpp | 1 - source/glest_map_editor/CMakeLists.txt | 22 ++++++++++++--- source/shared_lib/CMakeLists.txt | 27 ++++++++++++++----- .../include/platform/common/math_wrapper.h | 2 +- 7 files changed, 83 insertions(+), 25 deletions(-) diff --git a/source/configurator/CMakeLists.txt b/source/configurator/CMakeLists.txt index 689b03275..31fc59db4 100644 --- a/source/configurator/CMakeLists.txt +++ b/source/configurator/CMakeLists.txt @@ -76,11 +76,16 @@ IF(BUILD_MEGAGLEST_CONFIGURATOR) ${GLEST_LIB_INCLUDE_ROOT}map ${GLEST_LIB_INCLUDE_ROOT}sound ${GLEST_LIB_INCLUDE_ROOT}xml - ${GLEST_LIB_INCLUDE_ROOT}streflop ${GLEST_MAIN_INCLUDE_ROOT}facilities ${GLEST_MAIN_INCLUDE_ROOT}game - ${GLEST_MAIN_INCLUDE_ROOT}global - ) + ${GLEST_MAIN_INCLUDE_ROOT}global) + + IF(WANT_STREFLOP) + SET(GLEST_LIB_INCLUDE_DIRS + ${GLEST_LIB_INCLUDE_DIRS} + ${GLEST_LIB_INCLUDE_ROOT}streflop) + ENDIF() + INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_DIRS} ) IF(WIN32) @@ -119,7 +124,11 @@ IF(BUILD_MEGAGLEST_CONFIGURATOR) SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) - TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) + + IF(WANT_STREFLOP) + TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) + ENDIF() + IF(WIN32) TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest) ELSE() diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt index 1fa3f297b..82d04c79d 100644 --- a/source/g3d_viewer/CMakeLists.txt +++ b/source/g3d_viewer/CMakeLists.txt @@ -82,14 +82,19 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) ${GLEST_LIB_INCLUDE_ROOT}graphics/gl ${GLEST_LIB_INCLUDE_ROOT}map ${GLEST_LIB_INCLUDE_ROOT}sound - ${GLEST_LIB_INCLUDE_ROOT}streflop ${GLEST_LIB_INCLUDE_ROOT}xml ${GLEST_MAIN_INCLUDE_ROOT}facilities ${GLEST_MAIN_INCLUDE_ROOT}graphics ${GLEST_MAIN_INCLUDE_ROOT}game ${GLEST_MAIN_INCLUDE_ROOT}global - ${GLEST_MAIN_INCLUDE_ROOT}sound - ) + ${GLEST_MAIN_INCLUDE_ROOT}sound) + + IF(WANT_STREFLOP) + SET(GLEST_LIB_INCLUDE_DIRS + ${GLEST_LIB_INCLUDE_DIRS} + ${GLEST_LIB_INCLUDE_ROOT}streflop) + ENDIF() + INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_DIRS} ) IF(WIN32) @@ -131,7 +136,11 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER) SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) - TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) + + IF(WANT_STREFLOP) + TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) + ENDIF() + IF(WIN32) TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest) ELSE() diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index 7b2a3219f..be2085139 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -126,9 +126,15 @@ IF(BUILD_MEGAGLEST) ${GLEST_LIB_INCLUDE_ROOT}xml ${GLEST_LIB_INCLUDE_ROOT}glew ${GLEST_LIB_INCLUDE_ROOT}lua - ${GLEST_LIB_INCLUDE_ROOT}streflop - ${GLEST_LIB_INCLUDE_ROOT}streflop/libm_flt32_source ${GLEST_LIB_INCLUDE_ROOT}map) + + IF(WANT_STREFLOP) + SET(GLEST_LIB_INCLUDE_DIRS + ${GLEST_LIB_INCLUDE_DIRS} + ${GLEST_LIB_INCLUDE_ROOT}streflop + ${GLEST_LIB_INCLUDE_ROOT}streflop/libm_flt32_source) + ENDIF() + INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_DIRS} ) #INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_ROOT}platform/sdl ) @@ -194,11 +200,19 @@ IF(BUILD_MEGAGLEST) SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) + + SET(MG_STREFLOP "") + IF(WANT_STREFLOP) + SET(MG_STREFLOP "streflop") + ENDIF() + IF(WIN32) - TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop libmegaglest stdc++ moldname mingwex msvcrt user32 kernel32) + TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 ${MG_STREFLOP} libmegaglest stdc++ moldname mingwex msvcrt user32 kernel32) ENDIF() IF(NOT WIN32) - TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) + IF(WANT_STREFLOP) + TARGET_LINK_LIBRARIES(${TARGET_NAME} ${MG_STREFLOP}) + ENDIF() TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest) ENDIF() TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp index 4235f324a..c99578e93 100644 --- a/source/glest_game/game/game.cpp +++ b/source/glest_game/game/game.cpp @@ -23,7 +23,6 @@ #include "network_manager.h" #include "checksum.h" #include "auto_test.h" -#include "FPUCheck.h" #include "menu_state_keysetup.h" #include "leak_dumper.h" diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt index d59e22cd4..9a8dfad84 100644 --- a/source/glest_map_editor/CMakeLists.txt +++ b/source/glest_map_editor/CMakeLists.txt @@ -76,11 +76,16 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) ${GLEST_LIB_INCLUDE_ROOT}graphics ${GLEST_LIB_INCLUDE_ROOT}graphics/gl ${GLEST_LIB_INCLUDE_ROOT}map - ${GLEST_LIB_INCLUDE_ROOT}streflop ${GLEST_MAIN_INCLUDE_ROOT}facilities ${GLEST_MAIN_INCLUDE_ROOT}game ${GLEST_MAIN_INCLUDE_ROOT}global) + IF(WANT_STREFLOP) + SET(GLEST_LIB_INCLUDE_DIRS + ${GLEST_LIB_INCLUDE_DIRS} + ${GLEST_LIB_INCLUDE_ROOT}streflop) + ENDIF() + INCLUDE_DIRECTORIES( ${GLEST_LIB_INCLUDE_DIRS} ) IF(WIN32) @@ -122,11 +127,20 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR) SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1) ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES}) - IF(WIN32) - TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop libmegaglest stdc++ moldname mingwex msvcrt user32 kernel32) + + SET(MG_STREFLOP "") + IF(WANT_STREFLOP) + SET(MG_STREFLOP "streflop") + ENDIF() + + IF(WIN32) + TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 ${MG_STREFLOP} libmegaglest stdc++ moldname mingwex msvcrt user32 kernel32) + ENDIF() + + IF(WANT_STREFLOP) + TARGET_LINK_LIBRARIES(${TARGET_NAME} ${MG_STREFLOP}) ENDIF() - TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) IF(WIN32) TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest) ELSE() diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index f22d9ae51..e0924c051 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -2,7 +2,9 @@ # streflop # IMPORTANT: should come BEFORE finding packages -ADD_SUBDIRECTORY(sources/streflop) +IF(WANT_STREFLOP) + ADD_SUBDIRECTORY(sources/streflop) +ENDIF() ######################################################################################### # common libraries @@ -225,11 +227,16 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST platform/common sound sound/openal - streflop - streflop/libm_flt32_source util xml) + IF(WANT_STREFLOP) + SET(DIRS_WITH_SRC + ${DIRS_WITH_SRC} + streflop + streflop/libm_flt32_source) + ENDIF() + IF(NOT WANT_STATIC_LIBS) MESSAGE(STATUS "*** Searching for miniupnpc since WANT_STATIC_LIBS is off ...") FIND_PACKAGE(Miniupnpc) @@ -341,7 +348,9 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST ENDIF() # FIXME: hackish... - SET(STREFLOP_PROPERTIES "-DSTREFLOP_SSE -DLIBM_COMPILING_FLT32") + IF(WANT_STREFLOP) + SET(STREFLOP_PROPERTIES "-DSTREFLOP_SSE -DLIBM_COMPILING_FLT32") + ENDIF() SET_SOURCE_FILES_PROPERTIES(${MG_SOURCE_FILES} PROPERTIES COMPILE_FLAGS "${PLATFORM_SPECIFIC_DEFINES} ${STREFLOP_PROPERTIES} ${CXXFLAGS}") @@ -369,12 +378,16 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST ENDIF() IF(WIN32) - TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 streflop stdc++ moldname mingwex msvcrt user32 kernel32) + TARGET_LINK_LIBRARIES(${TARGET_NAME} stdc++ gcc odbc32 wsock32 winspool winmm shell32 comctl32 ctl3d32 advapi32 wsock32 opengl32 glu32 ole32 oleaut32 uuid mingw32 ddraw dsound dxguid ws2_32 iphlpapi wsock32 libogg libvorbis libvorbisfile zlib jpeg libpng xerces-c2_8_0 OpenAL32 libcurl winmm gdi32 opengl32 glu32 SDL SDLmain lua5.1 stdc++ moldname mingwex msvcrt user32 kernel32) - TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) + IF(WANT_STREFLOP) + TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) + ENDIF() TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) ELSE() - TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) + IF(WANT_STREFLOP) + TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop) + ENDIF() TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS}) ENDIF() diff --git a/source/shared_lib/include/platform/common/math_wrapper.h b/source/shared_lib/include/platform/common/math_wrapper.h index 4a003f7db..e90550b83 100644 --- a/source/shared_lib/include/platform/common/math_wrapper.h +++ b/source/shared_lib/include/platform/common/math_wrapper.h @@ -15,7 +15,7 @@ #ifdef USE_STREFLOP #include -#include "streflop_cond.h" +#include #else