Skip to content

Commit d07cf69

Browse files
committed
ChaosMod/LuaScripts: Refactor; get rid of single-state evaluation; split exposables into immediate and late loading
1 parent 0d1ea86 commit d07cf69

File tree

3 files changed

+275
-335
lines changed

3 files changed

+275
-335
lines changed

ChaosMod/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set_target_properties(ChaosMod PROPERTIES SUFFIX ".asi")
1313
set_target_properties(ChaosMod PROPERTIES CXX_STANDARD 20)
1414
set_target_properties(ChaosMod PROPERTIES CXX_SCAN_FOR_MODULES OFF)
1515

16-
target_compile_definitions(ChaosMod PUBLIC $<$<CONFIG:Debug>:CHAOSDEBUG> NDEBUG WIN32_LEAN_AND_MEAN SOL_ALL_SAFETIES_ON SOL_DEFAULT_PASS_ON_ERROR SOL_STRINGS_ARE_NUMBERS)
16+
target_compile_definitions(ChaosMod PUBLIC $<$<CONFIG:Debug>:CHAOSDEBUG> NDEBUG WIN32_LEAN_AND_MEAN SOL_ALL_SAFETIES_ON SOL_DEFAULT_PASS_ON_ERROR)
1717

1818
set(include_dirs ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../vendor ${PROJECT_SOURCE_DIR}/../vendor/lua/include)
1919
set(link_libs shv minhook lua54 winmm d3dcompiler xinput)
@@ -35,7 +35,7 @@ target_link_directories(ChaosMod PUBLIC ${PROJECT_SOURCE_DIR}/../vendor/lua)
3535
target_link_libraries(ChaosMod PUBLIC ${link_libs})
3636

3737
if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
38-
target_compile_options(ChaosMod PUBLIC /Zi /GT /W2 /WX -DUNICODE -D_UNICODE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
38+
target_compile_options(ChaosMod PUBLIC /Zi /GT /W2 /WX /bigobj -DUNICODE -D_UNICODE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
3939
target_link_options(ChaosMod PUBLIC /DEBUG /OPT:REF /OPT:ICF)
4040
else()
4141
target_compile_options(ChaosMod PUBLIC -municode -flarge-source-files -Werror -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-variable -Wno-maybe-uninitialized -Wno-array-bounds -Wno-unused-but-set-variable)

0 commit comments

Comments
 (0)