0020055: [GUI win32] Some patches to compile

diff --git a/src/GLViewer/Makefile.am b/src/GLViewer/Makefile.am
index 003d71047f43669dcd9a93ae317a9612a63ef233..49a2c74b2c83cbecf424779f591eb26466f2b683 100644 (file)
--- a/src/GLViewer/Makefile.am
+++ b/src/GLViewer/Makefile.am
@@ -110,5 +110,5 @@ nodist_salomeres_DATA =             \
        GLViewer_msg_en.qm
 
 libGLViewer_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
-libGLViewer_la_LDFLAGS  = $(QT_MT_LIBS) $(CAS_KERNEL)
+libGLViewer_la_LDFLAGS  = $(QT_MT_LIBS) $(CAS_KERNEL) $(OGL_LIBS)
 libGLViewer_la_LIBADD   = ../SUIT/libsuit.la

diff --git a/src/LightApp/Makefile.am b/src/LightApp/Makefile.am
index ac1a1efaff0f310a5c138bb034fb1b6af384d001..a843fa231a4659d659fbfa6d25fb204012bf57dd 100755 (executable)
--- a/src/LightApp/Makefile.am
+++ b/src/LightApp/Makefile.am
@@ -227,7 +227,7 @@ libLightApp_la_LIBADD = ../SUIT/libsuit.la ../STD/libstd.la ../CAM/libCAM.la                        \
        ../LogWindow/libLogWindow.la $(CAS_KERNEL)                                              \
        ../Prs/libSalomePrs.la ../ObjBrowser/libObjBrowser.la ../Style/libSalomeStyle.la        \
        ../Event/libEvent.la                                                                    \
-       $(HDF5_LIBS) $(KERNEL_LDFLAGS) -lSalomeHDFPersist
+       $(HDF5_LIBS) $(KERNEL_LDFLAGS) -lSalomeHDFPersist -lSALOMELocalTrace
 
 if ENABLE_SALOMEOBJECT
   libLightApp_la_LIBADD += ../OBJECT/libSalomeObject.la

diff --git a/src/ObjBrowser/OB.h b/src/ObjBrowser/OB.h
index 6cec1ff5d52818de3cf2991bfbd059647f80f31f..537d744a8507065709ba5d5f18457396e5d6961b 100755 (executable)
--- a/src/ObjBrowser/OB.h
+++ b/src/ObjBrowser/OB.h
@@ -20,7 +20,7 @@
 #define OB_H
 
 #if defined WIN32
-#  if defined OB_EXPORTS
+#  if defined OB_EXPORTS || defined OBJBROWSER_EXPORTS
 #    define OB_EXPORT __declspec( dllexport )
 #  else
 #    define OB_EXPORT __declspec( dllimport )

