occ mingw

Parser/OpenFile.cpp

-// $Id: OpenFile.cpp,v 1.127 2006-11-15 21:53:31 remacle Exp $
+// $Id: OpenFile.cpp,v 1.128 2006-11-21 23:03:13 geuzaine Exp $
 //
 // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 //
@@ -301,7 +301,8 @@ int MergeProblem(char *name, int warn_if_missing)
 	  !strcmp(ext, ".igs") || !strcmp(ext, ".IGS")){
     GMODEL->readOCCIGES(std::string(name));
   }
-  else if(!strcmp(ext, ".step") || !strcmp(ext, ".STEP")){
+  else if(!strcmp(ext, ".step") || !strcmp(ext, ".STEP") ||
+	  !strcmp(ext, ".stp") || !strcmp(ext, ".STP")){
     GMODEL->readOCCSTEP(std::string(name));
   }
   else if(!strcmp(ext, ".unv") || !strcmp(ext, ".UNV")){

configure

@@ -4608,7 +4608,7 @@ case "$UNAME" in
       FLAGS="${FLAGS} -DHAVE_NO_DLL"
     fi
     if test "x${OCC}" = "xyes"; then
-      GMSH_LIBS="${GMSH_LIBS} -lwinspool"
+      GMSH_LIBS="${GMSH_LIBS} -lwinspool -lws2_32"
     fi
     if test "x$enable_gui" != "xno"; then
       GMSH_LIBS="${GMSH_LIBS} Fltk/Win32Icon.res"

configure.in

-dnl $Id: configure.in,v 1.112 2006-11-21 12:00:57 geuzaine Exp $
+dnl $Id: configure.in,v 1.113 2006-11-21 23:03:13 geuzaine Exp $
 dnl
 dnl Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
 dnl
@@ -593,7 +593,7 @@ case "$UNAME" in
       FLAGS="${FLAGS} -DHAVE_NO_DLL"
     fi
     if test "x${OCC}" = "xyes"; then
-      GMSH_LIBS="${GMSH_LIBS} -lwinspool"
+      GMSH_LIBS="${GMSH_LIBS} -lwinspool -lws2_32"
     fi
     if test "x$enable_gui" != "xno"; then
       GMSH_LIBS="${GMSH_LIBS} Fltk/Win32Icon.res"

doc/README.occ

@@ -23,6 +23,7 @@ How to build OpenCascade 6.1 for Gmsh:
 
     (or just go into each dir occ/ros/adm/make/XXX and type 'make install')
 
+(In our patched version there is a script to do all this automatically)
 
 *************************************************************************
 
@@ -34,11 +35,13 @@ MINGW: too many patches to list here:
 2) fix all OSD_* routines that throw MSVC-specific expcetions (__try, 
    __finally, etc.) using #defines
 
-3) fix dllimport/dllexport #defines on the fly when the compiler complains
+3) remove all the dllimport/dllexport #defines
+
+4) apply same uname patch as for APPLE below
 
 I will try to consolidate all these patches in a single one and submit
 it to the OCC folks, but it's not easy: we must first find a way to
-uniquelyidentify gcc on mingw
+uniquely identify gcc on mingw.
 
 *************************************************************************