swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-10 05:08:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[Chore] (...): Cmake option MOBILEGL_FORCE_SKIP_EXTERNAL_LIB_LOADING."

Browse Source 
This reverts commit 0b262d4f3a.
This commit is contained in:
BZLZHH
2026-01-01 10:48:49 +08:00
parent 0b262d4f3a
commit e298e5be51
4 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/benchmark.yml
+1 -1
View File
@@ -33,7 +33,7 @@ jobs:
- name: Configure CMake
working-directory: ${{env.BENCH_ROOT}}
run: cmake -S . -B build-bench -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON -DBENCHMARK_ENABLE_TESTING=OFF -DBUILD_TEST=OFF -DMOBILEGL_FORCE_SKIP_EXTERNAL_LIB_LOADING=ON -DBUILD_BENCHMARK=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5
run: cmake -S . -B build-bench -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON -DBENCHMARK_ENABLE_TESTING=OFF -DBUILD_TEST=OFF -DBUILD_BENCHMARK=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5
- name: Build
working-directory: ${{env.BENCH_ROOT}}/build-bench
.github/workflows/test.yml
+2 -2
View File
@@ -35,9 +35,9 @@ jobs:
working-directory: ${{env.TEST_ROOT}}
run: |
if [ "${{ secrets.ACTIONS_STEP_DEBUG }}" == "true" ]; then
cmake -S . -B build-test -DCMAKE_BUILD_TYPE=Debug -DBUILD_TEST=ON -DBUILD_BENCHMARK=OFF -DMOBILEGL_FORCE_SKIP_EXTERNAL_LIB_LOADING=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5
cmake -S . -B build-test -DCMAKE_BUILD_TYPE=Debug -DBUILD_TEST=ON -DBUILD_BENCHMARK=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5
else
cmake -S . -B build-test -DCMAKE_BUILD_TYPE=Release -DBUILD_TEST=ON -DBUILD_BENCHMARK=OFF -DMOBILEGL_FORCE_SKIP_EXTERNAL_LIB_LOADING=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5
cmake -S . -B build-test -DCMAKE_BUILD_TYPE=Release -DBUILD_TEST=ON -DBUILD_BENCHMARK=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5
fi
- name: Build
CMakeLists.txt
-6
View File
@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.22.1)
project("MobileGL")
option(MOBILEGL_FORCE_RELEASE_OPT "Enable Release optimization flags in Debug build" ON)
option(MOBILEGL_FORCE_SKIP_EXTERNAL_LIB_LOADING "Force skip loading external libraries" OFF)
if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" OR MOBILEGL_FORCE_RELEASE_OPT)
include(CheckIPOSupported)
@@ -22,11 +21,6 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" OR MOBILEGL_FORCE_RELEASE_OPT)
endif()
endif()
if(MOBILEGL_FORCE_SKIP_EXTERNAL_LIB_LOADING)
message(STATUS "MOBILEGL_FORCE_SKIP_EXTERNAL_LIB_LOADING enabled")
add_compile_definitions(MOBILEGL_FORCE_SKIP_EXTERNAL_LIB_LOADING)
endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
add_compile_options(/Zc:preprocessor)
endif()
MobileGL/Init.cpp
-3
View File
@@ -15,9 +15,6 @@
namespace MobileGL {
void MG_Initialize(Bool loadExternalLibraries) {
#ifdef MOBILEGL_FORCE_SKIP_EXTERNAL_LIB_LOADING
loadExternalLibraries = false;
#endif
MG_Util::Debug::InitFile();
MGLOG_I("Initializing MobileGL...");
MG_State::Init();