From 9c521a70d6df2084da0347cb5eff0af0045d16bf Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sat, 25 Apr 2015 17:07:23 -0600 Subject: [PATCH] cmake build system: various fixes. use 8MB stack on windows --- CMakeLists.txt | 54 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16122e1e..bb3716a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,35 @@ project (tyrutils) include_directories( "${PROJECT_SOURCE_DIR}/include") +set(COMMON_INCLUDES + include/common/bspfile.h + include/common/cmdlib.h + include/common/lbmlib.h + include/common/log.h + include/common/mathlib.h + include/common/polylib.h + include/common/scriplib.h + include/common/threads.h + include/common/trilib.h + include/common/wadlib.h) + +set(LIGHT_INCLUDES + include/light/entities.h + include/light/light.h + include/light/litfile.h) + +set(VIS_INCLUDES + include/vis/leafbits.h + include/vis/vis.h) + +set(QBSP_INCLUDES + qbsp/bspfile.h + qbsp/file.h + qbsp/parser.h + qbsp/qbsp.h + qbsp/wad.h + qbsp/warnerr.h) + set(LIGHT_SOURCES light/entities.c light/litfile.c @@ -14,7 +43,9 @@ set(LIGHT_SOURCES common/cmdlib.c common/mathlib.c common/log.c - common/threads.c) + common/threads.c + ${COMMON_INCLUDES} + ${LIGHT_INCLUDES}) set(VIS_SOURCES vis/flow.c @@ -25,21 +56,25 @@ set(VIS_SOURCES common/mathlib.c common/bspfile.c common/log.c - common/threads.c) + common/threads.c + ${COMMON_INCLUDES} + ${VIS_INCLUDES}) set(BSPINFO_SOURCES bspinfo/bspinfo.c common/cmdlib.c common/bspfile.c common/log.c - common/threads.c) + common/threads.c + ${COMMON_INCLUDES}) set(BSPUTIL_SOURCES bsputil/bsputil.c common/cmdlib.c common/bspfile.c common/log.c - common/threads.c) + common/threads.c + ${COMMON_INCLUDES}) set(QBSP_SOURCES common/threads.c @@ -63,7 +98,8 @@ set(QBSP_SOURCES qbsp/util.c qbsp/wad.c qbsp/winding.c - qbsp/writebsp.c) + qbsp/writebsp.c + ${QBSP_INCLUDES}) find_package (Threads) @@ -78,3 +114,11 @@ target_link_libraries (light ${CMAKE_THREAD_LIBS_INIT}) if (CMAKE_USE_PTHREADS_INIT) add_definitions(-DUSE_PTHREADS) endif (CMAKE_USE_PTHREADS_INIT) + +#FIXME: Should be only for qbsp +add_definitions(-DDOUBLEVEC_T) + +#request 8MB stack +if (WIN32) + set(CMAKE_EXE_LINKER_FLAGS -Wl,--stack,8388608) +endif (WIN32)