Fixed compilation errors in Release mode.

pboechat · Jun 3, 2024 · 3880ea3 · 3880ea3
1 parent fe5a7d0
commit 3880ea3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 27 deletions.
diff --git a/FastCG/src/Graphics/OpenGL/OpenGLGraphicsSystem.cpp b/FastCG/src/Graphics/OpenGL/OpenGLGraphicsSystem.cpp
@@ -140,21 +140,19 @@ namespace
             FASTCG_THROW_EXCEPTION(FastCG::Exception, "WGL: WGL_ARB_create_context extension not supported");
         }
 
-        const int contextAttribs[] = {
-            WGL_CONTEXT_MAJOR_VERSION_ARB,
-            4,
-            WGL_CONTEXT_MINOR_VERSION_ARB,
-            3,
-            WGL_CONTEXT_PROFILE_MASK_ARB,
-            WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
-            WGL_CONTEXT_FLAGS_ARB,
-            WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB
+        const int contextAttribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB,
+                                      4,
+                                      WGL_CONTEXT_MINOR_VERSION_ARB,
+                                      3,
+                                      WGL_CONTEXT_PROFILE_MASK_ARB,
+                                      WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+                                      WGL_CONTEXT_FLAGS_ARB,
+                                      WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB
 #if _DEBUG
-                | WGL_CONTEXT_DEBUG_BIT_ARB
+                                          | WGL_CONTEXT_DEBUG_BIT_ARB
 #endif
-            ,
-            0
-        };
+                                      ,
+                                      0};
 
         auto context = wglCreateContextAttribsARB(deviceContext, parentContext, contextAttribs);
         if (context == nullptr)
@@ -701,7 +699,7 @@ namespace FastCG
         auto *pFbConfigs = glXChooseFBConfig(pDisplay, defaultScreen, fbAttribs, &numFbConfigs);
 
         GLXFBConfig fbConfig = nullptr;
-        XVisualInfo *pVisualInfo;
+        XVisualInfo *pVisualInfo = nullptr;
         for (int i = 0; i < numFbConfigs; i++)
         {
             auto *pCurrVisualInfo = (XVisualInfo *)glXGetVisualFromFBConfig(pDisplay, pFbConfigs[i]);
@@ -742,21 +740,19 @@ namespace FastCG
 
         auto oldContext = mContext;
 
-        const int contextAttribs[] = {
-            GLX_CONTEXT_MAJOR_VERSION_ARB,
-            4,
-            GLX_CONTEXT_MINOR_VERSION_ARB,
-            3,
-            GLX_CONTEXT_PROFILE_MASK_ARB,
-            GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
-            GLX_CONTEXT_FLAGS_ARB,
-            GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB
+        const int contextAttribs[] = {GLX_CONTEXT_MAJOR_VERSION_ARB,
+                                      4,
+                                      GLX_CONTEXT_MINOR_VERSION_ARB,
+                                      3,
+                                      GLX_CONTEXT_PROFILE_MASK_ARB,
+                                      GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
+                                      GLX_CONTEXT_FLAGS_ARB,
+                                      GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB
 #if _DEBUG
-                | GLX_CONTEXT_DEBUG_BIT_ARB
+                                          | GLX_CONTEXT_DEBUG_BIT_ARB
 #endif
-            ,
-            0
-        };
+                                      ,
+                                      0};
 
         auto *pOldErrorHandler = XSetErrorHandler(&GLXContextErrorHandler);
         mContext = glXCreateContextAttribsARB(pDisplay, fbConfig, oldContext, True, contextAttribs);

diff --git a/dependencies/basisu/CMakeLists.txt b/dependencies/basisu/CMakeLists.txt
@@ -19,4 +19,11 @@ target_compile_definitions(
 		BASISU_SUPPORT_SSE=0 # TODO:
 		BASISU_SUPPORT_OPENCL=0
 )
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	target_compile_options(
+		${PROJECT_NAME}
+		PUBLIC 
+			-Wno-stringop-overflow
+	)
+endif()
 target_link_libraries(${PROJECT_NAME} zlib)