Porting to Qt 4

diff --git a/src/OCCViewer/Makefile.am b/src/OCCViewer/Makefile.am
index c244074a1f9da2f23c4f5d0492f62f4c2e4eb1c1..bc14c02ef255ec2de2e6b4bbab9d67d9166b2843 100755 (executable)
--- a/src/OCCViewer/Makefile.am
+++ b/src/OCCViewer/Makefile.am
@@ -92,4 +92,5 @@ nodist_salomeres_DATA = \
 libOCCViewer_la_CPPFLAGS=$(QT_INCLUDES) $(OGL_INCLUDES) $(CAS_CPPFLAGS) \
        -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
 
-libOCCViewer_la_LDFLAGS=$(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER) ../SUIT/libsuit.la
+libOCCViewer_la_LDFLAGS=$(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER)
+libOCCViewer_la_LIBADD=../Qtx/libqtx.la ../SUIT/libsuit.la

diff --git a/src/OCCViewer/OCCViewer.pro b/src/OCCViewer/OCCViewer.pro
index 319c23b01756b7a67d94111b9fe26e0bce30d17d..facc53204b9d24ac0678edf2cf8a33fbacbee47a 100644 (file)
--- a/src/OCCViewer/OCCViewer.pro
+++ b/src/OCCViewer/OCCViewer.pro
@@ -16,7 +16,7 @@ CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
 CAS_VIEWER = -L$${CASROOT}/Linux/lib -lTKV3d -lTKService
 
 INCLUDEPATH += ../../include $${OGL_INCLUDES} $${CAS_CPPFLAGS} ../Qtx ../SUIT
-LIBS += -L../../lib -lsuit $${OGL_LIBS} $${CAS_KERNEL} $${CAS_VIEWER}
+LIBS += -L../../lib -lqtx -lsuit $${OGL_LIBS} $${CAS_KERNEL} $${CAS_VIEWER}
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/SOCC/Makefile.am b/src/SOCC/Makefile.am
index 25db606727b6c28a22389c550a0c63850e4e818a..e822208e52f2e0e6221f343fdcada94bd318afd2 100755 (executable)
--- a/src/SOCC/Makefile.am
+++ b/src/SOCC/Makefile.am
@@ -46,5 +46,5 @@ libSOCC_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS) \
        -I$(srcdir)/../OCCViewer -I$(srcdir)/../Qtx
 
 libSOCC_la_LDFLAGS=$(QT_MT_LIBS)
-libSOCC_la_LIBADD= ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \
-       ../Prs/libSalomePrs.la ../OCCViewer/libOCCViewer.la
+libSOCC_la_LIBADD=../Qtx/libqtx.la ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \
+                 ../Prs/libSalomePrs.la ../OCCViewer/libOCCViewer.la

diff --git a/src/SVTK/Makefile.am b/src/SVTK/Makefile.am
index a00f2eb9eb63e8d213183decc0d331b88e510670..3fbf0d6801d41310a5bfa42315b609f62a113ce6 100755 (executable)
--- a/src/SVTK/Makefile.am
+++ b/src/SVTK/Makefile.am
@@ -118,8 +118,7 @@ libSVTK_la_LDFLAGS= \
        $(OCC_LIBS) \
        $(VTK_LIBS)
 
-libSVTK_la_LIBADD= ../Qtx/libqtx.la ../SUIT/libsuit.la ../STD/libstd.la \
-                  ../CAM/libCAM.la ../OBJECT/libSalomeObject.la \
+libSVTK_la_LIBADD= ../Qtx/libqtx.la ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \
                   ../Prs/libSalomePrs.la ../VTKViewer/libVTKViewer.la
 
 # Executable