From 3a04552b3653354e68067c8a8c3fe2369e87e8bd Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 2 Jan 2024 17:35:17 +0100 Subject: [PATCH 1/3] Mesh: Fix build with pch Add missing for FLT_MAX --- src/Mod/Mesh/Gui/PreCompiled.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Mod/Mesh/Gui/PreCompiled.h b/src/Mod/Mesh/Gui/PreCompiled.h index e492cbd9aa..8e9b804a4e 100644 --- a/src/Mod/Mesh/Gui/PreCompiled.h +++ b/src/Mod/Mesh/Gui/PreCompiled.h @@ -44,6 +44,7 @@ // standard #include +#include // STL #include From 40994793c1a75053cb2c90d02f3bf4ba69a959b0 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 2 Jan 2024 17:35:43 +0100 Subject: [PATCH 2/3] Part: Fix build with pch Move QtAll inclusion (which includes GL itself) after manually including to correctly get ARB extensions. --- src/Mod/Part/Gui/PreCompiled.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Part/Gui/PreCompiled.h b/src/Mod/Part/Gui/PreCompiled.h index f88b6d206d..4758d16e94 100644 --- a/src/Mod/Part/Gui/PreCompiled.h +++ b/src/Mod/Part/Gui/PreCompiled.h @@ -62,13 +62,8 @@ #include #include -// Qt Toolkit -#ifndef __QtAll__ -# include -#endif - // GL -// Include glext before InventorAll +// Include glext before QtAll/InventorAll #ifdef FC_OS_WIN32 # include # include @@ -87,6 +82,11 @@ // Should come after glext.h to avoid warnings #include +// Qt Toolkit +#ifndef __QtAll__ +# include +#endif + // Inventor includes OpenGL #ifndef __InventorAll__ # include From 9df964cbb4c624c497e184e1ee705bb9db0f5b44 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 2 Jan 2024 19:28:09 +0100 Subject: [PATCH 3/3] App: Fix build with pch Include for DBL_MAX --- src/App/PreCompiled.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/App/PreCompiled.h b/src/App/PreCompiled.h index 046783405f..86389849a5 100644 --- a/src/App/PreCompiled.h +++ b/src/App/PreCompiled.h @@ -49,6 +49,7 @@ #include #include #include +#include #ifdef FC_OS_WIN32 # include