From f5f47f573542129c6323b24979dd3e26ebd7cf60 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 16 May 2019 22:15:36 +0200 Subject: [PATCH] fix FEM build failure --- src/Mod/Fem/App/PreCompiled.h | 43 ++++++++++++++++++++++------------- src/Mod/Fem/Gui/PreCompiled.h | 2 ++ 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/Mod/Fem/App/PreCompiled.h b/src/Mod/Fem/App/PreCompiled.h index 711fb820e6..459eee4814 100644 --- a/src/Mod/Fem/App/PreCompiled.h +++ b/src/Mod/Fem/App/PreCompiled.h @@ -126,36 +126,47 @@ #endif // Opencascade -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include #include #include #include #include +#include +#include +#include +#include +#include #include +#include +#include #include +#include #include -#include -#include -#include -#include +#include +#include +#include #include -#include -#include // VTK #include diff --git a/src/Mod/Fem/Gui/PreCompiled.h b/src/Mod/Fem/Gui/PreCompiled.h index 0093373abc..672b193e67 100644 --- a/src/Mod/Fem/Gui/PreCompiled.h +++ b/src/Mod/Fem/Gui/PreCompiled.h @@ -71,6 +71,8 @@ #include #ifdef FC_OS_WIN32 +# define WIN32_LEAN_AND_MEAN +# define NOMINMAX # include #endif