Fix linkage problem on Windows

diff --git a/src/GEOM_I_Superv/GEOM_List_i.hh b/src/GEOM_I_Superv/GEOM_List_i.hh
index 39f4e5d710ded0496e7d05545a969533f8b1d52a..beea9ee4b7e167aa4bd2db5e8de37f0912ef24cc 100644 (file)
--- a/src/GEOM_I_Superv/GEOM_List_i.hh
+++ b/src/GEOM_I_Superv/GEOM_List_i.hh
@@ -29,7 +29,6 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Superv)
 
-#include "GEOM_Gen_i.hh"
 #include "utilities.h"
 
 template <class Type>

diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.hh b/src/GEOM_I_Superv/GEOM_Superv_i.hh
index 67ccd80ddacf8c8d16ce317ac3b1de37fe5e4e2a..7594d80771d49153ed62f5095a86dc8e31d4eec7 100644 (file)
--- a/src/GEOM_I_Superv/GEOM_Superv_i.hh
+++ b/src/GEOM_I_Superv/GEOM_Superv_i.hh
@@ -27,9 +27,12 @@
 
 // IDL headers
 #include <SALOMEconfig.h>
+#include CORBA_CLIENT_HEADER(GEOM_Gen)
 #include CORBA_SERVER_HEADER(GEOM_Superv)
 
-#include "GEOM_Gen_i.hh"
+#include "SALOME_Component_i.hxx"
+#include "SALOME_NamingService.hxx"
+
 #include "GEOM_List_i.hh"
 
 class GEOM_I_SUPERV_EXPORT GEOM_Superv_i : public virtual POA_GEOM::GEOM_Superv,

diff --git a/src/GEOM_I_Superv/Makefile.am b/src/GEOM_I_Superv/Makefile.am
index 8443a5b772209a419a03d70bdcfe952bcb7f3bd8..e248634829964cb1574ae802fb04d719fcf2ea5a 100644 (file)
--- a/src/GEOM_I_Superv/Makefile.am
+++ b/src/GEOM_I_Superv/Makefile.am
@@ -60,8 +60,6 @@ libGEOM_SupervEngine_la_CPPFLAGS =    \
 
 libGEOM_SupervEngine_la_LDFLAGS  =     \
     ../../idl/libSalomeIDLGEOM.la       \
-    ../GEOM/libGEOMbasic.la            \
        $(CORBA_LIBS)                   \
-       $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSalomeNS -lSalomeLifeCycleCORBA -lSALOMELocalTrace -lSalomeContainer -lSalomeDSClient \
-       $(CAS_LDFLAGS) -lTKernel -lTKMath -lTKBRep -lTKTopAlgo \
+       $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer -lSalomeDSClient -lSALOMELocalTrace \
        $(STDLIB)