From 1005fe15f39f2d96c84dfca51e4dbecec69cb959 Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 3 Jul 2012 06:56:47 +0000 Subject: [PATCH] Fix linkage problem on Windows --- src/GEOM_I_Superv/GEOM_List_i.hh | 1 - src/GEOM_I_Superv/GEOM_Superv_i.hh | 5 ++++- src/GEOM_I_Superv/Makefile.am | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/GEOM_I_Superv/GEOM_List_i.hh b/src/GEOM_I_Superv/GEOM_List_i.hh index 39f4e5d71..beea9ee4b 100644 --- a/src/GEOM_I_Superv/GEOM_List_i.hh +++ b/src/GEOM_I_Superv/GEOM_List_i.hh @@ -29,7 +29,6 @@ #include #include CORBA_SERVER_HEADER(GEOM_Superv) -#include "GEOM_Gen_i.hh" #include "utilities.h" template diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.hh b/src/GEOM_I_Superv/GEOM_Superv_i.hh index 67ccd80dd..7594d8077 100644 --- 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 +#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 8443a5b77..e24863482 100644 --- 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) -- 2.39.2