mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-18 22:26:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge in #139

Browse Source
This commit is contained in:
PJB3005
2026-04-01 23:43:26 +02:00
parent e7e363f9a4
commit cb77b629e6
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -5
View File
@@ -115,15 +115,11 @@ add_library(game SHARED ${DOLZEL_FILES} ${Z2AUDIOLIB_FILES} ${SSYSTEM_FILES} ${J
src/dusk/imgui/ImGuiStubLog.cpp
src/dusk/imgui/ImGuiAudio.cpp)
<<<<<<< 26-03-28-movie-player
target_link_libraries(game PRIVATE game_debug cxxopts::cxxopts)
target_link_libraries(game PRIVATE game_debug cxxopts::cxxopts absl::flat_hash_map)
if (DUSK_MOVIE_SUPPORT_REAL)
target_link_libraries(game PRIVATE libjpeg-turbo::turbojpeg-static)
target_compile_definitions(game PRIVATE MOVIE_SUPPORT=1)
endif ()
=======
target_link_libraries(game PRIVATE game_debug cxxopts::cxxopts absl::flat_hash_map)
>>>>>>> main
target_compile_definitions(game PRIVATE TARGET_PC AVOID_UB=1 VERSION=0 NDEBUG=1 NDEBUG_DEFINED=1 DEBUG_DEFINED=0
DUSK_TP_VERSION="${DUSK_TP_VERSION}" DUSK_GAME_NAME="${DUSK_GAME_NAME}" DUSK_GAME_VERSION="${DUSK_GAME_VERSION}")
target_precompile_headers(game PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:${CMAKE_SOURCE_DIR}/include/dusk_pch.hpp>")