From 61597bb58387c4e41e329d22e00cbb72e5d846eb Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 17 Apr 2008 13:16:27 +0000 Subject: [PATCH] Fix pb. with double omniORB. --- src/SUPERVGUI/Makefile.in | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/SUPERVGUI/Makefile.in b/src/SUPERVGUI/Makefile.in index 4c6e2a6..f853b98 100644 --- a/src/SUPERVGUI/Makefile.in +++ b/src/SUPERVGUI/Makefile.in @@ -98,12 +98,16 @@ LIB_CLIENT_IDL = SALOMEDS.idl \ LIB_SERVER_IDL = -CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) \ - -ftemplate-depth-42 $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) \ - -lSalomeApp -lsuit -lSalomeNS -lEvent \ - -lSalomeLifeCycleCORBA -lSalomeNotification -lSUPERVGraph \ - $(KERNEL_LDFLAGS) -lSalomeDS -lSalomeDSClient $(GUI_LDFLAGS) +CPPFLAGS += $(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) \ + $(OGL_INCLUDES) $(BOOST_CPPFLAGS) \ + -ftemplate-depth-42 $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +LDFLAGS += $(GUI_LDFLAGS) -lSalomeApp -lsuit -lSalomeNS -lEvent \ + -lSalomeLifeCycleCORBA -lSalomeNotification -lSUPERVGraph \ + $(KERNEL_LDFLAGS) -lSalomeDS -lSalomeDSClient \ + $(PYTHON_LIBS) $(QT_MT_LIBS) +# $(VTK_LIBS) $(OGL_LIBS) + #-lqsplitterP LIBS+= -- 2.30.2