Skip to content

Commit

Permalink
Merge pull request #869 from edge-classic/cmake-update
Browse files Browse the repository at this point in the history
Remove custom FindOpenGL now that Cmake is >= 3.27
  • Loading branch information
dashodanger authored Jan 29, 2025
2 parents 2966856 + 3f90630 commit 197f549
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 787 deletions.
8 changes: 1 addition & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ if (EDGE_SOKOL_GL OR EDGE_SOKOL_GLES3 OR EDGE_SOKOL_D3D11)
set (EDGE_SOKOL ON)
endif()

if (EDGE_SOKOL_GLES3 AND NOT EMSCRIPTEN)
# This is lifted from upstream CMake so that we can use it without having
# to bump to miniumum version 3.27
include("${CMAKE_SOURCE_DIR}/cmake/EDGEFindOpenGL.cmake")
endif()

# Optional Features
option(EDGE_CLASSIC "Enable default features for EDGE-Classic" ON)

Expand Down Expand Up @@ -82,7 +76,7 @@ endif()
if(MSVC)
# Override memory allocations to use mimalloc
add_definitions(/FI"${CMAKE_SOURCE_DIR}/libraries/mimalloc/include/mimalloc-override.h")
# Use static C runtime, necessary for mimalloc and also means matching C runtiume doesn't need to be on users box
# Use static C runtime, necessary for mimalloc and also means matching C runtime doesn't need to be on users box
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:Debug>")
endif()

Expand Down
Loading

0 comments on commit 197f549

Please sign in to comment.