Porting on SUSE 64 Linux distribution

diff --git a/src/HTMLService/HTMLService.pro b/src/HTMLService/HTMLService.pro
index 303e6ab1fee906378154b1670d34c7d8ae227234..54a1af46c9c52b874bf517cc7e49e2bf3e9f9019 100755 (executable)
--- a/src/HTMLService/HTMLService.pro
+++ b/src/HTMLService/HTMLService.pro
@@ -17,11 +17,7 @@ CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared
 
 win32:DEFINES += WIN32 
-DEFINES += HTMLSERVICE_EXPORTS 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
-
-LIB_64 {
-       DEFINES += _OCC64
-}
+DEFINES += HTMLSERVICE_EXPORTS $(CASDEFINES) 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  = *.hxx
 

diff --git a/src/OBJECT/OBJECT.pro b/src/OBJECT/OBJECT.pro
index 5718d74d50391c6df7970902d6f88a7574dd4192..86459b714704329f8a2551431fe8f863b1ac7111 100644 (file)
--- a/src/OBJECT/OBJECT.pro
+++ b/src/OBJECT/OBJECT.pro
@@ -15,11 +15,7 @@ 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
-
-LIB_64 {
-       DEFINES += _OCC64
-}
+DEFINES += $(CASDEFINES) 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  = *.hxx
 HEADERS += *.h

diff --git a/src/SVTK/SVTK.pro b/src/SVTK/SVTK.pro
index 9bf2a02f77d8e949a9943483c5399bc71565fbe4..1f68c903087b22b0c8ebb0616673c496e138b4c7 100644 (file)
--- a/src/SVTK/SVTK.pro
+++ b/src/SVTK/SVTK.pro
@@ -17,11 +17,7 @@ CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared
 
 win32:DEFINES += WIN32 
-DEFINES += SVTK_EXPORTS 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
-
-LIB_64 {
-       DEFINES += _OCC64
-}
+DEFINES += SVTK_EXPORTS $(CASDEFINES) 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  = SVTK.h
 HEADERS += SVTK_Prs.h

diff --git a/src/TableViewer/TableViewer.pro b/src/TableViewer/TableViewer.pro
index b7a51d410197e826486b870bdde92503cf70b461..8e9746fb24b6bb49ef213f171d39bebaef739890 100644 (file)
--- a/src/TableViewer/TableViewer.pro
+++ b/src/TableViewer/TableViewer.pro
@@ -14,11 +14,7 @@ CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared
 
 win32:DEFINES += WIN32
-DEFINES += TABLE_VIEWER_EXPORTS 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
-
-LIB_64 {
-       DEFINES += _OCC64
-}
+DEFINES += TABLE_VIEWER_EXPORTS $(CASDEFINES) 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 = *.h
 

diff --git a/src/VTKViewer/VTKViewer.pro b/src/VTKViewer/VTKViewer.pro
index 96bf750ee84a4362f24cfd8946f6cc235d27e72b..04b2493c7b1c080bbb57d9c5f129ebff0da89b42 100644 (file)
--- a/src/VTKViewer/VTKViewer.pro
+++ b/src/VTKViewer/VTKViewer.pro
@@ -17,11 +17,7 @@ CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared
 
 win32:DEFINES += WIN32 
-DEFINES += VTKVIEWER_EXPORTS 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
-
-LIB_64 {
-       DEFINES += _OCC64
-}
+DEFINES += VTKVIEWER_EXPORTS $(CASDEFINES) 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  = VTKViewer.h
 HEADERS += VTKViewer_CellLocationsArray.h