From 9d00fec69cdb4997bb256b418ca0fbd6ddf0e733 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 1 Apr 2009 18:50:53 +0000
Subject: [PATCH] * always add -lws2_32 on cygwin * hack for more stupid binary
stl file headers
---
Geo/GModelIO_Mesh.cpp | 5 +++--
configure | 3 ++-
configure.in | 3 ++-
doc/TODO.txt | 6 +++++-
doc/VERSIONS.txt | 8 ++++----
5 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/Geo/GModelIO_Mesh.cpp b/Geo/GModelIO_Mesh.cpp
index 0e17d2e08e..7ac97734ad 100644
--- a/Geo/GModelIO_Mesh.cpp
+++ b/Geo/GModelIO_Mesh.cpp
@@ -688,9 +688,10 @@ int GModel::readSTL(const std::string &name, double tolerance)
char buffer[256];
fgets(buffer, sizeof(buffer), fp);
- // workaround for stupid 3D-DOCTOR software, which uses "solid" to
- // start its binary files
+ // workaround for stupid tools which use "solid" to start their
+ // binary files
if(!strncmp(buffer, "solid 3D-DOCTOR", 15)) buffer[0] = 'z';
+ if(!strncmp(buffer, "solid binary STL from Solid Edge", 32)) buffer[0] = 'z';
if(!strncmp(buffer, "solid", 5)){
// ASCII STL
diff --git a/configure b/configure
index 4e6eb6ef79..e201f690b8 100755
--- a/configure
+++ b/configure
@@ -6113,8 +6113,9 @@ _ACEOF
BO="${BO} NoDll"
fi
if test "x${OCC}" = "xyes"; then
- GMSH_LIBS="${GMSH_LIBS} -lwinspool -lws2_32"
+ GMSH_LIBS="${GMSH_LIBS} -lwinspool"
fi
+ GMSH_LIBS="${GMSH_LIBS} -lws2_32"
if test "x$enable_gui" != "xno"; then
GMSH_LIBS="${GMSH_LIBS} Fltk/Win32Icon.res"
fi
diff --git a/configure.in b/configure.in
index 63bc6c200f..ae44ce5a4f 100644
--- a/configure.in
+++ b/configure.in
@@ -769,8 +769,9 @@ case "$UNAME" in
BO="${BO} NoDll"
fi
if test "x${OCC}" = "xyes"; then
- GMSH_LIBS="${GMSH_LIBS} -lwinspool -lws2_32"
+ GMSH_LIBS="${GMSH_LIBS} -lwinspool"
fi
+ GMSH_LIBS="${GMSH_LIBS} -lws2_32"
if test "x$enable_gui" != "xno"; then
GMSH_LIBS="${GMSH_LIBS} Fltk/Win32Icon.res"
fi
diff --git a/doc/TODO.txt b/doc/TODO.txt
index 1f6970ebad..21b064eb7e 100644
--- a/doc/TODO.txt
+++ b/doc/TODO.txt
@@ -1,4 +1,8 @@
-$Id: TODO.txt,v 1.23 2009-03-29 18:11:54 geuzaine Exp $
+$Id: TODO.txt,v 1.24 2009-04-01 18:50:53 geuzaine Exp $
+
+********************************************************************
+
+make Attractor fields work on general surfaces
********************************************************************
diff --git a/doc/VERSIONS.txt b/doc/VERSIONS.txt
index cc6c67d18c..118edd6a03 100644
--- a/doc/VERSIONS.txt
+++ b/doc/VERSIONS.txt
@@ -1,4 +1,4 @@
-$Id: VERSIONS.txt,v 1.43 2009-03-30 08:19:28 geuzaine Exp $
+$Id: VERSIONS.txt,v 1.44 2009-04-01 18:50:53 geuzaine Exp $
2.3.2 (?): optionally copy transfinite mesh contraints during geometry
transformations.
@@ -413,9 +413,9 @@ Shewchuk's Triangle as an alternative isotropic 2D mesh generator;
added AngleSmoothNormals to control sharp edge display with smoothed
normals; fixed random crash for lighted 3D iso surfaces.
-1.23: fixed duplicate elements generation + non-matching tetrahedra
-faces in 3D extruded meshes; better display of displacement maps;
-fixed interactive ellipsis construction; generalized boundary
+1.23 (Aug, 2001): fixed duplicate elements generation + non-matching
+tetrahedra faces in 3D extruded meshes; better display of displacement
+maps; fixed interactive ellipsis construction; generalized boundary
operator; added new explode option for post-processing views; enhanced
link view behavior (to update only the changed items); added new
default plugins: Skin, Transform, Smooth; fixed various other small
--
GitLab