Update vcpkg configuration and remove GLEW dependencies for improved compatibility
- Updated the builtin-baseline in vcpkg.json to the latest version. - Removed GLEW references from CMake files to avoid MSYS2 issues and streamline the build process. - Adjusted include and link directories in z3ed.cmake to reflect the removal of GLEW.
This commit is contained in:
@@ -22,16 +22,14 @@ endif()
|
|||||||
|
|
||||||
# libpng and ZLIB dependencies
|
# libpng and ZLIB dependencies
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
# Windows builds with vcpkg (Abseil removed to avoid MSYS2 issues)
|
# Windows builds with vcpkg (OpenGL/GLEW removed to avoid MSYS2 issues)
|
||||||
if(NOT YAZE_MINIMAL_BUILD)
|
if(NOT YAZE_MINIMAL_BUILD)
|
||||||
find_package(ZLIB REQUIRED)
|
find_package(ZLIB REQUIRED)
|
||||||
find_package(PNG REQUIRED)
|
find_package(PNG REQUIRED)
|
||||||
find_package(GLEW REQUIRED)
|
|
||||||
else()
|
else()
|
||||||
# For CI/minimal builds, try to find but don't require
|
# For CI/minimal builds, try to find but don't require
|
||||||
find_package(ZLIB QUIET)
|
find_package(ZLIB QUIET)
|
||||||
find_package(PNG QUIET)
|
find_package(PNG QUIET)
|
||||||
find_package(GLEW QUIET)
|
|
||||||
if(NOT ZLIB_FOUND OR NOT PNG_FOUND)
|
if(NOT ZLIB_FOUND OR NOT PNG_FOUND)
|
||||||
message(STATUS "PNG/ZLIB not found in minimal build, some features may be disabled")
|
message(STATUS "PNG/ZLIB not found in minimal build, some features may be disabled")
|
||||||
set(PNG_FOUND FALSE)
|
set(PNG_FOUND FALSE)
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ target_include_directories(
|
|||||||
${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine
|
${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine
|
||||||
${PNG_INCLUDE_DIRS}
|
${PNG_INCLUDE_DIRS}
|
||||||
${SDL2_INCLUDE_DIR}
|
${SDL2_INCLUDE_DIR}
|
||||||
${GLEW_INCLUDE_DIRS}
|
|
||||||
${PROJECT_BINARY_DIR}
|
${PROJECT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -67,8 +66,6 @@ target_link_libraries(
|
|||||||
${ABSL_TARGETS}
|
${ABSL_TARGETS}
|
||||||
${SDL_TARGETS}
|
${SDL_TARGETS}
|
||||||
${PNG_LIBRARIES}
|
${PNG_LIBRARIES}
|
||||||
${GLEW_LIBRARIES}
|
|
||||||
${OPENGL_LIBRARIES}
|
|
||||||
${CMAKE_DL_LIBS}
|
${CMAKE_DL_LIBS}
|
||||||
ImGuiTestEngine
|
ImGuiTestEngine
|
||||||
ImGui
|
ImGui
|
||||||
|
|||||||
@@ -15,13 +15,9 @@
|
|||||||
"name": "sdl2",
|
"name": "sdl2",
|
||||||
"platform": "!uwp",
|
"platform": "!uwp",
|
||||||
"features": ["vulkan"]
|
"features": ["vulkan"]
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "glew",
|
|
||||||
"platform": "!uwp"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"builtin-baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00",
|
"builtin-baseline": "2024.12.12",
|
||||||
"overrides": [],
|
"overrides": [],
|
||||||
"features": {
|
"features": {
|
||||||
"pkg-config": {
|
"pkg-config": {
|
||||||
|
|||||||
Reference in New Issue
Block a user