Compilation under Windows.

diff --git a/src/Logger/SALOME_Logger_Server.cxx b/src/Logger/SALOME_Logger_Server.cxx
index 3fda427410c5b13b82328fc5357ac971c371f6b6..80ddaad0666e6f8595286aab22ca70fd020a79dd 100644 (file)
--- a/src/Logger/SALOME_Logger_Server.cxx
+++ b/src/Logger/SALOME_Logger_Server.cxx
@@ -34,10 +34,6 @@
 # include <unistd.h>
 #endif
 
-#ifdef WIN32
-#include <omnithread/pthread_nt.h>
-#endif
-
 omni_mutex Logger::myLock;
 
 SALOME_Logger::Logger_ptr KERNEL::getLoggerServantSA()

diff --git a/src/Logger/SALOME_Logger_Server.hxx b/src/Logger/SALOME_Logger_Server.hxx
index 7377d7696b4de2ffd899597b0ef8b468a7fd382b..bc6fb68b8b1a28ac8fee2539aed93297ecaf9b26 100644 (file)
--- a/src/Logger/SALOME_Logger_Server.hxx
+++ b/src/Logger/SALOME_Logger_Server.hxx
@@ -53,7 +53,7 @@
 
 namespace KERNEL
 {
-  SALOME_Logger::Logger_ptr getLoggerServantSA();
+  LOGGER_EXPORT SALOME_Logger::Logger_ptr getLoggerServantSA();
 }
 
 class LOGGER_EXPORT Logger :

diff --git a/src/NamingService/SALOME_NamingService_Abstract.hxx b/src/NamingService/SALOME_NamingService_Abstract.hxx
index 7c50c172141f7a807cbe098ab3ee0cfb6e18844d..dcaf1fcb9e77c832962c06ac70a22f200b01428f 100644 (file)
--- a/src/NamingService/SALOME_NamingService_Abstract.hxx
+++ b/src/NamingService/SALOME_NamingService_Abstract.hxx
@@ -61,7 +61,7 @@ public:
   static std::string BuildComponentName(const char* hostname, const char* containerName, const char* componentName, const int nbproc);
 };
 
-class SALOME_NamingService_Abstract_Decorator : public SALOME_NamingService_Abstract
+class NAMINGSERVICE_EXPORT SALOME_NamingService_Abstract_Decorator : public SALOME_NamingService_Abstract
 {
 public:
   SALOME_NamingService_Abstract_Decorator(SALOME_NamingService_Container_Abstract *ns_cont):_ns_cont(ns_cont) { }

diff --git a/src/SALOMETraceCollector/CMakeLists.txt b/src/SALOMETraceCollector/CMakeLists.txt
index 4ce179f9ab1f131f05e7f486983fab4fdc4a0cb4..b6bfd678be1df85cc85406156a44020656403a98 100644 (file)
--- a/src/SALOMETraceCollector/CMakeLists.txt
+++ b/src/SALOMETraceCollector/CMakeLists.txt
@@ -33,7 +33,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PTHREAD_DEFINITIONS})
 ADD_LIBRARY(with_loggerTraceCollector SALOMETraceCollector.cxx TraceCollector_WaitForServerReadiness.cxx)
 
-TARGET_LINK_LIBRARIES(with_loggerTraceCollector ArgvKeeper SALOMELocalTrace OpUtil SalomeIDLKernel ${OMNIORB_LIBRARIES} ${PTHREAD_LIBRARIES})
+TARGET_LINK_LIBRARIES(with_loggerTraceCollector SalomeNS ArgvKeeper SALOMELocalTrace OpUtil SalomeIDLKernel ${OMNIORB_LIBRARIES} ${PTHREAD_LIBRARIES})
 INSTALL(TARGETS with_loggerTraceCollector EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")