cmake build system: various fixes. use 8MB stack on windows
This commit is contained in:
parent
bab955103e
commit
9c521a70d6
|
|
@ -4,6 +4,35 @@ project (tyrutils)
|
||||||
include_directories(
|
include_directories(
|
||||||
"${PROJECT_SOURCE_DIR}/include")
|
"${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
|
set(LIGHT_SOURCES
|
||||||
light/entities.c
|
light/entities.c
|
||||||
light/litfile.c
|
light/litfile.c
|
||||||
|
|
@ -14,7 +43,9 @@ set(LIGHT_SOURCES
|
||||||
common/cmdlib.c
|
common/cmdlib.c
|
||||||
common/mathlib.c
|
common/mathlib.c
|
||||||
common/log.c
|
common/log.c
|
||||||
common/threads.c)
|
common/threads.c
|
||||||
|
${COMMON_INCLUDES}
|
||||||
|
${LIGHT_INCLUDES})
|
||||||
|
|
||||||
set(VIS_SOURCES
|
set(VIS_SOURCES
|
||||||
vis/flow.c
|
vis/flow.c
|
||||||
|
|
@ -25,21 +56,25 @@ set(VIS_SOURCES
|
||||||
common/mathlib.c
|
common/mathlib.c
|
||||||
common/bspfile.c
|
common/bspfile.c
|
||||||
common/log.c
|
common/log.c
|
||||||
common/threads.c)
|
common/threads.c
|
||||||
|
${COMMON_INCLUDES}
|
||||||
|
${VIS_INCLUDES})
|
||||||
|
|
||||||
set(BSPINFO_SOURCES
|
set(BSPINFO_SOURCES
|
||||||
bspinfo/bspinfo.c
|
bspinfo/bspinfo.c
|
||||||
common/cmdlib.c
|
common/cmdlib.c
|
||||||
common/bspfile.c
|
common/bspfile.c
|
||||||
common/log.c
|
common/log.c
|
||||||
common/threads.c)
|
common/threads.c
|
||||||
|
${COMMON_INCLUDES})
|
||||||
|
|
||||||
set(BSPUTIL_SOURCES
|
set(BSPUTIL_SOURCES
|
||||||
bsputil/bsputil.c
|
bsputil/bsputil.c
|
||||||
common/cmdlib.c
|
common/cmdlib.c
|
||||||
common/bspfile.c
|
common/bspfile.c
|
||||||
common/log.c
|
common/log.c
|
||||||
common/threads.c)
|
common/threads.c
|
||||||
|
${COMMON_INCLUDES})
|
||||||
|
|
||||||
set(QBSP_SOURCES
|
set(QBSP_SOURCES
|
||||||
common/threads.c
|
common/threads.c
|
||||||
|
|
@ -63,7 +98,8 @@ set(QBSP_SOURCES
|
||||||
qbsp/util.c
|
qbsp/util.c
|
||||||
qbsp/wad.c
|
qbsp/wad.c
|
||||||
qbsp/winding.c
|
qbsp/winding.c
|
||||||
qbsp/writebsp.c)
|
qbsp/writebsp.c
|
||||||
|
${QBSP_INCLUDES})
|
||||||
|
|
||||||
find_package (Threads)
|
find_package (Threads)
|
||||||
|
|
||||||
|
|
@ -78,3 +114,11 @@ target_link_libraries (light ${CMAKE_THREAD_LIBS_INIT})
|
||||||
if (CMAKE_USE_PTHREADS_INIT)
|
if (CMAKE_USE_PTHREADS_INIT)
|
||||||
add_definitions(-DUSE_PTHREADS)
|
add_definitions(-DUSE_PTHREADS)
|
||||||
endif (CMAKE_USE_PTHREADS_INIT)
|
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)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue