From f042e080293a4aa4c61bf7fce79338b0da2531e2 Mon Sep 17 00:00:00 2001
From: Masterkatze <masterkatze@gmail.com>
Date: Mon, 27 Nov 2023 04:23:49 +0300
Subject: [PATCH] Fix Alpine build

---
 CMakeLists.txt                       | 4 +++-
 Externals/GameSpy                    | 2 +-
 Externals/LuaJIT-proj/CMakeLists.txt | 8 +++++---
 Externals/luabind                    | 2 +-
 Externals/xrLuaFix                   | 2 +-
 cmake/utils.cmake                    | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d0098d2b4d..b24593b8b1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,9 @@ project(OpenXRay)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-#set(CMAKE_VERBOSE_MAKEFILE ON)
+
+option(CMAKE_VERBOSE_MAKEFILE "Verbose build output" OFF)
+message(STATUS "CMAKE_VERBOSE_MAKEFILE: ${CMAKE_VERBOSE_MAKEFILE}")
 
 if (CMAKE_VERBOSE_MAKEFILE)
     set(CMAKE_EXECUTE_PROCESS_COMMAND_ECHO STDOUT)
diff --git a/Externals/GameSpy b/Externals/GameSpy
index 4576c370384..c355b6e9b88 160000
--- a/Externals/GameSpy
+++ b/Externals/GameSpy
@@ -1 +1 @@
-Subproject commit 4576c370384e90e42e1049f9986f126a4a891959
+Subproject commit c355b6e9b88b1d00912db902872c8bc7977f994e
diff --git a/Externals/LuaJIT-proj/CMakeLists.txt b/Externals/LuaJIT-proj/CMakeLists.txt
index 190bf019a5c..36abe653fd1 100644
--- a/Externals/LuaJIT-proj/CMakeLists.txt
+++ b/Externals/LuaJIT-proj/CMakeLists.txt
@@ -79,10 +79,12 @@ else()
     set(CCOPT_OPT_LEVEL "-O2")
 endif()
 
+set(CCOPT "${CMAKE_C_FLAGS} ${CCOPT_OPT_LEVEL}")
+
 if (USE_ADDRESS_SANITIZER)
-    set(CCOPT "${CCOPT_OPT_LEVEL} -fno-stack-protector")
+    set(CCOPT "${CCOPT} -fno-stack-protector")
 else()
-    set(CCOPT "${CCOPT_OPT_LEVEL} -fomit-frame-pointer -fno-stack-protector")
+    set(CCOPT "${CCOPT} -fomit-frame-pointer -fno-stack-protector")
 endif()
 
 set(CCOPT "${CCOPT} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -U_FORTIFY_SOURCE")
@@ -137,7 +139,7 @@ set(CCOPTIONS "${CCOPT};${XCFLAGS}")
 target_compile_options(xrLuaJIT PRIVATE ${CCOPTIONS})
 
 execute_process(
-    COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_FLAGS} ${CCOPTIONS} -E lj_arch.h -dM
+    COMMAND ${CMAKE_C_COMPILER} ${CCOPTIONS} -E lj_arch.h -dM
     WORKING_DIRECTORY "${LUAJIT_DIR}"
     OUTPUT_VARIABLE TESTARCH_OUTPUT
     ERROR_VARIABLE TESTARCH_ERROR
diff --git a/Externals/luabind b/Externals/luabind
index 491ee241b8e..c90385df573 160000
--- a/Externals/luabind
+++ b/Externals/luabind
@@ -1 +1 @@
-Subproject commit 491ee241b8e1637262532520b89b0be688d8ce97
+Subproject commit c90385df57349171506463cde3632c2f64991bd5
diff --git a/Externals/xrLuaFix b/Externals/xrLuaFix
index 56e1f6fc307..67b77c92f49 160000
--- a/Externals/xrLuaFix
+++ b/Externals/xrLuaFix
@@ -1 +1 @@
-Subproject commit 56e1f6fc307d0556bb276845c497cb49521abd02
+Subproject commit 67b77c92f49c766c7c180cc39ffdb12799f395d7
diff --git a/cmake/utils.cmake b/cmake/utils.cmake
index c667d9997f1..e6f75c9057f 100644
--- a/cmake/utils.cmake
+++ b/cmake/utils.cmake
@@ -120,4 +120,4 @@ function(xr_install_file tgt)
            RUNTIME DESTINATION Release/
         )
     endif()
-endfunction()
\ No newline at end of file
+endfunction()