diff --git a/utils/misc/variables.msvc b/utils/misc/variables.msvc index e1417aced5c2f9722ff02dcf06d0e3560f5fe933..63663226a06685ae0a0ab6812df2c1a84f3ce90d 100644 --- a/utils/misc/variables.msvc +++ b/utils/misc/variables.msvc @@ -10,7 +10,7 @@ # Define this is you use the native Windows shell # -MAKE=E:/src/gmsh/utils/misc/gmake.exe +MAKE="E:/src/gmsh/utils/misc/gmake.exe" UNAME=WIN32MSVC RM=erase MV=move @@ -38,17 +38,17 @@ ENABLE_OCC=1 ENABLE_MED=1 # If you selected ENABLE_GSL, specify where the GSL is installed -GSL_PREFIX=E:/src/gsl-1.8 +GSL_PREFIX="E:/src/gsl-1.8" # If you selected ENABLE_GUI, specify where FLTK is installed -FLTK_PREFIX=E:/src/fltk-1.1.9 +FLTK_PREFIX="E:/src/fltk-1.1.9" # If you selected ENABLE_OCC, specify where OpenCASCADE is insalled -OCC_PREFIX=E:/src/OpenCASCADE6.3.0/ros +OCC_PREFIX="E:/src/OpenCASCADE6.3.0/ros" # If you selected ENABLE_MED, specify where MED and HDF5 are installed -MED_PREFIX=E:/src/med-2.3.4 -HDF5_PREFIX=E:/src/hdf5-1.6.6 +MED_PREFIX="E:/src/med-2.3.4" +HDF5_PREFIX="E:/src/hdf5-1.6.6" ################################################################## @@ -121,18 +121,18 @@ ifeq (${ENABLE_METIS},1) GMSH_DIRS+=contrib/Metis endif ifeq (${ENABLE_OCC},1) - FLAGS+=/DHAVE_OCC /DHAVE_NO_OCC_CONFIG_H /DWNT /I"${OCC_PREFIX}/inc" + FLAGS+=/DHAVE_OCC /DHAVE_NO_OCC_CONFIG_H /DWNT /I${OCC_PREFIX}/inc GMSH_LIBS+=${OCC_PREFIX}/win32/bin/*.lib endif ifeq (${ENABLE_MED},1) - FLAGS+=/DHAVE_MED /I"${HDF5_PREFIX}/include" /I"${MED_PREFIX}/include" + FLAGS+=/DHAVE_MED /I${HDF5_PREFIX}/include /I${MED_PREFIX}/include GMSH_LIBS+=${MED_PREFIX}/lib/med.lib GMSH_LIBS+=${HDF5_PREFIX}/lib/hdf5.lib ${HDF5_PREFIX}/lib/szlib.lib endif ifeq (${ENABLE_GUI},1) GMSH_DIRS+=Graphics Fltk contrib/NativeFileChooser - FLAGS+=/DHAVE_FLTK /I"${FLTK_PREFIX}" /I"${FLTK_PREFIX}/FL/images" + FLAGS+=/DHAVE_FLTK /I${FLTK_PREFIX} /I${FLTK_PREFIX}/FL/images FLAGS+=/DHAVE_LIBZ /DHAVE_LIBPNG /DHAVE_LIBJPEG /DHAVE_NATIVE_FILE_CHOOSER GMSH_LIBS+=Fltk/Main.obj lib/*.lib ${FLTK_PREFIX}/lib/fltk*.lib GMSH_LIBS+=glu32.lib opengl32.lib advapi32.lib gdi32.lib user32.lib @@ -146,6 +146,7 @@ else ifeq (${ENABLE_OCC},1) GMSH_LIBS+=advapi32.lib user32.lib endif + GMSH_LIBS+=/link /manifest:no /NODEFAULTLIB:msvcrt.lib endif # How you create a static library on this machine