From 281067ab65a64a14e58fc02f4bf015131dce9076 Mon Sep 17 00:00:00 2001 From: Mr-Wiseguy Date: Sun, 21 Jul 2024 18:17:39 -0400 Subject: [PATCH] Update RT64 for zipped texture pack support and fix CMake warning flags for clang-cl --- CMakeLists.txt | 5 ++++- lib/rt64 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7acd983..b1b6e79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) # set(CMAKE_CXX_VISIBILITY_PRESET hidden) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-everything -Wall -Wextra") +if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-everything /W4") +endif() # Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24: if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0") @@ -29,6 +31,7 @@ SET(LUNASVG_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) add_subdirectory(${CMAKE_SOURCE_DIR}/lib/lunasvg) # set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}") SET(ENABLE_SVG_PLUGIN ON CACHE BOOL "" FORCE) +SET(RMLUI_TESTS_ENABLED OFF CACHE BOOL "" FORCE) add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RmlUi) add_subdirectory(${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime) diff --git a/lib/rt64 b/lib/rt64 index b1a78bf..e0ef59e 160000 --- a/lib/rt64 +++ b/lib/rt64 @@ -1 +1 @@ -Subproject commit b1a78bf0054bf968f3364ee92ba02b611582f494 +Subproject commit e0ef59eed7914d50706636453e069c507b2aa048