diff --git a/CMakeLists.txt b/CMakeLists.txt index 299dadf..6262d24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,16 +87,6 @@ add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/RecompiledPatches/patches_bin.c DEPENDS ${CMAKE_SOURCE_DIR}/patches/patches.bin ) -# Generate mm_shader_cache.c from the MM shader cache if it exists -if (EXISTS ${CMAKE_SOURCE_DIR}/shadercache/mm_shader_cache.bin) - set(HAS_MM_SHADER_CACHE TRUE) - add_compile_definitions(HAS_MM_SHADER_CACHE) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mm_shader_cache.c ${CMAKE_CURRENT_BINARY_DIR}/mm_shader_cache.h - COMMAND file_to_c ${CMAKE_SOURCE_DIR}/shadercache/mm_shader_cache.bin mm_shader_cache_bytes ${CMAKE_CURRENT_BINARY_DIR}/mm_shader_cache.c ${CMAKE_CURRENT_BINARY_DIR}/mm_shader_cache.h - DEPENDS ${CMAKE_SOURCE_DIR}/shadercache/mm_shader_cache.bin - ) -endif() - # Recompile patches elf into patches.c add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/RecompiledPatches/patches.c @@ -111,6 +101,16 @@ add_custom_command(OUTPUT # Main executable add_executable(Zelda64Recompiled) +# Generate mm_shader_cache.c from the MM shader cache if it exists +if (EXISTS ${CMAKE_SOURCE_DIR}/shadercache/mm_shader_cache.bin) + set(HAS_MM_SHADER_CACHE TRUE) + target_compile_definitions(Zelda64Recompiled PRIVATE HAS_MM_SHADER_CACHE) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mm_shader_cache.c ${CMAKE_CURRENT_BINARY_DIR}/mm_shader_cache.h + COMMAND file_to_c ${CMAKE_SOURCE_DIR}/shadercache/mm_shader_cache.bin mm_shader_cache_bytes ${CMAKE_CURRENT_BINARY_DIR}/mm_shader_cache.c ${CMAKE_CURRENT_BINARY_DIR}/mm_shader_cache.h + DEPENDS ${CMAKE_SOURCE_DIR}/shadercache/mm_shader_cache.bin + ) +endif() + set (SOURCES ${CMAKE_SOURCE_DIR}/ultramodern/audio.cpp ${CMAKE_SOURCE_DIR}/ultramodern/events.cpp diff --git a/lib/rt64 b/lib/rt64 index 64b9e16..1adcbea 160000 --- a/lib/rt64 +++ b/lib/rt64 @@ -1 +1 @@ -Subproject commit 64b9e166f75b4dc44a59983b67c3e9ecc1f4cfd7 +Subproject commit 1adcbea31a04f2403da729eb5dfed3950dd7ec52 diff --git a/src/ui/ui_launcher.cpp b/src/ui/ui_launcher.cpp index 5c25218..fe56352 100644 --- a/src/ui/ui_launcher.cpp +++ b/src/ui/ui_launcher.cpp @@ -6,7 +6,7 @@ #include "nfd.h" #include -std::string version_number = "v1.0.1"; +std::string version_number = "v1.1.0"; Rml::DataModelHandle model_handle; bool mm_rom_valid = false;