From b5b14eeb84d13ae1d1fec3e61527d79533207d6a Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 21 Sep 2008 00:49:46 +0000
Subject: [PATCH] *** empty log message ***
---
Fltk/Win32Icon.h | 4 +---
utils/misc/variables.msvc | 14 +++++++++-----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Fltk/Win32Icon.h b/Fltk/Win32Icon.h
index 4379420d08..976f790774 100644
--- a/Fltk/Win32Icon.h
+++ b/Fltk/Win32Icon.h
@@ -1,3 +1 @@
-#define IDI_ICON 101
-
-
+#define IDI_ICON 101
diff --git a/utils/misc/variables.msvc b/utils/misc/variables.msvc
index 4d3a5dac68..6e80ac86c2 100644
--- a/utils/misc/variables.msvc
+++ b/utils/misc/variables.msvc
@@ -9,10 +9,10 @@
##################################################################
# Specify where gmake is installed
-MAKE=C:\msys\1.0\home\Administrator\src\gmsh\gmake.exe
+MAKE=C:\src\gmsh\utils\misc\gmake.exe
# Change the following to select which version to build:
-ENABLE_GUI=0
+ENABLE_GUI=1
ENABLE_PARSER=1
ENABLE_POSTPRO=1
ENABLE_TETGEN=1
@@ -20,10 +20,10 @@ ENABLE_NETGEN=0
ENABLE_OCC=0
# If you selected ENABLE_GUI, specify where FLTK is installed
-FLTK_PREFIX=C:\msys\1.0\home\Administrator\src\fltk-1.1.9
+FLTK_PREFIX=C:\src\fltk-1.1.9
# If you selected ENABLE_OCC, specify where OpenCASCADE is insalled
-OCC_PREFIX=C:\OpenCASCADE6.3.0\ros
+OCC_PREFIX=C:\src\OpenCASCADE6.3.0\ros
##################################################################
@@ -58,6 +58,8 @@ LINKER=cl /F16777216
FLAGS=/DWIN32 /D_USE_MATH_DEFINES /DHAVE_NO_DLL /DHAVE_NO_SOCKLEN_T
FLAGS+=/DHAVE_ANN /DHAVE_MATH_EVAL
+FLAGS+=/D_CRT_SECURE_NO_DEPRECATE
+
# Additional system includes ($INCLUDE is automatically defined by MSVC when
# you launch the MSVC command prompt)
SYSINCLUDE=/I"${INCLUDE}"
@@ -97,8 +99,10 @@ ifeq (${ENABLE_GUI},1)
GMSH_DIRS+=Graphics Fltk
FLAGS+=/DHAVE_FLTK /I"${FLTK_PREFIX}"
GMSH_LIBS+=Fltk/Main.obj lib/*.lib lib/*.lib ${FLTK_PREFIX}\lib\fltk*.lib
- GMSH_LIBS+=glu32.lib opengl32.lib advapi32.lib gdi32.lib user32.lib shell32.lib ole32.lib uuid.lib comctl32.lib
+ GMSH_LIBS+=glu32.lib opengl32.lib advapi32.lib gdi32.lib user32.lib
+ GMSH_LIBS+=shell32.lib ole32.lib uuid.lib comctl32.lib
GMSH_LIBS+=wsock32.lib winspool.lib ws2_32.lib Fltk/Win32Icon.res
+ GMSH_LIBS+=/link /NODEFAULTLIB:libcmt.lib
else
GMSH_LIBS=Common/Main.obj lib/*.lib
endif
--
GitLab