From dd3484f8a78ab905915f002e38f1a45b52584822 Mon Sep 17 00:00:00 2001 From: mkr Date: Thu, 28 Jun 2007 08:24:57 +0000 Subject: [PATCH] Porting to Qt4. --- src/ARCHIMEDE/ARCHIMEDE.pro | 37 +++++++++++++++++++++++ src/ARCHIMEDE/Archimede_VolumeSection.cxx | 6 ---- src/ARCHIMEDE/Archimede_VolumeSection.hxx | 3 +- src/src.pro | 2 +- 4 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 src/ARCHIMEDE/ARCHIMEDE.pro diff --git a/src/ARCHIMEDE/ARCHIMEDE.pro b/src/ARCHIMEDE/ARCHIMEDE.pro new file mode 100644 index 000000000..680da5601 --- /dev/null +++ b/src/ARCHIMEDE/ARCHIMEDE.pro @@ -0,0 +1,37 @@ +TEMPLATE = lib +TARGET = GEOMArchimede +DESTDIR = ../../lib +MOC_DIR = ../../moc +OBJECTS_DIR = ../../obj/$$TARGET + +CASROOT = $$(CASROOT) +CAS_CPPFLAGS = $${CASROOT}/inc + +KERNEL_CXXFLAGS = $$(KERNEL_ROOT_DIR)/include/salome + +KERNEL_LDFLAGS = -L$$(KERNEL_ROOT_DIR)/lib/salome + +CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel + +CAS_MODELER = -L$${CASROOT}/Linux/lib -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBO -lTKBool -lTKHLR -lTKFillet -lTKOffset -lTKFeat + +STDLIB = -lstdc++ + +INCLUDEPATH += $${CAS_CPPFLAGS} $${KERNEL_CXXFLAGS} + +LIBS += $${KERNEL_LDFLAGS} -lSALOMELocalTrace $${CAS_KERNEL} $${CAS_MODELER} -lTKMesh $${STDLIB} + +CONFIG -= debug release debug_and_release +CONFIG += qt thread debug dll shared + +win32:DEFINES += WIN32 +DEFINES += OCC_VERSION_MAJOR=6 OCC_VERSION_MINOR=1 OCC_VERSION_MAINTENANCE=1 LIN LINTEL CSFDB No_exception HAVE_CONFIG_H HAVE_LIMITS_H HAVE_WOK_CONFIG_H OCC_CONVERT_SIGNALS + +HEADERS = Archimede_VolumeSection.hxx + +SOURCES = Archimede_VolumeSection.cxx + +includes.files = $$HEADERS +includes.path = ../../include + +INSTALLS += includes diff --git a/src/ARCHIMEDE/Archimede_VolumeSection.cxx b/src/ARCHIMEDE/Archimede_VolumeSection.cxx index ec5fbdbea..c488428af 100644 --- a/src/ARCHIMEDE/Archimede_VolumeSection.cxx +++ b/src/ARCHIMEDE/Archimede_VolumeSection.cxx @@ -26,8 +26,6 @@ // Module : GEOM // $Header$ -#include - #include "Archimede_VolumeSection.hxx" #include "utilities.h" @@ -41,14 +39,10 @@ #include #include #include -#include -#include -#include #include #include #include #include -#include #include #include diff --git a/src/ARCHIMEDE/Archimede_VolumeSection.hxx b/src/ARCHIMEDE/Archimede_VolumeSection.hxx index 6dc4c8799..afb7ea65c 100644 --- a/src/ARCHIMEDE/Archimede_VolumeSection.hxx +++ b/src/ARCHIMEDE/Archimede_VolumeSection.hxx @@ -33,7 +33,8 @@ #include #include #include -#include + +class Handle(Geom_RectangularTrimmedSurface); class VolumeSection{ diff --git a/src/src.pro b/src/src.pro index e74364864..dd0042d4c 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = OBJECT -#SUBDIRS += ARCHIMEDE +SUBDIRS += ARCHIMEDE #SUBDIRS += NMTDS #SUBDIRS += NMTTools #SUBDIRS += NMTAlgo