From 2061665dd204ada80992086069b6b3af3ee5faa3 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 12 Jun 2024 00:43:00 +0300
Subject: [PATCH] revert workflow experiments

---
 .github/workflows/windows.yml |  5 ++---
 CMakeLists.txt                | 16 +++-------------
 src/voxel_engine.cpp          |  3 ---
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 6a35ec00..46fe7122 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -30,12 +30,11 @@ jobs:
           cd ..
       - name: Configure and build project with CMake and vcpkg
         run: |
-          vcpkg install --triplet=x64-windows-static-md
           mkdir 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
-          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
       - name: Package for Windows
         run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2aabae55..eb546896 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/src/voxel_engine.cpp b/src/voxel_engine.cpp
index 15f284ca..c6a2ec7e 100644
--- a/src/voxel_engine.cpp
+++ b/src/voxel_engine.cpp
@@ -13,12 +13,9 @@ static debug::Logger logger("main");
 int main(int argc, char** argv) {
     debug::Logger::init("latest.log");
 
-    logger.info() << "start of the log (argc=" << argc << ")";
     EnginePaths paths;
     if (!parse_cmdline(argc, argv, paths))
         return EXIT_SUCCESS;
-        
-    logger.info() << "configuring encoding";
 
     platform::configure_encoding();
     try {