Adding patch notes from git, UI, and loading files from the main install path properly.
Also fixed: * flying wands not pathing properly. * Lantern particles offset * Wand fire offset * Water spray from flask
This commit is contained in:
1 parent
06bb712a46
commit
9bb9797271
19 files changed
+1569
-134
No files matched your search
@@ -67,12 +67,20 @@ target_include_directories(ngblosc INTERFACE ${CMAKE_SOURCE_DIR}/third_party/c-b
|
||||
|
||||
add_executable(noita_gpu src/app/main.cpp src/audio/fmod_audio.cpp)
|
||||
target_link_libraries(noita_gpu PRIVATE ngspawn ngblosc nggpulua Vulkan::Vulkan)
|
||||
|
||||
#for changelog
|
||||
# the short git hash of the sources at configure time (the GIF metadata's "build", docs/GIF_METADATA.md)
|
||||
execute_process(COMMAND git rev-parse --short HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE NG_GIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
|
||||
if(NOT NG_GIT_HASH)
|
||||
set(NG_GIT_HASH "dev")
|
||||
endif()
|
||||
target_compile_definitions(noita_gpu PRIVATE NG_BUILD="${NG_GIT_HASH}")
|
||||
# the release notes of the menu (src/app/menu.h): the git log as "hash|date|subject" lines, beside the executable and in the demo folder
|
||||
execute_process(COMMAND git log -n 400 --date=short "--pretty=format:%h|%ad|%s" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE NG_GIT_LOG ERROR_QUIET)
|
||||
file(WRITE ${CMAKE_BINARY_DIR}/release_notes.txt "${NG_GIT_LOG}\n")
|
||||
add_custom_command(TARGET noita_gpu POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/release_notes.txt $<TARGET_FILE_DIR:noita_gpu>/release_notes.txt
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/release_notes.txt ${CMAKE_SOURCE_DIR}/demo/release_notes.txt)
|
||||
if(MSVC)
|
||||
target_compile_options(noita_gpu PRIVATE /W4 /permissive- /bigobj)
|
||||
endif()
|
||||
|
||||
Reference in new issue
Block a user