diff --git a/utils/misc/variables.msvc b/utils/misc/variables.msvc index 21678ece15e366c17bb5f8f005eaa884f109e9ae..a398a8795f6dc9409354f31ac842c4c7141e6208 100644 --- a/utils/misc/variables.msvc +++ b/utils/misc/variables.msvc @@ -12,7 +12,7 @@ MAKE=C:\src\gmsh\utils\misc\gmake.exe # Change the following to select which version to build: -ENABLE_GSL=1 +ENABLE_GSL=0 ENABLE_GUI=0 ENABLE_PARSER=1 ENABLE_POSTPRO=1 @@ -20,6 +20,7 @@ ENABLE_TETGEN=1 ENABLE_NETGEN=0 ENABLE_METIS=1 ENABLE_OCC=0 +ENABLE_MED=0 # If you selected ENABLE_GSL, specify where the GSL is installed GSL_PREFIX=C:\src\gsl-1.8 @@ -30,6 +31,10 @@ FLTK_PREFIX=C:\src\fltk-1.1.9 # If you selected ENABLE_OCC, specify where OpenCASCADE is insalled OCC_PREFIX=C:\src\OpenCASCADE6.3.0\ros +# If you selected ENABLE_MED, specify where MED and HDF5 are installed +MED_PREFIX=C:\src\med-2.3.4 +HDF5_PREFIX=C:\src\hdf5-1.6.6 + ################################################################## # OS and host @@ -37,8 +42,8 @@ UNAME=WIN32MSVC HOSTNAME=localhost # The names of the C and C++ compilers -CC=cl /nologo /MTd -CXX=cl /EHsc /nologo /GR /MTd +CC=cl /nologo /MT +CXX=cl /EHsc /nologo /GR /MT # Debug/Release Single/Multi-threaded Lib/Dll flags: # Rel-Sin-Lib: /ML @@ -105,18 +110,26 @@ ifeq (${ENABLE_OCC},1) 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" + 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 /DHAVE_NATIVE_FILE_CHOOSER /I"${FLTK_PREFIX}" GMSH_LIBS+=Fltk/Main.obj lib/*.lib ${FLTK_PREFIX}\lib\fltk*.lib GMSH_LIBS+=glu32.lib opengl32.lib advapi32.lib gdi32.lib user32.lib - GMSH_LIBS+=shell32.lib ole32.lib uuid.lib comctl32.lib comdlg32.lib - GMSH_LIBS+=wsock32.lib winspool.lib ws2_32.lib Fltk/Win32Icon.res - GMSH_LIBS+=/link /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:msvcrt.lib -# GMSH_LIBS+=/SUBSYSTEM:WINDOWS + GMSH_LIBS+=shell32.lib ole32.lib comctl32.lib comdlg32.lib ws2_32.lib + GMSH_LIBS+=Fltk/Win32Icon.res + GMSH_LIBS+=/link /manifest:no /NODEFAULTLIB:msvcrt.lib + GMSH_LIBS+=/SUBSYSTEM:WINDOWS else GMSH_LIBS+=Common/Main.obj lib/*.lib + ifeq (${ENABLE_OCC},1) + GMSH_LIBS+=advapi32.lib user32.lib ws2_32.lib + endif endif # How you create a static library on this machine