Skip to content
Snippets Groups Projects
Commit 54a23f71 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

include more selectively

parent cbe28311
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 3
− 1
View file @ 54a23f71
...@@ -1270,7 +1270,9 @@ endif(LINUX_JOYSTICK_H) ...@@ -1270,7 +1270,9 @@ endif(LINUX_JOYSTICK_H)
if(MSVC) if(MSVC)
add_definitions(-D_USE_MATH_DEFINES -DNOMINMAX add_definitions(-D_USE_MATH_DEFINES -DNOMINMAX
-D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE) -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE)
if(HAVE_FLTK)
set(GMSH_SRC ${GMSH_SRC};Fltk/Win32Icon.rc) set(GMSH_SRC ${GMSH_SRC};Fltk/Win32Icon.rc)
endif(HAVE_FLTK)
endif(MSVC) endif(MSVC)
if(WIN32 OR CYGWIN) if(WIN32 OR CYGWIN)
......
Common/OpenFile.cpp
+ 4
− 1
View file @ 54a23f71
...@@ -20,7 +20,6 @@ typedef unsigned long intptr_t; ...@@ -20,7 +20,6 @@ typedef unsigned long intptr_t;
#include "Context.h" #include "Context.h"
#include "OpenFile.h" #include "OpenFile.h"
#include "CommandLine.h" #include "CommandLine.h"
#include "ReadImg.h"
#include "OS.h" #include "OS.h"
#include "StringUtils.h" #include "StringUtils.h"
#include "GeomMeshMatcher.h" #include "GeomMeshMatcher.h"
...@@ -45,6 +44,10 @@ typedef unsigned long intptr_t; ...@@ -45,6 +44,10 @@ typedef unsigned long intptr_t;
#include "PViewOptions.h" #include "PViewOptions.h"
#endif #endif
#if defined(HAVE_GRAPHICS)
#include "ReadImg.h"
#endif
#if defined(HAVE_FLTK) #if defined(HAVE_FLTK)
#include <FL/fl_ask.H> #include <FL/fl_ask.H>
#include "FlGui.h" #include "FlGui.h"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment