diff --git a/cmake/PCHSupport.cmake b/cmake/PCHSupport.cmake
index 74bd4158..a76aa742 100644
--- a/cmake/PCHSupport.cmake
+++ b/cmake/PCHSupport.cmake
@@ -40,7 +40,7 @@ function(ADD_CXX_PCH TARGET_NAME PRECOMPILED_HEADER PRECOMPILED_SOURCE)
         get_target_property(SOURCE_FILES ${TARGET_NAME} SOURCES)
         set(SOURCE_FILE_FOUND FALSE)
         foreach(SOURCE_FILE ${SOURCE_FILES})
-            if(SOURCE_FILE MATCHES \\.\(c|cc|cxx|cpp\)$)
+            if(SOURCE_FILE MATCHES \\.\(cc|cxx|cpp\)$)
                 if(${PRECOMPILED_SOURCE} MATCHES ${SOURCE_FILE})
                     # Set source file to generate header
                     set_source_files_properties(
@@ -77,7 +77,7 @@ function(ADD_CXX_PCH TARGET_NAME PRECOMPILED_HEADER PRECOMPILED_SOURCE)
         endif()
 
         # Create and set output directory.
-        set(OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}_${CMAKE_BUILD_TYPE}_${SFX}")
+        set(OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}_${SFX}")
         set(OUTPUT_NAME "${OUTPUT_DIR}/${PRECOMPILED_HEADER_NAME}.${SFX}")
 
         make_directory(${OUTPUT_DIR})
@@ -113,7 +113,7 @@ function(ADD_CXX_PCH TARGET_NAME PRECOMPILED_HEADER PRECOMPILED_SOURCE)
         get_target_property(SOURCE_FILES ${TARGET_NAME} SOURCES)
 
         foreach(SOURCE_FILE ${SOURCE_FILES})
-            if(SOURCE_FILE MATCHES \\.\(cxx|cpp\)$)
+            if(SOURCE_FILE MATCHES \\.\(cc|cxx|cpp\)$)
                 set_source_files_properties(${SOURCE_FILE} PROPERTIES
                    COMPILE_FLAGS "-include ${OUTPUT_DIR}/${PRECOMPILED_HEADER_NAME} -Winvalid-pch"
                 )
diff --git a/cmake/SetDefinitions.cmake b/cmake/SetDefinitions.cmake
index 0d41a85d..5269bc84 100644
--- a/cmake/SetDefinitions.cmake
+++ b/cmake/SetDefinitions.cmake
@@ -114,15 +114,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
         >
 
         $<$<CONFIG:Release>:
-          $<$<COMPILE_LANGUAGE:C>:
-            --no-warnings
-          >
-
-          $<$<COMPILE_LANGUAGE:CXX>:
-            --no-warnings
-            -Wno-narrowing
-            -Wno-deprecated-register
-            >
+          --no-warnings
         >
     )
 endif ()
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index 04d224cc..4d970f9e 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -277,6 +277,7 @@ target_link_libraries(game
 
 # Generate precompiled header
 if(PCH)
+    add_dependencies(vmap2 game)
     ADD_CXX_PCH(game ${CMAKE_CURRENT_SOURCE_DIR}/pchdef.h ${CMAKE_CURRENT_SOURCE_DIR}/pchdef.cpp)
 endif()