disable warnings in plugin release builds

for finding compile errors in github. Also fixed scripts not building plugins in release mode.
wootguy · Dec 15, 2024 · a89d3d3 · a89d3d3
1 parent c55da63
commit a89d3d3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -60,20 +60,20 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -DBUILD_CLIENT=OFF -DBUILD_SERVER=ON -DBUILD_PLUGINS=OFF
-        cmake --build . --config Release
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_CLIENT=OFF -DBUILD_SERVER=ON -DBUILD_PLUGINS=OFF
+        cmake --build .
 
     - name: Build plugins
       run: |
         cd build
-        cmake .. -DBUILD_CLIENT=OFF -DBUILD_SERVER=ON -DBUILD_PLUGINS=ON
-        cmake --build . --config Release
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_CLIENT=OFF -DBUILD_SERVER=ON -DBUILD_PLUGINS=ON
+        cmake --build .
 
     - name: Build client
       run: |
         cd build
-        cmake .. -DBUILD_CLIENT=ON -DBUILD_SERVER=OFF -DBUILD_PLUGINS=OFF
-        cmake --build . --config Release
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_CLIENT=ON -DBUILD_SERVER=OFF -DBUILD_PLUGINS=OFF
+        cmake --build .
 
     - name: Upload artifact
       uses: actions/upload-artifact@v4

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.20)
 
 option(BUILD_SERVER "Disable this if you don't want to build the server library" ON)
 option(BUILD_CLIENT "Enable this if you want to build the client library" OFF)

diff --git a/scripts/build_game.sh b/scripts/build_game.sh
@@ -8,5 +8,5 @@ cd ..
 rm -rf build
 mkdir build
 cd build
-cmake -DBUILD_SERVER=ON -DINCREASED_SERVER_LIMITS=OFF ..
-cmake --build . --config Release
+cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SERVER=ON -DINCREASED_SERVER_LIMITS=OFF ..
+cmake --build .
diff --git a/scripts/build_game_and_plugins.sh b/scripts/build_game_and_plugins.sh
@@ -8,5 +8,5 @@ cd ..
 rm -rf build
 mkdir build
 cd build
-cmake -DBUILD_SERVER=ON -DBUILD_PLUGINS=ON -DUPDATE_PLUGINS=ON -DINCREASED_SERVER_LIMITS=OFF ..
-cmake --build . --config Release
+cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SERVER=ON -DBUILD_PLUGINS=ON -DUPDATE_PLUGINS=ON -DINCREASED_SERVER_LIMITS=OFF ..
+cmake --build .
diff --git a/scripts/hlcoop_plugin.cmake b/scripts/hlcoop_plugin.cmake
@@ -1,10 +1,7 @@
-cmake_minimum_required(VERSION 3.6)
-
 # setup standard include directories and compile settings
 function(hlcoop_setup_plugin OUTPUT_PATH)
 	if(UNIX)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32 -g -O2 -fno-strict-aliasing -Wall -Wextra -Wpedantic -Wno-invalid-offsetof -Wno-class-memaccess -Wno-unused-parameter") 
-		set(CMAKE_SHARED_LINKER_FLAGS "m32 -g") 
+		set(DEBUG_WARN_FLAGS "-Wall -Wextra -Wpedantic -Wno-invalid-offsetof -Wno-class-memaccess -Wno-unused-parameter")
 
 		# Static linking libstd++ and libgcc so that the plugin can load on distros other than one it was compiled on.
 		# -fvisibility=hidden fixes a weird bug where the metamod confuses game functions with plugin functions.
@@ -14,22 +11,23 @@ function(hlcoop_setup_plugin OUTPUT_PATH)
 		#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -static-libgcc -g" PARENT_SCOPE)
 
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32 -std=c++11 -fvisibility=hidden -g" PARENT_SCOPE)
-		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0" PARENT_SCOPE)
-		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -w -Wfatal-errors" PARENT_SCOPE)
+		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 ${DEBUG_WARN_FLAGS}" PARENT_SCOPE)
+		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -w" PARENT_SCOPE)
 
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -g" PARENT_SCOPE)
-		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -Wall" PARENT_SCOPE)
-		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Os -w -Wfatal-errors" PARENT_SCOPE)
+		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 ${DEBUG_WARN_FLAGS}" PARENT_SCOPE)
+		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -w" PARENT_SCOPE)
 
 		set(CMAKE_SHARED_LIBRARY_PREFIX "" PARENT_SCOPE)
 
 	elseif(MSVC)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /W4") 
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") 
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP") 
 
 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /w" PARENT_SCOPE)
-		#set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" PARENT_SCOPE)
+		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /W4" PARENT_SCOPE)
 		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /w" PARENT_SCOPE)
-		#set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" PARENT_SCOPE)
+		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W4" PARENT_SCOPE)
 	else()
 		message(FATAL_ERROR "TODO: Mac support")
 	endif()