Allow the possibility to override the link of glfw3

soufianekhiat · Jun 1, 2024 · b3965df · b3965df
1 parent f86cd97
commit b3965df
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/ImPlatform/ImPlatform.cpp b/ImPlatform/ImPlatform.cpp
@@ -8,7 +8,9 @@ extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler( HWND hWnd, UINT ms
 #if (IM_CURRENT_GFX != IM_GFX_OPENGL2) && (IM_CURRENT_GFX != IM_GFX_OPENGL3)
 #include <backends/imgui_impl_glfw.cpp>
 #endif
+#if IM_GLFW3_AUTO_LINK
 #pragma comment( lib, "../GLFW/lib-vc2010-64/glfw3.lib" )
+#endif
 #elif (IM_CURRENT_PLATFORM) == IM_PLATFORM_APPLE)
 #else
 #error IM_CURRENT_TARGET not specified correctly

diff --git a/ImPlatform/ImPlatform.h b/ImPlatform/ImPlatform.h
@@ -7,6 +7,11 @@
 
 #include <imgui.h>
 
+// To override the link of glfw3 use to 1
+#ifndef IM_GLFW3_AUTO_LINK 
+#define IM_GLFW3_AUTO_LINK 1
+#endif
+
 // - [ O ] WIN32_OPENGL3
 // - [ O ] WIN32_DIRECTX9
 // - [ O ] WIN32_DIRECTX10
@@ -172,7 +177,7 @@ struct PlatformDataImpl
 	MSG			oMessage;
 
 	// Dx12 Backend uses WM_SIZE to resize buffers
-#if (IM_CURRENT_GFX != IM_GFX_DIRECTX12) && (IM_CURRENT_GFX != IM_GFX_OPENGL3) && (IM_CURRENT_GFX != IM_GFX_OPENGL2s)
+#if (IM_CURRENT_GFX != IM_GFX_DIRECTX12) && (IM_CURRENT_GFX != IM_GFX_OPENGL3) && (IM_CURRENT_GFX != IM_GFX_OPENGL2)
 	UINT		uResizeWidth	= 0;
 	UINT		uResizeHeight	= 0;
 #endif

diff --git a/ImPlatformDemo/main.cpp b/ImPlatformDemo/main.cpp
@@ -46,7 +46,7 @@
 #include <stb_image.h>
 #endif
 
-bool g_bSimpleAPI = true;
+static bool g_bSimpleAPI = true;
 
 int main()
 {