Merge branch 'master' of https://github.com/ZakatTeamI2P/mkxp-sunshine
This commit is contained in:
commit
24ebb8f4dc
|
|
@ -55,3 +55,6 @@ steamworks/
|
||||||
build/
|
build/
|
||||||
|
|
||||||
.vscode
|
.vscode
|
||||||
|
|
||||||
|
test.sh
|
||||||
|
test2.sh
|
||||||
|
|
|
||||||
|
|
@ -9,24 +9,22 @@ set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to
|
||||||
option(DEBUG "Debug mode" ON)
|
option(DEBUG "Debug mode" ON)
|
||||||
set(SDLTTF_VENDORED ON)
|
set(SDLTTF_VENDORED ON)
|
||||||
set(ZLIB_USE_STATIC_LIBS ON)
|
set(ZLIB_USE_STATIC_LIBS ON)
|
||||||
## Misc setup ##
|
|
||||||
|
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
|
|
||||||
# Debug stuff
|
|
||||||
# i want die
|
|
||||||
if(DEBUG)
|
if(DEBUG)
|
||||||
|
# Debug stuff
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
add_compile_options(/EHr /fsanitize /validate-charset /DEBUG /RTCu /RTCs /RTCc /guard:cf /GS)
|
add_compile_options(/EHr /fsanitize /validate-charset /DEBUG /RTCu /RTCs /RTCc /guard:cf /GS)
|
||||||
else()
|
else()
|
||||||
add_compile_options(-g3 -O0 -fno-omit-frame-pointer -ggdb -Wall -fcheck-new -gbtf)
|
add_compile_options(-g3 -O0 -fno-omit-frame-pointer -ggdb -Wall -fcheck-new -gbtf -pipe)
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
# Optimization stuff
|
# Optimization stuff
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
add_compile_options(/O2 /fp:fast /GL /GF /GA)
|
add_compile_options(/O2 /fp:fast /GL /GF /GA)
|
||||||
else()
|
else()
|
||||||
add_compile_options()
|
add_compile_options(-O3 -ffast-math -flto -pipe -funroll-loops -falign-functions=16 -falign-jumps=8 -falign-loops=8 -fno-common)
|
||||||
|
add_link_options(-Wl,-O2)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
## Setup main source ##
|
## Setup main source ##
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@
|
||||||
# 16:9 support
|
# 16:9 support
|
||||||
# EXPEREMENTAL!
|
# EXPEREMENTAL!
|
||||||
# (default: disabled)
|
# (default: disabled)
|
||||||
|
#
|
||||||
# EnableSixteenByNine=false
|
# EnableSixteenByNine=false
|
||||||
|
|
||||||
# Apply linear interpolation when game screen
|
# Apply linear interpolation when game screen
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue