From: smh Date: Tue, 14 Jun 2005 07:10:45 +0000 (+0000) Subject: SMH: Fixes and patches from Paul. X-Git-Tag: T3_0_0_a3~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=76f635f4f9aac8b59833fd9268da8e519c66749c;p=modules%2Fgui.git SMH: Fixes and patches from Paul. --- diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index d35453520..79a5d5efb 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -10,9 +10,12 @@ HAVE_SSTREAM=@HAVE_SSTREAM@ LIBS=@LIBS@ +LIBSFORBIN=@LIBS@ LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome +LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome # add libstdc++ to link c++ library with libtool ! LDFLAGS+= -lstdc++ +LDFLAGSFORBIN+= -lstdc++ CP=@CP@ diff --git a/src/CAF/CAF_Tools.h b/src/CAF/CAF_Tools.h index a1a5ac4b8..78f058f25 100755 --- a/src/CAF/CAF_Tools.h +++ b/src/CAF/CAF_Tools.h @@ -6,7 +6,7 @@ #include -#include +#include #include #include diff --git a/src/CAF/Makefile.in b/src/CAF/Makefile.in index dd19a5d7f..b4789adf7 100755 --- a/src/CAF/Makefile.in +++ b/src/CAF/Makefile.in @@ -43,8 +43,7 @@ undo.png CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) -I${QTDIR}/src/kernel -I$(QTDIR)/mkspecs/linux-g++ LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_OCAF) -LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lstd -LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit +LIBS+= -lstd -lsuit @CONCLUDE@ diff --git a/src/CAM/Makefile.in b/src/CAM/Makefile.in index c031fa261..4473bc99f 100755 --- a/src/CAM/Makefile.in +++ b/src/CAM/Makefile.in @@ -39,7 +39,8 @@ CPPFLAGS+=$(QT_INCLUDES) LDFLAGS+=$(QT_MT_LIBS) -LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -lstd +LIBS+= -lsuit -lstd +LDFLAGSFORBIN= -lSUITApp @CONCLUDE@ diff --git a/src/GLViewer/Makefile.in b/src/GLViewer/Makefile.in index 76235190c..7b69fc803 100644 --- a/src/GLViewer/Makefile.in +++ b/src/GLViewer/Makefile.in @@ -80,6 +80,6 @@ CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL) -LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -L/usr/X11R6/lib -lGLU +LIBS+= -lsuit -L/usr/X11R6/lib -lGLU @CONCLUDE@ diff --git a/src/Loader/Makefile.in b/src/Loader/Makefile.in index d047d4c2c..b628b7141 100755 --- a/src/Loader/Makefile.in +++ b/src/Loader/Makefile.in @@ -33,6 +33,7 @@ BIN_CLIENT_IDL = SALOME_Session.idl \ CPPFLAGS+=$(QT_MT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS+=$(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome LDFLAGS+=$(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lOpUtil -lSALOMELocalTrace +LDFLAGSFORBIN= $(LDFLAGS) -lSALOMETraceCollector @CONCLUDE@ diff --git a/src/ObjBrowser/Makefile.in b/src/ObjBrowser/Makefile.in index cbdaf0e3b..cdb715d69 100755 --- a/src/ObjBrowser/Makefile.in +++ b/src/ObjBrowser/Makefile.in @@ -35,7 +35,7 @@ PO_FILES = OB_msg_en.po CPPFLAGS+=$(QT_INCLUDES) LDFLAGS+=$(QT_MT_LIBS) -LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit +LIBS+= -lsuit @CONCLUDE@ diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in index 7b5102755..a8d05679b 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in +++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in @@ -19,6 +19,10 @@ ifeq ($(QT_VERS),Qt_3_3_3) QT_VERS = Qt_3_3_0 endif +ifeq ($(QT_VERS),Qt_3_3_4) +QT_VERS = Qt_3_3_0 +endif + # Sip flags SIP_FLAGS = -t WS_X11 -t $(QT_VERS) -s ".cc" -c . -I $(PYQT_SIPS) diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.in b/src/SALOME_PYQT/SalomePyQt/Makefile.in index 300a7b509..6899f984b 100644 --- a/src/SALOME_PYQT/SalomePyQt/Makefile.in +++ b/src/SALOME_PYQT/SalomePyQt/Makefile.in @@ -19,6 +19,9 @@ VPATH=.:@srcdir@:@top_srcdir@/idl ifeq ($(QT_VERS),Qt_3_3_3) QT_VERS = Qt_3_3_0 endif +ifeq ($(QT_VERS),Qt_3_3_4) +QT_VERS = Qt_3_3_0 +endif # Sip flags SIP_FLAGS = -t WS_X11 -t $(QT_VERS) -s ".cc" -c . -I $(PYQT_SIPS) diff --git a/src/SOCC/Makefile.in b/src/SOCC/Makefile.in index d22bb1a0f..26f3ef6f3 100755 --- a/src/SOCC/Makefile.in +++ b/src/SOCC/Makefile.in @@ -32,6 +32,6 @@ LIB_CLIENT_IDL = SALOMEDS.idl \ CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome LDFLAGS+=$(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -lSalomeObject -lSalomePrs -lOCCViewer -lOpUtil +LIBS+= -lsuit -lSalomeObject -lSalomePrs -lOCCViewer -lOpUtil @CONCLUDE@ diff --git a/src/STD/Makefile.in b/src/STD/Makefile.in index dc331fe1c..878870e9a 100755 --- a/src/STD/Makefile.in +++ b/src/STD/Makefile.in @@ -57,6 +57,6 @@ std.ini CPPFLAGS+=$(QT_INCLUDES) LDFLAGS+=$(QT_MT_LIBS) -LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit +LIBS+= -lsuit @CONCLUDE@ diff --git a/src/SUITApp/Makefile.in b/src/SUITApp/Makefile.in index 75f67c928..9fb9dc088 100644 --- a/src/SUITApp/Makefile.in +++ b/src/SUITApp/Makefile.in @@ -34,7 +34,8 @@ CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) LDFLAGS+=$(QT_MT_LIBS) LIBS+= -Xlinker -export-dynamic $(PYTHON_LIBS) -LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -lqtx +LIBS+= -lsuit -lqtx +LIBSFORBIN+= -lsuit -lqtx @CONCLUDE@ diff --git a/src/SUPERVGraph/Makefile.in b/src/SUPERVGraph/Makefile.in index 433f6239f..11f7c6500 100755 --- a/src/SUPERVGraph/Makefile.in +++ b/src/SUPERVGraph/Makefile.in @@ -31,7 +31,7 @@ LIB_CLIENT_IDL = SALOMEDS.idl \ SALOME_GenericObj.idl -CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome LDFLAGS+=$(QT_MT_LIBS) -L$(top_builddir)/lib diff --git a/src/SVTK/Makefile.in b/src/SVTK/Makefile.in index 75bf1e055..806e79964 100755 --- a/src/SVTK/Makefile.in +++ b/src/SVTK/Makefile.in @@ -53,6 +53,6 @@ LIB_CLIENT_IDL = SALOMEDS.idl \ CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome LDFLAGS+=$(QT_MT_LIBS) $(OCC_LIBS) $(VTK_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -lCAM -lSalomeObject -lSalomePrs -lVTKViewer -lOpUtil +LIBS+= -lsuit -lCAM -lSalomeObject -lSalomePrs -lVTKViewer -lOpUtil @CONCLUDE@ diff --git a/src/SalomeApp/Makefile.in b/src/SalomeApp/Makefile.in index 241d84571..4b7ec7dd3 100755 --- a/src/SalomeApp/Makefile.in +++ b/src/SalomeApp/Makefile.in @@ -102,7 +102,7 @@ RESOURCES_FILES = icon_about.png \ CPPFLAGS+=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) -LIBS+= -L$(GUI_ROOT_DIR)/lib/salome -lsuit -lstd -lCAM -lObjBrowser -L$(KERNEL_ROOT_DIR)/lib/salome -lOpUtil -lSALOMELocalTrace $(CAS_KERNEL) -lPlot2d -lGLViewer -lOCCViewer -lVTKViewer -lSalomeObject -lSVTK -lSOCC -lSPlot2d -lPyInterp -lPythonConsole -lLogWindow -lSalomeContainer +LIBS+= -lsuit -lstd -lCAM -lObjBrowser -L$(KERNEL_ROOT_DIR)/lib/salome -lOpUtil -lSALOMELocalTrace $(CAS_KERNEL) -lPlot2d -lGLViewer -lOCCViewer -lVTKViewer -lSalomeObject -lSVTK -lSOCC -lPyInterp -lPythonConsole -lLogWindow -lSalomeContainer @CONCLUDE@ diff --git a/src/SalomeApp/resources/SalomeApp.xml b/src/SalomeApp/resources/SalomeApp.xml index 62eaddcfc..ce3a3e7ae 100644 --- a/src/SalomeApp/resources/SalomeApp.xml +++ b/src/SalomeApp/resources/SalomeApp.xml @@ -15,7 +15,6 @@ - diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in index 549f0aa4d..69ee385f0 100755 --- a/src/Session/Makefile.in +++ b/src/Session/Makefile.in @@ -60,7 +60,7 @@ CPPFLAGS += $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLA CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) LDFLAGS += $(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lSALOMETraceCollector -lEvent -lCASCatch -lSalomeCatalog -lSalomeDS $(CAS_LDPATH) -lTKernel -LDFLAGSFORBIN= $(LDFLAGS) +LDFLAGSFORBIN= $(LDFLAGS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification @CONCLUDE@