From b56117ba74b6ce4182a6127e2d0cf2efe6e38731 Mon Sep 17 00:00:00 2001 From: mpv Date: Thu, 15 Feb 2007 11:15:47 +0000 Subject: [PATCH] MPV: merge from branch BR_GUI_AutoTools --- src/LightApp/LightApp_Application.h | 1 - src/LightApp/Makefile.in | 227 ---------------------------- src/Makefile.in | 83 ---------- src/OCCViewer/Makefile.in | 98 ------------ 4 files changed, 409 deletions(-) delete mode 100755 src/LightApp/Makefile.in delete mode 100755 src/Makefile.in delete mode 100755 src/OCCViewer/Makefile.in diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h index a433a4563..b061966ba 100644 --- a/src/LightApp/LightApp_Application.h +++ b/src/LightApp/LightApp_Application.h @@ -127,7 +127,6 @@ public: void updateActions(); SUIT_ViewManager* getViewManager( const QString&, const bool ); - virtual SUIT_ViewManager* createViewManager( const QString& vmType ); virtual void addViewManager( SUIT_ViewManager* ); virtual void removeViewManager( SUIT_ViewManager* ); virtual SUIT_ViewManager* createViewManager( const QString& vmType ); diff --git a/src/LightApp/Makefile.in b/src/LightApp/Makefile.in deleted file mode 100755 index eb1cef66f..000000000 --- a/src/LightApp/Makefile.in +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : OCC team (OCN) -# Module : LightApp -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= LightApp.h \ - LightApp_AboutDlg.h \ - LightApp_Application.h \ - LightApp_DataModel.h \ - LightApp_DataObject.h \ - LightApp_DataOwner.h \ - LightApp_DataSubOwner.h \ - LightApp_Dialog.h \ - LightApp_Displayer.h \ - LightApp_Driver.h \ - LightApp_EventFilter.h \ - LightApp_HDFDriver.h \ - LightApp_Module.h \ - LightApp_ModuleDlg.h \ - LightApp_NameDlg.h \ - LightApp_OBFilter.h \ - LightApp_OBSelector.h \ - LightApp_Operation.h \ - LightApp_Selection.h \ - LightApp_SelectionMgr.h \ - LightApp_ShowHideOp.h \ - LightApp_Study.h \ - LightApp_SwitchOp.h \ - LightApp_Preferences.h \ - LightApp_PreferencesDlg.h \ - LightApp_RootObject.h \ - LightApp_UpdateFlags.h \ - LightApp_WidgetContainer.h - -ifneq ($(DISABLE_VTKVIEWER),yes) -ifneq ($(DISABLE_SALOMEOBJECT),yes) - EXPORT_HEADERS+= LightApp_VTKSelector.h -endif -endif -ifneq ($(DISABLE_OCCVIEWER),yes) - EXPORT_HEADERS+= LightApp_OCCSelector.h -endif -ifneq ($(DISABLE_GLVIEWER),yes) - EXPORT_HEADERS+= LightApp_GLSelector.h -endif - -# .po files to transform in .qm -PO_FILES = LightApp_images.po \ - LightApp_msg_en.po - -# Libraries targets -LIB = libLightApp.la - -LIB_SRC= LightApp_AboutDlg.cxx \ - LightApp_Application.cxx \ - LightApp_DataModel.cxx \ - LightApp_DataObject.cxx \ - LightApp_DataOwner.cxx \ - LightApp_DataSubOwner.cxx \ - LightApp_Dialog.cxx \ - LightApp_Displayer.cxx \ - LightApp_Driver.cxx \ - LightApp_EventFilter.cxx \ - LightApp_HDFDriver.cxx \ - LightApp_Module.cxx \ - LightApp_ModuleDlg.cxx \ - LightApp_NameDlg.cxx \ - LightApp_OBFilter.cxx \ - LightApp_OBSelector.cxx \ - LightApp_Operation.cxx \ - LightApp_Selection.cxx \ - LightApp_SelectionMgr.cxx \ - LightApp_ShowHideOp.cxx \ - LightApp_Study.cxx \ - LightApp_SwitchOp.cxx \ - LightApp_Preferences.cxx \ - LightApp_PreferencesDlg.cxx \ - LightApp_WidgetContainer.cxx - -ifneq ($(DISABLE_VTKVIEWER),yes) -ifneq ($(DISABLE_SALOMEOBJECT),yes) - LIB_SRC+= LightApp_VTKSelector.cxx -endif -endif -ifneq ($(DISABLE_OCCVIEWER),yes) - LIB_SRC+= LightApp_OCCSelector.cxx -endif -ifneq ($(DISABLE_GLVIEWER),yes) - LIB_SRC+= LightApp_GLSelector.cxx -endif - -LIB_MOC = LightApp_AboutDlg.h \ - LightApp_Application.h \ - LightApp_DataModel.h \ - LightApp_Dialog.h \ - LightApp_OBSelector.h \ - LightApp_Operation.h \ - LightApp_Module.h \ - LightApp_ModuleDlg.h \ - LightApp_NameDlg.h \ - LightApp_SelectionMgr.h \ - LightApp_ShowHideOp.h \ - LightApp_Study.h \ - LightApp_SwitchOp.h \ - LightApp_Preferences.h \ - LightApp_PreferencesDlg.h \ - LightApp_WidgetContainer.h - -ifneq ($(DISABLE_VTKVIEWER),yes) -ifneq ($(DISABLE_SALOMEOBJECT),yes) - LIB_MOC+= LightApp_VTKSelector.h -endif -endif -ifneq ($(DISABLE_OCCVIEWER),yes) - LIB_MOC+= LightApp_OCCSelector.h -endif -ifneq ($(DISABLE_GLVIEWER),yes) - LIB_MOC+= LightApp_GLSelector.h -endif - -RESOURCES_FILES = icon_about.png \ - icon_applogo.png \ - icon_default.png \ - icon_module.png \ - icon_module_big.png \ - icon_select.png \ - LightApp.ini \ - LightApp.xml - -CPPFLAGS+=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(OCC_INCLUDES) \ - $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) - -ifneq ($(DISABLE_VTKVIEWER),yes) - CPPFLAGS+= $(VTK_INCLUDES) -else - CPPFLAGS+= -DDISABLE_VTKVIEWER -endif -ifneq ($(DISABLE_PLOT2DVIEWER),yes) - CPPFLAGS+= $(QWT_INCLUDES) -else - CPPFLAGS+= -DDISABLE_PLOT2DVIEWER -endif -ifeq ($(DISABLE_OCCVIEWER),yes) - CPPFLAGS+= -DDISABLE_OCCVIEWER -endif -ifneq ($(DISABLE_PYCONSOLE),yes) - CPPFLAGS+= $(PYTHON_INCLUDES) -else - CPPFLAGS+= -DDISABLE_PYCONSOLE -endif -ifeq ($(DISABLE_GLVIEWER),yes) - CPPFLAGS+= -DDISABLE_GLVIEWER -endif -ifeq ($(DISABLE_SUPERVGRAPHVIEWER),yes) - CPPFLAGS+= -DDISABLE_SUPERVGRAPHVIEWER -endif -ifeq ($(DISABLE_SALOMEOBJECT),yes) - CPPFLAGS+= -DDISABLE_SALOMEOBJECT -endif - -LDFLAGS+=$(QT_MT_LIBS) -ifneq ($(DISABLE_PYCONSOLE),yes) - LDFLAGS+= $(PYTHON_LIBS) -endif - -LIBS+= -lsuit -lstd -lCAM -lObjBrowser -lLogWindow $(CAS_KERNEL) -lSalomePrs \ - $(HDF5_LIBS) $(KERNEL_LDFLAGS) -lSalomeHDFPersist - -ifneq ($(DISABLE_SALOMEOBJECT),yes) - LIBS+= -lSalomeObject -endif -ifneq ($(DISABLE_VTKVIEWER),yes) - LIBS+= -lVTKViewer -ifneq ($(DISABLE_SALOMEOBJECT),yes) - LIBS+= -lSVTK -endif -endif -ifneq ($(DISABLE_OCCVIEWER),yes) - LIBS+= -lOCCViewer -ifneq ($(DISABLE_SALOMEOBJECT),yes) - LIBS+= -lSOCC -endif -endif -ifneq ($(DISABLE_GLVIEWER),yes) - LIBS+= -lGLViewer -endif -ifneq ($(DISABLE_PLOT2DVIEWER),yes) - LIBS+= -lPlot2d -ifneq ($(DISABLE_SALOMEOBJECT),yes) - LIBS+= -lSPlot2d -endif -endif -ifneq ($(DISABLE_PYCONSOLE),yes) - LIBS+= -lPyInterp -lPythonConsole -endif -ifneq ($(DISABLE_SUPERVGRAPHVIEWER),yes) - LIBS+= -lSUPERVGraph -endif - -@CONCLUDE@ diff --git a/src/Makefile.in b/src/Makefile.in deleted file mode 100755 index f55c420e7..000000000 --- a/src/Makefile.in +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - - -@COMMENCE@ - -SUBDIRS = Qtx Style DDS QDS SUIT STD CAF CAM SUITApp LogWindow ObjBrowser Prs - -ifneq ($(DISABLE_SALOMEOBJECT),yes) - SUBDIRS += OBJECT -endif - -ifneq ($(DISABLE_GLVIEWER),yes) - SUBDIRS += GLViewer -endif - -ifneq ($(DISABLE_VTKVIEWER),yes) - SUBDIRS += VTKViewer -ifneq ($(DISABLE_SALOMEOBJECT),yes) - SUBDIRS += SVTK -endif -endif -ifneq ($(DISABLE_OCCVIEWER),yes) - SUBDIRS += OCCViewer -ifneq ($(DISABLE_SALOMEOBJECT),yes) - SUBDIRS += SOCC -endif -endif -ifneq ($(DISABLE_PYCONSOLE),yes) - SUBDIRS += PyInterp PythonConsole -endif -ifneq ($(DISABLE_PLOT2DVIEWER),yes) - SUBDIRS += Plot2d -ifneq ($(DISABLE_SALOMEOBJECT),yes) - SUBDIRS += SPlot2d -endif -endif -ifneq ($(DISABLE_SUPERVGRAPHVIEWER),yes) - SUBDIRS += SUPERVGraph -endif -SUBDIRS += LightApp ResExporter - -ifneq ($(GUI_DISABLE_CORBA),yes) - SUBDIRS += RegistryDisplay TOOLSGUI \ - Event Session SalomeApp SALOME_SWIG SALOME_PY SALOME_PYQT -endif - -ifeq (@cppunit_ok@,yes) -ifneq ($(GUI_DISABLE_CORBA),yes) - SUBDIRS+= \ - SalomeApp/Test -endif -endif - -@MODULE@ diff --git a/src/OCCViewer/Makefile.in b/src/OCCViewer/Makefile.in deleted file mode 100755 index c8e9a28d1..000000000 --- a/src/OCCViewer/Makefile.in +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Vladimir Klyachin (OCN) -# Module : OCCViewer -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= OCCViewer_AISSelector.h \ - OCCViewer_ViewManager.h \ - OCCViewer_ViewModel.h \ - OCCViewer_ViewPort3d.h \ - OCCViewer_ViewPort.h \ - OCCViewer_ViewWindow.h \ - OCCViewer_VService.h \ - OCCViewer_CreateRestoreViewDlg.h \ - OCCViewer.h - -# .po files to transform in .qm -PO_FILES = OCCViewer_images.po \ - OCCViewer_msg_en.po - -# Libraries targets -LIB = libOCCViewer.la -LIB_SRC= OCCViewer_AISSelector.cxx \ - OCCViewer_ViewManager.cxx \ - OCCViewer_ViewModel.cxx \ - OCCViewer_ViewPort3d.cxx \ - OCCViewer_ViewPort.cxx \ - OCCViewer_ViewWindow.cxx \ - OCCViewer_VService.cxx \ - OCCViewer_CreateRestoreViewDlg.cxx \ - OCCViewer_ClippingDlg.cxx \ - OCCViewer_SetRotationPointDlg.cxx - -LIB_MOC = OCCViewer_AISSelector.h \ - OCCViewer_ViewModel.h \ - OCCViewer_ViewPort3d.h \ - OCCViewer_ViewPort.h \ - OCCViewer_ViewWindow.h \ - OCCViewer_ViewManager.h \ - OCCViewer_CreateRestoreViewDlg.h \ - OCCViewer_ClippingDlg.h \ - OCCViewer_SetRotationPointDlg.h - -RESOURCES_FILES = \ -view_back.png \ -view_bottom.png \ -view_camera_dump.png \ -view_clone.png \ -view_clipping.png \ -view_clipping_pressed.png \ -view_fitall.png \ -view_fitarea.png \ -view_front.png \ -view_glpan.png \ -view_left.png \ -view_pan.png \ -view_presets.png \ -view_reset.png \ -view_right.png \ -view_rotate.png \ -view_shoot.png \ -view_top.png \ -view_triedre.png \ -view_zoom.png - -CPPFLAGS+=$(QT_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) - -LDFLAGS+=$(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER) -lsuit - -@CONCLUDE@ - - -- 2.39.2