diff --git a/src/QxScene/QxScene_ViewWindow.cxx b/src/QxScene/QxScene_ViewWindow.cxx
index 3f12b72e4796bc11f68016c2a169bdf87a72e7bb..348a4dbfd825ff4a8118d7ff4a39d3365c61ce02 100644 (file)
--- a/src/QxScene/QxScene_ViewWindow.cxx
+++ b/src/QxScene/QxScene_ViewWindow.cxx
@@ -247,6 +247,8 @@ void QxScene_ViewWindow::setBackgroundColor( const QColor& color )
 QColor QxScene_ViewWindow::backgroundColor() const
 {
   DEBTRACE("QxScene_ViewWindow::backgroundColor");
+  QColor col;
+  return col;
 }
 
 /*!

diff --git a/src/SPlot2d/Makefile.am b/src/SPlot2d/Makefile.am
index b2dc3f6a5b6c642ecfeb57c4eb6bd92a8427b2c8..a12586a08e25d32d080d784c90cf9e496395d6d0 100644 (file)
--- a/src/SPlot2d/Makefile.am
+++ b/src/SPlot2d/Makefile.am
@@ -42,7 +42,7 @@ nodist_libSPlot2d_la_SOURCES = $(MOC_FILES)
 libSPlot2d_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(QWT_INCLUDES) $(BOOST_CPPFLAGS)      \
                         -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../Plot2d           \
                         -I$(srcdir)/../Prs -I$(srcdir)/../OBJECT
-libSPlot2d_la_LDFLAGS  = $(QT_MT_LIBS) $(QWT_LIBS) ../SUIT/libsuit.la ../Plot2d/libPlot2d.la ../Prs/libSalomePrs.la
+libSPlot2d_la_LDFLAGS  = $(QT_MT_LIBS) $(CAS_KERNEL) $(QWT_LIBS) ../SUIT/libsuit.la ../Plot2d/libPlot2d.la ../Prs/libSalomePrs.la ../OBJECT/libSalomeObject.la
 
 
 

diff --git a/src/SUITApp/SUITApp_Application.h b/src/SUITApp/SUITApp_Application.h
index ceda6a1913712d62dc9e71b60e13eb0daf312e37..9f4ab9f900eed0cc4378aa28728c04f7aa06e2ca 100644 (file)
--- a/src/SUITApp/SUITApp_Application.h
+++ b/src/SUITApp/SUITApp_Application.h
@@ -27,10 +27,20 @@
 
 class SUIT_ExceptionHandler;
 
+#ifdef WNT
+#  ifdef SUITAPP_EXPORTS
+#    define SUITAPP_EXPORT __declspec(dllexport)
+#  else
+#   define SUITAPP_EXPORT __declspec(dllimport)
+#  endif
+#else
+#  define SUITAPP_EXPORT
+#endif
+
 #ifdef ENABLE_TESTRECORDER
-  class SUITApp_Application : public TestApplication
+  class SUITAPP_EXPORT SUITApp_Application : public TestApplication
 #else
-  class SUITApp_Application : public QApplication
+  class SUITAPP_EXPORT SUITApp_Application : public QApplication
 #endif
 {
   Q_OBJECT

diff --git a/src/SUPERVGraph/Makefile.am b/src/SUPERVGraph/Makefile.am
index bc91cfa1ce9fbb1e4f026450f00dc0057c4888b2..3477ef80f2dae0524f77f27478f95b6c2f68626c 100755 (executable)
--- a/src/SUPERVGraph/Makefile.am
+++ b/src/SUPERVGraph/Makefile.am
@@ -50,4 +50,4 @@ nodist_salomeres_DATA =               \
 
 libSUPERVGraph_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) \
                             -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT
-libSUPERVGraph_la_LDFLAGS  = $(QT_MT_LIBS) ../SUIT/libsuit.la
+libSUPERVGraph_la_LDFLAGS  = $(QT_MT_LIBS) ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la

diff --git a/src/SVTK/SVTK_CubeAxesActor2D.cxx b/src/SVTK/SVTK_CubeAxesActor2D.cxx
index 4f109801cbf1185b46afbecc27cdeb1bbaa76b64..35b1bc98df438c754fb6fe57df91f46a395af5a8 100644 (file)
--- a/src/SVTK/SVTK_CubeAxesActor2D.cxx
+++ b/src/SVTK/SVTK_CubeAxesActor2D.cxx
@@ -205,11 +205,7 @@ static void ChangeValues(vtkFloatingPointType* aArray1,
     for (int i=0; i<4; i++){
       tmp = aArray1[i]; aArray1[i] = aArray2[i]; aArray2[i] = tmp;
     }
-#ifndef WIN32
     for(int i=0;i<2; i++){
-#else
-    for(i=0;i<2; i++){
-#endif
       tmp = aRange1[i]; aRange1[i] = aRange2[i]; aRange2[i] = tmp;
     }
   }
@@ -450,31 +446,19 @@ int SVTK_CubeAxesActor2D::RenderOpaqueGeometry(vtkViewport *viewport)
 
   // XCoords coordinates for X grid
   vtkFloatArray *XCoords = vtkFloatArray::New();
-#ifndef WIN32
   for(int i=0;i<numOfLabelsX;i++){
-#else
-  for(i=0;i<numOfLabelsX;i++){
-#endif
     vtkFloatingPointType val = bounds[0]+i*(bounds[1]-bounds[0])/(numOfLabelsX-1);
     XCoords->InsertNextValue(val);
   }
   // YCoords coordinates for Y grid
   vtkFloatArray *YCoords = vtkFloatArray::New();
-#ifndef WIN32
   for(int i=0;i<numOfLabelsX;i++){
-#else
-  for(i=0;i<numOfLabelsX;i++){
-#endif
     vtkFloatingPointType val = bounds[2]+i*(bounds[3]-bounds[2])/(numOfLabelsY-1);
     YCoords->InsertNextValue(val);
   }
   // ZCoords coordinates for Z grid
   vtkFloatArray *ZCoords = vtkFloatArray::New();
-#ifndef WIN32
   for(int i=0;i<numOfLabelsZ;i++){
-#else
-  for(i=0;i<numOfLabelsZ;i++){
-#endif
     vtkFloatingPointType val = bounds[4]+i*(bounds[5]-bounds[4])/(numOfLabelsZ-1);
     ZCoords->InsertNextValue(val);
   }
@@ -534,11 +518,7 @@ int SVTK_CubeAxesActor2D::RenderOpaqueGeometry(vtkViewport *viewport)
   p[5][1] = YCoords->GetValue(numOfLabelsY-1);
   p[5][2] = aMiddleZ;
 
-#ifndef WIN32
   for(int i=0;i<3;i++) 
-#else
-  for(i=0;i<3;i++) 
-#endif
     for(int j=0;j<6;j++) vecs[j][i] = p[j][i] - aCPosition[i];
 
   if ( vtkMath::Dot(vecs[0],aCDirection) < vtkMath::Dot(vecs[1],aCDirection))

diff --git a/src/Session/Makefile.am b/src/Session/Makefile.am
index 01f69bf20f453f3dad48aeb661c195d6813380ef..28eaae1acd569277db95a92347cbaffaccb402b4 100755 (executable)
--- a/src/Session/Makefile.am
+++ b/src/Session/Makefile.am
@@ -61,6 +61,8 @@ endif
 libSalomeSession_la_LDFLAGS = $(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS       \
        -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lSalomeCatalog      \
        -lSalomeDSClient $(CAS_KERNEL) -lwith_loggerTraceCollector              \
+       -lSalomeIDLKernel -lSalomeContainer -lTOOLSDS -lSalomeLauncher          \
+       -lRegistry -lSALOMEBasics                                               \
        ../SUIT/libsuit.la ../Event/libEvent.la ../../idl/libSalomeIDLGUI.la    \
        ../Style/libSalomeStyle.la
 
@@ -74,7 +76,8 @@ bin_PROGRAMS = SALOME_Session_Server
 dist_SALOME_Session_Server_SOURCES = SALOME_Session_Server.cxx
 
 SALOME_Session_Server_CPPFLAGS = $(libSalomeSession_la_CPPFLAGS)
-SALOME_Session_Server_LDADD    = $(libSalomeSession_la_LDFLAGS) $(OMNIORB_LIBS)        \
+SALOME_Session_Server_LDADD    = $(libSalomeSession_la_LDFLAGS)                \
+       $(PYTHON_LIBS) $(OMNIORB_LIBS)                                          \
        $(HDF5_LIBS) -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS       \
        -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry         \
        -lSalomeNotification -lSALOMEBasics -lSalomeLauncher ../Qtx/libqtx.la   \

diff --git a/src/Style/Style.h b/src/Style/Style.h
index 10bc1f78572ba4cfa63bed46183d231f5d44c386..62a811a9788dc1af235c9f11078676851e5120c7 100644 (file)
--- a/src/Style/Style.h
+++ b/src/Style/Style.h
@@ -24,7 +24,7 @@
 #define STYLE_H
 
 #if defined WIN32
-#  if defined STYLE_SALOME_EXPORTS
+#  if defined STYLE_SALOME_EXPORTS || defined STYLE_EXPORTS
 #    define STYLE_SALOME_EXPORT _declspec( dllexport )
 #  else
 #    define STYLE_SALOME_EXPORT _declspec( dllimport )

diff --git a/src/TOOLSGUI/Makefile.am b/src/TOOLSGUI/Makefile.am
index 531e559423ed943edccf44ad39cd8c01f3622e34..47eec47c8f33dabc4c1be2769134b1bbb47b3787 100755 (executable)
--- a/src/TOOLSGUI/Makefile.am
+++ b/src/TOOLSGUI/Makefile.am
@@ -55,4 +55,4 @@ libToolsGUI_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS)    \
        -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl                 \
        -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT
 libToolsGUI_la_LDFLAGS  = $(QT_MT_LIBS) ../SUIT/libsuit.la $(CAS_KERNEL) $(KERNEL_LDFLAGS) \
-       -lSalomeNS -lOpUtil $(top_builddir)/idl/libSalomeIDLGUI.so
+       -lSalomeIDLKernel -lSALOMELocalTrace -lSalomeNS -lOpUtil $(top_builddir)/idl/libSalomeIDLGUI.la