From: apo <apo@opencascade.com>
Date: Sat, 12 Apr 2008 11:27:57 +0000 (+0000)
Subject: Porting on SUSE 64 Linux distribution
X-Git-Tag: TG_ACHERON_2008-04-13~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ec724e5c76b915b30b6514a677fd9264d273c493;p=modules%2Fgui.git

Porting on SUSE 64 Linux distribution
---

diff --git a/src/HTMLService/HTMLService.pro b/src/HTMLService/HTMLService.pro
index 303e6ab1f..54a1af46c 100755
--- 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 5718d74d5..86459b714 100644
--- 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 9bf2a02f7..1f68c9030 100644
--- 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 b7a51d410..8e9746fb2 100644
--- 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 96bf750ee..04b2493c7 100644
--- 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