Fixed compilation on Windows.

Unarelith · Nov 20, 2023 · 19a63c4 · 19a63c4
1 parent 580c9a4
commit 19a63c4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/cmake/vs_folders.cmake b/cmake/vs_folders.cmake
@@ -15,15 +15,14 @@ set_target_properties(${CMAKE_PROJECT_NAME}_server_lib PROPERTIES FOLDER "source
 # External libraries
 #-----------------------------------------------------------------------------------------
 set_target_properties(glm_static                       PROPERTIES FOLDER "external")
-set_target_properties(libglew_static                   PROPERTIES FOLDER "external")
 set_target_properties(libluajit                        PROPERTIES FOLDER "external")
 set_target_properties(luajit                           PROPERTIES FOLDER "external")
 set_target_properties(SDL2_image                       PROPERTIES FOLDER "external")
 set_target_properties(SDL2_test                        PROPERTIES FOLDER "external")
 set_target_properties(SDL2main                         PROPERTIES FOLDER "external")
 set_target_properties(SDL2-static                      PROPERTIES FOLDER "external")
 set_target_properties(tinyxml2                         PROPERTIES FOLDER "external")
-set_target_properties(zlib                             PROPERTIES FOLDER "external")
+set_target_properties(zlibstatic                       PROPERTIES FOLDER "external")
 
 #-----------------------------------------------------------------------------------------
 # BGFX
@@ -54,12 +53,15 @@ set_target_properties(texturev                         PROPERTIES FOLDER "extern
 set_target_properties(aob                              PROPERTIES FOLDER "external/misc")
 set_target_properties(buildvm                          PROPERTIES FOLDER "external/misc")
 set_target_properties(buildvm_arch_h                   PROPERTIES FOLDER "external/misc")
+set_target_properties(example                          PROPERTIES FOLDER "external/misc")
 set_target_properties(lj_gen_folddef                   PROPERTIES FOLDER "external/misc")
 set_target_properties(lj_gen_headers                   PROPERTIES FOLDER "external/misc")
 set_target_properties(lj_gen_vm_s                      PROPERTIES FOLDER "external/misc")
+set_target_properties(minigzip                         PROPERTIES FOLDER "external/misc")
 set_target_properties(minilua                          PROPERTIES FOLDER "external/misc")
 set_target_properties(sdl_headers_copy                 PROPERTIES FOLDER "external/misc")
 set_target_properties(showanim                         PROPERTIES FOLDER "external/misc")
 set_target_properties(showimage                        PROPERTIES FOLDER "external/misc")
 set_target_properties(uninstall                        PROPERTIES FOLDER "external/misc")
 set_target_properties(xmltest                          PROPERTIES FOLDER "external/misc")
+set_target_properties(zlib                             PROPERTIES FOLDER "external/misc")
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -11,7 +11,6 @@ add_subdirectory(glm)
 add_subdirectory(lua)
 add_subdirectory(sol2)
 add_subdirectory(tinyxml2)
-add_subdirectory(zlib)
 
 #------------------------------------------------------------------------------
 # - BGFX
@@ -45,3 +44,10 @@ set(SFML_BUILD_NETWORK  TRUE  CACHE BOOL "" FORCE)
 set(SFML_BUILD_WINDOW   FALSE CACHE BOOL "" FORCE)
 
 add_subdirectory(SFML)
+
+#------------------------------------------------------------------------------
+# - zlib
+#------------------------------------------------------------------------------
+add_subdirectory(zlib)
+
+target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/zlib)
diff --git a/external/filesystem.hpp b/external/filesystem.hpp
@@ -144,6 +144,11 @@
 #endif
 #endif  // GHC_EXPAND_IMPL
 
+#ifdef GHC_OS_WINDOWS
+#undef min
+#undef max
+#endif
+
 //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // Behaviour Switches (see README.md, should match the config in test/filesystem_test.cpp):
 //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -