diff --git a/Fltk/Makefile b/Fltk/Makefile index 98d64602984c02875e79df29cb5e5ba499440144..a09d0dee4c1211df5a26cb3e8fa71cc7dfeece83 100644 --- a/Fltk/Makefile +++ b/Fltk/Makefile @@ -69,23 +69,23 @@ depend: rm -f Makefile.new # DO NOT DELETE THIS LINE -Main${OBJEXT}: Main.cpp GUI.h menuWindow.h popupButton.h ../Common/Gmsh.h \ - ../Common/GmshMessage.h Draw.h ../Common/Context.h ../Geo/CGNSOptions.h \ - ../Mesh/meshPartitionOptions.h ../Common/Options.h ../Post/ColorTable.h \ - ../Parser/Parser.h ../Common/OpenFile.h ../Common/CommandLine.h \ - Solvers.h ../Plugin/PluginManager.h ../Geo/GModel.h ../Geo/GVertex.h \ - ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/SOrientedBoundingBox.h \ - ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/Pair.h \ - ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \ - ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \ - ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \ - ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \ - ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \ - ../Geo/SBoundingBox3d.h ../Mesh/Field.h ../Common/GmshConfig.h \ - ../Geo/STensor3.h ../Geo/SVector3.h ../Numeric/GmshMatrix.h \ - ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Post/PView.h \ - ../Mesh/BackgroundMesh.h +Main${OBJEXT}: Main.cpp ../Common/Gmsh.h ../Common/GmshMessage.h GUI.h \ + menuWindow.h popupButton.h Draw.h ../Common/Context.h \ + ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h ../Common/Options.h \ + ../Post/ColorTable.h ../Parser/Parser.h ../Common/OpenFile.h \ + ../Common/CommandLine.h Solvers.h ../Plugin/PluginManager.h \ + ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \ + ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ + ../Geo/SOrientedBoundingBox.h ../Geo/SVector3.h ../Geo/SPoint3.h \ + ../Geo/SPoint2.h ../Geo/Pair.h ../Geo/GPoint.h ../Geo/SPoint2.h \ + ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \ + ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \ + ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \ + ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \ + ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Mesh/Field.h \ + ../Common/GmshConfig.h ../Geo/STensor3.h ../Geo/SVector3.h \ + ../Numeric/GmshMatrix.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \ + ../Post/PView.h ../Mesh/BackgroundMesh.h GUI${OBJEXT}: GUI.cpp GUI.h graphicWindow.h openglWindow.h \ ../Graphics/drawContext.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ menuWindow.h popupButton.h optionWindow.h spherePositionWidget.h \ diff --git a/utils/embed/GmshEmbedded.cpp b/utils/embed/GmshEmbedded.cpp deleted file mode 100644 index 5e0b234d66d8f59d3570a090cb51e8526cb18f85..0000000000000000000000000000000000000000 --- a/utils/embed/GmshEmbedded.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// Gmsh - Copyright (C) 1997-2009 C. Geuzaine, J.-F. Remacle -// -// See the LICENSE.txt file for license information. Please report all -// bugs and problems to <gmsh@geuz.org>. - -#include "GModel.h" -#include "GmshEmbedded.h" - -CTX *CTX::_instance = 0; - -int GmshInitialize(int argc, char **argv) -{ -} - -int GmshFinalize() -{ -} diff --git a/utils/embed/GmshEmbedded.h b/utils/embed/GmshEmbedded.h deleted file mode 100644 index 56d16f0aed2ef0b53bc7b61cca1d36eb36eee4f8..0000000000000000000000000000000000000000 --- a/utils/embed/GmshEmbedded.h +++ /dev/null @@ -1,51 +0,0 @@ -// Gmsh - Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle -// -// See the LICENSE.txt file for license information. Please report all -// bugs and problems to <gmsh@geuz.org>. - -#ifndef _GMSH_EMBEDDED_H_ -#define _GMSH_EMBEDDED_H_ - -class CTX{ - private: - static CTX *_instance; - public: - double lc; - int pickElements; - int hideUnselected; - struct{ - double tolerance; - } geom; - struct{ - int reverseAllNormals; - int secondOrderExperimental; - int numSubEdges; - } mesh; - CTX() - { - lc = 1.; - pickElements = 0; - hideUnselected = 0; - geom.tolerance = 1.e-6; - mesh.reverseAllNormals = 1; - mesh.secondOrderExperimental = 0; - } - ~CTX(){} - static CTX *instance() - { - if(!_instance) _instance = new CTX(); - return _instance; - } - unsigned int packColor(int,int,int,int){ return 0; } - int unpackRed(unsigned int){ return 0; } - int unpackGreen(unsigned int){ return 0; } - int unpackBlue(unsigned int){ return 0; } - int unpackAlpha(unsigned int){ return 0; } -}; - -class smooth_normals{ - public: - int dummy; -}; - -#endif diff --git a/utils/embed/Makefile b/utils/embed/Makefile deleted file mode 100644 index 8b0fd5982175d67d8b5f570d7657f49456e9c3d5..0000000000000000000000000000000000000000 --- a/utils/embed/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# Gmsh - Copyright (C) 1997-2009 C. Geuzaine, J.-F. Remacle -# -# See the LICENSE.txt file for license information. Please report all -# bugs and problems to <gmsh@geuz.org>. - -include ../../variables - -LIB = ../../lib/libGmshEmbedded${LIBEXT} - -INC = ${DASH}I. ${DASH}I../../Common - -CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE} ${DASH}DHAVE_GMSH_EMBEDDED - -SRC = GModel.cpp\ - GModelIO_Mesh.cpp\ - GEntity.cpp\ - GVertex.cpp GEdge.cpp GEdgeLoop.cpp GFace.cpp GRegion.cpp\ - discreteEdge.cpp discreteFace.cpp discreteRegion.cpp\ - MVertex.cpp MFace.cpp MElement.cpp\ - MLine.cpp MTriangle.cpp MQuadrangle.cpp MTetrahedron.cpp\ - MHexahedron.cpp MPrism.cpp MPyramid.cpp\ - Numeric.cpp\ - FunctionSpace.cpp\ - StringUtils.cpp\ - GmshEmbedded.cpp - -OBJ = ${SRC:.cpp=${OBJEXT}} - -.SUFFIXES: ${OBJEXT} .cpp - -${LIB}: ${OBJ} - ${AR} ${ARFLAGS}${LIB} ${OBJ} - ${RANLIB} ${LIB} - -.cpp${OBJEXT}: - ${CXX} ${CFLAGS} ${DASH}c $< - -clean: - rm -f *.o *.obj - -distclean: - rm -f *.a *.lib - rm -f *.o *.obj - mkdir tmp - mv GmshEmbedded.* tmp - rm -f *.cpp *.h - mv tmp/* . - rmdir tmp - -depend: - (sed '/^# DO NOT DELETE THIS LINE/q' Makefile && \ - ${CXX} -MM ${CFLAGS} ${SRC} \ - ) >Makefile.new - cp Makefile Makefile.bak - cp Makefile.new Makefile - rm -f Makefile.new - -# DO NOT DELETE THIS LINE