teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-26 05:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- little bit of CMake cleanup.

Browse source
This commit is contained in:
Christoph Oelckers 2019-12-26 14:16:00 +01:00
parent 62e9112133
commit eff25141a0
2 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
CMakeLists.txt
View file

@ -115,9 +115,9 @@ function( add_pk3 PK3_NAME PK3_DIR )
assort_pk3_source_folder("Source Files" ${PK3_DIR}) assort_pk3_source_folder("Source Files" ${PK3_DIR})
# Phase 4: Add the resulting PK3 to the install target. # Phase 4: Add the resulting PK3 to the install target.
if( WIN32 ) if( WIN32 )
set( INSTALL_PK3_PATH . CACHE STRING "Directory where demolition.pk3 will be placed during install." ) set( INSTALL_PK3_PATH . CACHE STRING "Directory where engine data will be placed during install." )
else() else()
set( INSTALL_PK3_PATH share/games/doom CACHE STRING "Directory where demolition.pk3 will be placed during install." ) set( INSTALL_PK3_PATH share/games/doom CACHE STRING "Directory where engine data will be placed during install." )
endif() endif()
install(FILES "${PROJECT_BINARY_DIR}/${PK3_NAME}" install(FILES "${PROJECT_BINARY_DIR}/${PK3_NAME}"
DESTINATION ${INSTALL_PK3_PATH} DESTINATION ${INSTALL_PK3_PATH}
@ -140,7 +140,7 @@ IF( NOT CMAKE_BUILD_TYPE )
FORCE ) FORCE )
ENDIF() ENDIF()
set( DEMOLITION_OUTPUT_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Directory where demolition.pk3 and the executable will be created." ) set( DEMOLITION_OUTPUT_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Directory where engine data and the executable will be created." )
set( DEMOLITION_EXE_NAME "demolition" CACHE FILEPATH "Name of the executable to create" ) set( DEMOLITION_EXE_NAME "demolition" CACHE FILEPATH "Name of the executable to create" )
if( MSVC ) if( MSVC )
# Allow the user to use DEMOLITION_OUTPUT_DIR as a single release point. # Allow the user to use DEMOLITION_OUTPUT_DIR as a single release point.
@ -206,20 +206,6 @@ if( MSVC )
#set( ALL_C_FLAGS "${ALL_C_FLAGS} /arch:SSE2") # This is already the default #set( ALL_C_FLAGS "${ALL_C_FLAGS} /arch:SSE2") # This is already the default
# if( CMAKE_SIZEOF_VOID_P MATCHES "4")
# # SSE2 option (to allow x87 in 32 bit and disallow extended feature sets which have not yet been checked for precision)
# option (DEMOLITION_USE_SSE2 "Use SSE2 instruction set")
# if (DEMOLITION_USE_SSE2)
# set( ALL_C_FLAGS "${ALL_C_FLAGS} /arch:SSE2")
# else ()
# if (MSVC_VERSION GREATER 1699)
# # On Visual C++ 2012 and later SSE2 is the default, so we need to switch it off explicitly
# set( ALL_C_FLAGS "${ALL_C_FLAGS} /arch:IA32")
# endif ()
# endif ()
# else()
# set( ALL_C_FLAGS "${ALL_C_FLAGS} /arch:SSE2")
# endif()
# Avoid CRT DLL dependancies in release builds, optionally generate assembly output for checking crash locations. # Avoid CRT DLL dependancies in release builds, optionally generate assembly output for checking crash locations.
option( DEMOLITION_GENERATE_ASM "Generate assembly output." OFF ) option( DEMOLITION_GENERATE_ASM "Generate assembly output." OFF )

4
source/CMakeLists.txt
View file

@ -429,7 +429,7 @@ add_custom_target( revision_check ALL
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
DEPENDS updaterevision ) DEPENDS updaterevision )
# Libraries Demolition needs # required libraries
message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" ) message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )
set( DEMOLITION_LIBS ${DEMOLITION_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${CMAKE_DL_LIBS}" ) set( DEMOLITION_LIBS ${DEMOLITION_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${CMAKE_DL_LIBS}" )
@ -468,7 +468,7 @@ endif()
# Start defining source files for Demolition # Start defining source files
set( PLAT_WIN32_SOURCES set( PLAT_WIN32_SOURCES
platform/win32/base_sysfb.cpp platform/win32/base_sysfb.cpp
platform/win32/gl_sysfb.cpp platform/win32/gl_sysfb.cpp