- applied Mac osX patch #4 from GeoVah (thank you)
This commit is contained in:
parent
e8b28b4298
commit
61b66fb761
|
@ -82,7 +82,8 @@ FOREACH(DIR IN LISTS DIRS_WITH_SRC)
|
||||||
set(SRC_DIR_TO_GLOB ${DIR})
|
set(SRC_DIR_TO_GLOB ${DIR})
|
||||||
FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.cpp)
|
FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.cpp)
|
||||||
SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
|
SET(MG_SOURCE_FILES ${MG_SOURCE_FILES} ${SRC_FILES_FROM_THIS_DIR})
|
||||||
|
FILE(GLOB INCLUDE_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.h)
|
||||||
|
SET(MG_INCLUDE_FILES ${MG_INCLUDE_FILES} ${INCLUDE_FILES_FROM_THIS_DIR})
|
||||||
IF(APPLE)
|
IF(APPLE)
|
||||||
FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.mm)
|
FILE(GLOB SRC_FILES_FROM_THIS_DIR ${SRC_DIR_TO_GLOB}/*.mm)
|
||||||
#MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}")
|
#MESSAGE(STATUS "SRC_FILES_FROM_THIS_DIR: ${SRC_FILES_FROM_THIS_DIR}")
|
||||||
|
@ -100,7 +101,9 @@ SET(TARGET_NAME "glest.bin")
|
||||||
|
|
||||||
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
|
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
|
||||||
|
|
||||||
ADD_EXECUTABLE(${TARGET_NAME} ${MG_SOURCE_FILES})
|
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)
|
TARGET_LINK_LIBRARIES(${TARGET_NAME} streflop)
|
||||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} glest_lib)
|
TARGET_LINK_LIBRARIES(${TARGET_NAME} glest_lib)
|
||||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
|
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
|
||||||
|
|
|
@ -127,7 +127,7 @@ SET_SOURCE_FILES_PROPERTIES(${MG_INCLUDE_FILES} PROPERTIES HEADER_FILE_ONLY 1)
|
||||||
# [RCL] FIXME: make it compiler-agnostic
|
# [RCL] FIXME: make it compiler-agnostic
|
||||||
SET(CMAKE_CXX_FLAGS "-O3 -fno-strict-aliasing -frounding-math -fsignaling-nans -mfpmath=sse -msse")
|
SET(CMAKE_CXX_FLAGS "-O3 -fno-strict-aliasing -frounding-math -fsignaling-nans -mfpmath=sse -msse")
|
||||||
|
|
||||||
ADD_LIBRARY(glest_lib ${MG_SOURCE_FILES})
|
ADD_LIBRARY(glest_lib ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
|
||||||
TARGET_LINK_LIBRARIES(glest_lib streflop)
|
TARGET_LINK_LIBRARIES(glest_lib streflop)
|
||||||
TARGET_LINK_LIBRARIES(glest_lib ${EXTERNAL_LIBS})
|
TARGET_LINK_LIBRARIES(glest_lib ${EXTERNAL_LIBS})
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue