From 6309bb566915cec58cbce2c35830bd8030466332 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 10 Aug 2025 13:33:20 -0700 Subject: [PATCH] Disable extensions on Xbox for now --- 3rdparty/CMakeLists.txt | 7 ------- CMakeLists.txt | 2 +- extensions/src/siloader.cpp | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 1347a3e8..a9e8889a 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -93,10 +93,3 @@ add_library(libweaver STATIC ${libweaver_SOURCE_DIR}/lib/sitypes.cpp ) target_include_directories(libweaver PUBLIC ${libweaver_SOURCE_DIR}/lib) -if(MSVC) - # Undefine _WIN32 for the MSVC compiler - target_compile_definitions(libweaver PRIVATE /U_WIN32) -else() - # Undefine _WIN32 for GCC, Clang, and other compilers - target_compile_definitions(libweaver PRIVATE -U_WIN32) -endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c349d49..9e750cab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ option(ISLE_WERROR "Treat warnings as errors" OFF) option(ISLE_DEBUG "Enable imgui debug" ON) cmake_dependent_option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" "${NOT_MINGW}" "WIN32;CMAKE_SIZEOF_VOID_P EQUAL 4" OFF) cmake_dependent_option(ISLE_MINIWIN "Use miniwin" ON "NOT ISLE_USE_DX5" OFF) -cmake_dependent_option(ISLE_EXTENSIONS "Use extensions" ON "NOT ISLE_USE_DX5" OFF) +cmake_dependent_option(ISLE_EXTENSIONS "Use extensions" ON "NOT ISLE_USE_DX5;NOT WINDOWS_STORE" OFF) cmake_dependent_option(ISLE_BUILD_CONFIG "Build CONFIG.EXE application" ON "MSVC OR ISLE_MINIWIN;NOT NINTENDO_3DS;NOT WINDOWS_STORE" OFF) cmake_dependent_option(ISLE_COMPILE_SHADERS "Compile shaders" ON "SDL_SHADERCROSS_BIN;TARGET Python3::Interpreter" OFF) option(CMAKE_POSITION_INDEPENDENT_CODE "Build with -fPIC" ON) diff --git a/extensions/src/siloader.cpp b/extensions/src/siloader.cpp index fdebbecc..3532fc76 100644 --- a/extensions/src/siloader.cpp +++ b/extensions/src/siloader.cpp @@ -47,7 +47,7 @@ bool SiLoader::StartWith(StreamObject p_object) bool SiLoader::RemoveWith(StreamObject p_object, LegoWorld* world) { - for (auto& key : removeWith) { + for (const auto& key : removeWith) { if (key.first == p_object) { RemoveFromWorld(key.second.first, key.second.second, world->GetAtomId(), world->GetEntityId()); }