PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

revert workflow experiments

Browse Source
This commit is contained in:
MihailRis
2024-06-12 00:43:00 +03:00
parent 4f8bf22ef1
commit 2061665dd2
3 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3 -13
View File
@@ -1,5 +1,4 @@
option(VOXELENGINE_BUILD_WINDOWS_VCPKG OFF)
option(VOXELENGINE_BUILD_STATIC OFF)
if(VOXELENGINE_BUILD_WINDOWS_VCPKG AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake")
set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" CACHE STRING "")
@@ -90,24 +89,15 @@ if (NOT APPLE)
find_package(EnTT REQUIRED)
endif()
set(ZLIB ZLIB::ZLIB)
if (WIN32)
if(VOXELENGINE_BUILD_WINDOWS_VCPKG)
find_package(glfw3 REQUIRED)
find_package(spng REQUIRED)
find_package(glm REQUIRED)
find_package(vorbis REQUIRED)
if(VOXELENGINE_BUILD_STATIC)
set(PNGLIB spng::spng_static)
set(ZLIB zlibstatic)
set(LUA_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows-static-md/lib/lua51.lib")
set(LUA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows-static-md/include/luajit")
else()
set(LUA_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/lib/lua51.lib")
set(LUA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/include/luajit")
set(PNGLIB spng::spng)
endif()
set(LUA_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/lib/lua51.lib")
set(LUA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/include/luajit")
set(PNGLIB spng::spng)
set(VORBISLIB Vorbis::vorbis Vorbis::vorbisfile)
else()
find_package(Lua REQUIRED)