PulseStudio/VoxelEngine
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/windows.yml vendored
View File

@ -30,12 +30,11 @@ jobs:
cd .. cd ..
- name: Configure and build project with CMake and vcpkg - name: Configure and build project with CMake and vcpkg
run: | run: |
vcpkg install --triplet=x64-windows-static-md
mkdir build mkdir build
cd build cd build
cmake -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_WINDOWS_VCPKG=ON -DVOXELENGINE_BUILD_STATIC=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static-md .. cmake -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_WINDOWS_VCPKG=ON ..
Remove-Item -Path CMakeFiles -Recurse -Force Remove-Item -Path CMakeFiles -Recurse -Force
cmake -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_WINDOWS_VCPKG=ON -DVOXELENGINE_BUILD_STATIC=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static-md .. cmake -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_WINDOWS_VCPKG=ON ..
cmake --build . --config Release cmake --build . --config Release
- name: Package for Windows - name: Package for Windows
run: | run: |

16
CMakeLists.txt
View File

@ -1,5 +1,4 @@
option(VOXELENGINE_BUILD_WINDOWS_VCPKG OFF) 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") 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 "") 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) find_package(EnTT REQUIRED)
endif() endif()
set(ZLIB ZLIB::ZLIB)
if (WIN32) if (WIN32)
if(VOXELENGINE_BUILD_WINDOWS_VCPKG) if(VOXELENGINE_BUILD_WINDOWS_VCPKG)
find_package(glfw3 REQUIRED) find_package(glfw3 REQUIRED)
find_package(spng REQUIRED) find_package(spng REQUIRED)
find_package(glm REQUIRED) find_package(glm REQUIRED)
find_package(vorbis REQUIRED) find_package(vorbis REQUIRED)
if(VOXELENGINE_BUILD_STATIC) set(LUA_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/lib/lua51.lib")
set(PNGLIB spng::spng_static) set(LUA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/packages/luajit_x64-windows/include/luajit")
set(ZLIB zlibstatic) set(PNGLIB spng::spng)
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(VORBISLIB Vorbis::vorbis Vorbis::vorbisfile) set(VORBISLIB Vorbis::vorbis Vorbis::vorbisfile)
else() else()
find_package(Lua REQUIRED) find_package(Lua REQUIRED)

3
src/voxel_engine.cpp
View File

@ -13,12 +13,9 @@ static debug::Logger logger("main");
int main(int argc, char** argv) { int main(int argc, char** argv) {
debug::Logger::init("latest.log"); debug::Logger::init("latest.log");
logger.info() << "start of the log (argc=" << argc << ")";
EnginePaths paths; EnginePaths paths;
if (!parse_cmdline(argc, argv, paths)) if (!parse_cmdline(argc, argv, paths))
return EXIT_SUCCESS; return EXIT_SUCCESS;
logger.info() << "configuring encoding";
platform::configure_encoding(); platform::configure_encoding();
try { try {