Compilation on Windows

diff --git a/Demo/CMakeLists.txt b/Demo/CMakeLists.txt
index 2e507d4565cd2c7c7aa5379825ff85300030f0c7..abce129eee3d886b48424fe352de2bfc2bd22020 100644 (file)
--- a/Demo/CMakeLists.txt
+++ b/Demo/CMakeLists.txt
@@ -27,9 +27,9 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
   )
 
-IF(WINDOWS)
+IF(WIN32)
   ADD_DEFINITIONS(-DNOGDI)
-ENDIF(WINDOWS)
+ENDIF(WIN32)
 
 SET(echo_IDLSOURCES
   echo.idl

diff --git a/adm/cmake/FindExpat.cmake b/adm/cmake/FindExpat.cmake
index 253656b069843c1ea1d629463ae44a75ba889686..ffad267b649a082b6f5fafdfbad939a2121f2ef9 100644 (file)
--- a/adm/cmake/FindExpat.cmake
+++ b/adm/cmake/FindExpat.cmake
@@ -17,7 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-FIND_LIBRARY(EXPAT_LIBRARIES expat libexpat)
+FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat)
+
 FIND_PATH(EXPAT_INCLUDE_DIR expat.h)
 
 # Handle the standard arguments of the find_package() command:

diff --git a/adm/cmake/FindGraphviz.cmake b/adm/cmake/FindGraphviz.cmake
index 6eb1e5a71767dde06bb1fcac0053cc285629a88f..d9647e88ce6ef42b9da53a373b1ecd3f7519cb7b 100644 (file)
--- a/adm/cmake/FindGraphviz.cmake
+++ b/adm/cmake/FindGraphviz.cmake
@@ -35,14 +35,14 @@ FIND_PATH(GRAPHVIZ_INCLUDE_DIR NAMES graphviz/graph.h)
 SET(GRAPHVIZ_INCLUDE_DIRS ${GRAPHVIZ_INCLUDE_DIR} ${GRAPHVIZ_INCLUDE_DIR}/graphviz)
 
 FIND_LIBRARY(GRAPHVIZ_cdt_LIBRARY      NAMES cdt PATH_SUFFIXES bin)
-FIND_LIBRARY(GRAPHVIZ_cgraph_LIBRARY   NAMES cgraph PATH_SUFFIXES bin)
+#FIND_LIBRARY(GRAPHVIZ_cgraph_LIBRARY   NAMES cgraph PATH_SUFFIXES bin)
 FIND_LIBRARY(GRAPHVIZ_graph_LIBRARY    NAMES graph PATH_SUFFIXES bin)
 FIND_LIBRARY(GRAPHVIZ_gvc_LIBRARY      NAMES gvc PATH_SUFFIXES bin)
 FIND_LIBRARY(GRAPHVIZ_pathplan_LIBRARY NAMES pathplan PATH_SUFFIXES bin)
 
 SET(GRAPHVIZ_LIBRARIES 
   ${GRAPHVIZ_cdt_LIBRARY}
-  ${GRAPHVIZ_cgraph_LIBRARY} 
+#  ${GRAPHVIZ_cgraph_LIBRARY} 
   ${GRAPHVIZ_graph_LIBRARY} 
   ${GRAPHVIZ_gvc_LIBRARY}
   ${GRAPHVIZ_pathplan_LIBRARY}

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index ccf13f73cb6d19337e6ceb4e62583ed7dc020229..f8eaf60775cf987685f5ea845927c3ba7ec49ec2 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -29,10 +29,9 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-IF(WINDOWS)
+IF(WIN32)
   ADD_DEFINITIONS(-DNOGDI)
-ENDIF(WINDOWS)
-
+ENDIF(WIN32)
 
 SET(SalomeIDLYACS_IDLSOURCES
   yacsgui.idl

diff --git a/src/bases/CMakeLists.txt b/src/bases/CMakeLists.txt
index 51e0f84806eb8508a506c10df8a17266a4762fea..be7801afedd50c0f063bef4de3d0f311216569da 100644 (file)
--- a/src/bases/CMakeLists.txt
+++ b/src/bases/CMakeLists.txt
@@ -32,6 +32,9 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   "-DYACS_PTHREAD"
   )
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
 
 # libraries to link to
 SET(_link_LIBRARIES
@@ -76,9 +79,18 @@ SET(YACSBases_SOURCES
   chrono.cxx
   )
 
+# --- type of library ---
+
+SET(TYPE)
+IF(WIN32)
+  SET(TYPE STATIC)
+ELSE(WIN32)
+  SET(TYPE SHARED)
+ENDIF(WIN32)
+
 # --- rules ---
 
-ADD_LIBRARY(YACSBases ${YACSBases_SOURCES})
+ADD_LIBRARY(YACSBases ${TYPE} ${YACSBases_SOURCES})
 TARGET_LINK_LIBRARIES(YACSBases ${_link_LIBRARIES})
 INSTALL(TARGETS YACSBases EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 

diff --git a/src/bases/DynLibLoader.cxx b/src/bases/DynLibLoader.cxx
index 9818da19b379d18e35799e01cff597c1aebb559e..00ff02dca2db23ae7ca67cb0ead62ff4843724df 100644 (file)
--- a/src/bases/DynLibLoader.cxx
+++ b/src/bases/DynLibLoader.cxx
@@ -20,7 +20,7 @@
 #include "DynLibLoader.hxx"
 
 #if defined(YACS_PTHREAD)
-#if defined(WNT)
+#if defined(WIN32)
 #include "DynLibLoaderWin.cxx"
 #else
 #include "DynLibLoaderGNU.cxx"

diff --git a/src/bases/DynLibLoader.hxx b/src/bases/DynLibLoader.hxx
index 74d9efb3a41535cb294ef54c836e232864cf9eb8..56067a17f477f900905c2a0dab5358df2da76513 100644 (file)
--- a/src/bases/DynLibLoader.hxx
+++ b/src/bases/DynLibLoader.hxx
@@ -40,7 +40,7 @@
 
 
 #if defined(YACS_PTHREAD)
-#if defined(WNT)
+#if defined(WIN32)
 #include "DynLibLoaderWin.hxx"
 #else
 #include "DynLibLoaderGNU.hxx"
@@ -50,7 +50,7 @@ namespace YACS
 {
   namespace BASES
   {
-#if defined(WNT)
+#if defined(WIN32)
     typedef DynLibLoaderWin DynLibLoader;
 #else
     typedef DynLibLoaderGNU DynLibLoader;

diff --git a/src/bases/ThreadPT.cxx b/src/bases/ThreadPT.cxx
index b5fd07cec145e7b5d1208949a7f8d49b3d7036ec..50f6e9a655ae5fd209d2bf8e8f1f4d7a9db2e80f 100644 (file)
--- a/src/bases/ThreadPT.cxx
+++ b/src/bases/ThreadPT.cxx
@@ -19,7 +19,7 @@
 
 #include "ThreadPT.hxx"
 #include "Exception.hxx"
-#ifdef WNT
+#ifdef WIN32
 #include <windows.h>
 #define usleep(A) Sleep(A/1000)
 #else

diff --git a/src/bases/YACSBasesExport.hxx b/src/bases/YACSBasesExport.hxx
index c8d911893c9f8ab8c4db1a17efaccdc238d3e507..bda6b44beffb77802fb95a50c3a8ba1375b49056 100644 (file)
--- a/src/bases/YACSBasesExport.hxx
+++ b/src/bases/YACSBasesExport.hxx
@@ -20,7 +20,7 @@
 #ifndef _YACSBASESEXPORT_HXX_
 #define _YACSBASESEXPORT_HXX_
 
-#ifdef WNT
+#ifdef WIN32
 // #  if defined YACSBases_EXPORTS
 // #    define YACSBASES_EXPORT __declspec( dllexport )
 // #  else

diff --git a/src/bases/YacsTrace.cxx b/src/bases/YacsTrace.cxx
index 8b84b625a2e3538c755ef7f5e4f7d0af76e37092..17048749e1ef7941bd1b459d3252bc9bb76ddf1f 100644 (file)
--- a/src/bases/YacsTrace.cxx
+++ b/src/bases/YacsTrace.cxx
@@ -22,7 +22,7 @@
 #include "YacsTrace.hxx"
 #include <cstdlib>
 
-#ifdef WNT
+#ifdef WIN32
 #include <process.h>
 #define getpid _getpid
 #else

diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
index 5b8fa5853579d17bc911046c03241130a8fbc664..2b21a64750450fbf9b8e823c4efa20eb94f1a3ab 100644 (file)
--- a/src/engine/CMakeLists.txt
+++ b/src/engine/CMakeLists.txt
@@ -33,6 +33,9 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(
   -DYACS_PTHREAD
   )
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
 
 # libraries to link to
 SET(_link_LIBRARIES

diff --git a/src/engine/Executor.cxx b/src/engine/Executor.cxx
index 2893dd3e960273dd2fd7f3a8e73f80cf1fef74e9..6415777d838f63d8567a42a3ad145c6aaf672949 100644 (file)
--- a/src/engine/Executor.cxx
+++ b/src/engine/Executor.cxx
@@ -38,7 +38,7 @@
 #include <cstdlib>
 #include <algorithm>
 
-#ifdef WNT
+#ifdef WIN32
 #define usleep(A) _sleep(A/1000)
 #if !defined(S_ISCHR) || !defined(S_ISREG)
 #  ifndef S_IFMT

diff --git a/src/engine/Plugin/aleas.cxx b/src/engine/Plugin/aleas.cxx
index c6cefb3ca3f59e38950bd8c3d2d3270972d68739..cbd5fd9ec6c82b7fe52e9be91efcc7929ecdacd3 100644 (file)
--- a/src/engine/Plugin/aleas.cxx
+++ b/src/engine/Plugin/aleas.cxx
@@ -19,7 +19,7 @@
 
 #include <time.h>
 #include <sys/types.h>
-#ifdef WNT
+#ifdef WIN32
 #else
 #include <unistd.h>
 #endif

diff --git a/src/engine/YACSlibEngineExport.hxx b/src/engine/YACSlibEngineExport.hxx
index bb7f9626b686de193a16fab6189b00c0976a0ec8..0248ccd90c9afae78095b3947ab3f2e8dd1ece4c 100644 (file)
--- a/src/engine/YACSlibEngineExport.hxx
+++ b/src/engine/YACSlibEngineExport.hxx
@@ -20,7 +20,7 @@
 #ifndef _YACSLIBENGINEEXPORT_HXX_
 #define _YACSLIBENGINEEXPORT_HXX_
 
-#ifdef WNT
+#ifdef WIN32
 #  if defined YACSlibEngine_EXPORTS
 #    define YACSLIBENGINE_EXPORT __declspec( dllexport )
 #  else
@@ -30,7 +30,7 @@
 #  define YACSLIBENGINE_EXPORT
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4251) // Warning DLL Interface ...
 #pragma warning(disable:4290) // Warning Exception ...
 #endif

diff --git a/src/engine_swig/CMakeLists.txt b/src/engine_swig/CMakeLists.txt
index c6a79766fd07073ba9bcf4eb4bf50dc2bc9ec2e7..25264b77507839c84af3b5989fe7d3a7a2fe1c19 100644 (file)
--- a/src/engine_swig/CMakeLists.txt
+++ b/src/engine_swig/CMakeLists.txt
@@ -21,6 +21,12 @@ INCLUDE(${SWIG_USE_FILE})
 
 # --- options ---
 
+IF(WIN32)                                       # if platform is Windows 64 bit 
+  IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")          
+    ADD_DEFINITIONS(/bigobj)                    # to avoid error C1128
+  ENDIF()
+EINDIF()
+
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${PTHREAD_INCLUDE_DIR}
@@ -47,6 +53,9 @@ ADD_DEFINITIONS(
   ${OMNIORB_DEFINITIONS}
   -DYACS_PTHREAD
   )
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
 
 # libraries to link to
 SET(_link_LIBRARIES
@@ -158,10 +167,10 @@ ADD_DEPENDENCIES(_pypilot pypilot.i pilot.i engtypemaps.i _pilot ${SWIGINCLUDES}
 
 SWIG_LINK_LIBRARIES(pilot   "${_link_LIBRARIES}")
 SWIG_LINK_LIBRARIES(pypilot "${_link_LIBRARIES}")
-IF(WINDOWS)
+IF(WIN32)
   SET_TARGET_PROPERTIES(_pilot   PROPERTIES DEBUG_OUTPUT_NAME _pilot_d)
   SET_TARGET_PROPERTIES(_pypilot PROPERTIES DEBUG_OUTPUT_NAME _pypilot_d)
-ENDIF(WINDOWS)
+ENDIF(WIN32)
 
 INSTALL(TARGETS ${SWIG_MODULE_pilot_REAL_NAME} ${SWIG_MODULE_pypilot_REAL_NAME} DESTINATION ${SALOME_INSTALL_PYTHON})
 

diff --git a/src/genericgui/CMakeLists.txt b/src/genericgui/CMakeLists.txt
index 60578baa22020528a1a4aee9023e33a2e995ecf3..0d843eb99f59da0c54edf90731fd7ce7be281a75 100644 (file)
--- a/src/genericgui/CMakeLists.txt
+++ b/src/genericgui/CMakeLists.txt
@@ -53,6 +53,9 @@ ADD_DEFINITIONS(
   ${KERNEL_DEFINITIONS}
   ${GUI_DEFINITIONS}
   )
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
 
 # libraries to link to
 SET(_link_LIBRARIES

diff --git a/src/genericgui/GenericGui.cxx b/src/genericgui/GenericGui.cxx
index a6bbb20402dd7faa748121dd53d5a9d2e2938df7..2b49c3504aaddb6b48dd775f95fd777946c82a24 100644 (file)
--- a/src/genericgui/GenericGui.cxx
+++ b/src/genericgui/GenericGui.cxx
@@ -67,7 +67,7 @@
 
 #include <ctime>
 
-#ifdef WNT
+#ifdef WIN32
 #define WEXITSTATUS(w)  ((int) ((w) & 0x40000000))
 #endif
 
@@ -1369,7 +1369,7 @@ void GenericGui::onImportSupervSchema()
   QString tmpFileName;
   try
     {
-#ifdef WNT
+#ifdef WIN32
       QString tmpDir = getenv("TEMP");
          QString fileExt = "bat";
 #else
@@ -1615,7 +1615,7 @@ void GenericGui::onRunLoadedSchema(bool withState)
   QFileInfo fo = QtGuiContext::getQtCurrent()->getFileName();
   QString procName = fo.baseName();
   //QString tmpDir = SALOMEDS_Tool::GetTmpDir().c_str();
-#ifdef WNT
+#ifdef WIN32
   QString tmpDir = getenv("TEMP");
 #else
   QString tmpDir = "/tmp";

diff --git a/src/genericgui/GenericGuiExport.hxx b/src/genericgui/GenericGuiExport.hxx
index 4f75195f64865d57646e17cf0e7af2968938de07..7516af8fcbd2aed06f3e822546f025d0e30e17f8 100644 (file)
--- a/src/genericgui/GenericGuiExport.hxx
+++ b/src/genericgui/GenericGuiExport.hxx
@@ -20,7 +20,7 @@
 #ifndef _GENERICGUIEXPORT_HXX_
 #define _GENERICGUIEXPORT_HXX_
 
-#ifdef WNT
+#ifdef WIN32
 #  if defined GenericGui_EXPORTS
 #    define GENERICGUI_EXPORT __declspec( dllexport )
 #  else

diff --git a/src/genericgui/GuiExecutor.cxx b/src/genericgui/GuiExecutor.cxx
index e478851b800cce74b2341a4794250ae84b336802..0b857e80ffdc33262f0d5f96720c8ffbc70398d1 100644 (file)
--- a/src/genericgui/GuiExecutor.cxx
+++ b/src/genericgui/GuiExecutor.cxx
@@ -253,7 +253,7 @@ void GuiExecutor::setStopOnError(bool aMode)
   DEBTRACE("GuiExecutor::setStopOnError " << aMode);
   if (_isRunning)
     {
-#ifdef WNT
+#ifdef WIN32
       _procRef->setStopOnError(aMode, (getenv("TEMP") + string("\\dumpStateOnError_") + getenv("USER") + string(".xml")).c_str());
 #else
       _procRef->setStopOnError(aMode, (string("/tmp/dumpStateOnError_") + getenv("USER") + string(".xml")).c_str());

diff --git a/src/genericgui/SceneLinkItem.hxx b/src/genericgui/SceneLinkItem.hxx
index 428a113823c2d64fc5ce27483bfce8d541d5a569..e4ad678373f001c6267186c4025cffc20dd3a6c4 100644 (file)
--- a/src/genericgui/SceneLinkItem.hxx
+++ b/src/genericgui/SceneLinkItem.hxx
@@ -27,7 +27,7 @@
 #include <QPainterPath>
 #include <vector>
 
-#ifdef WNT
+#ifdef WIN32
 #ifdef _UP
 #undef _UP
 #endif

diff --git a/src/hmi/CMakeLists.txt b/src/hmi/CMakeLists.txt
index 0851f15ea9ee0239609dc08feeb80961376a2c9a..440cfb2ea59b1a648129cdcf01dcb4d36f2f92ac 100644 (file)
--- a/src/hmi/CMakeLists.txt
+++ b/src/hmi/CMakeLists.txt
@@ -43,6 +43,9 @@ ADD_DEFINITIONS(
   ${PYTHON_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   )
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
 
 # libraries to link to
 SET(_link_LIBRARIES

diff --git a/src/hmi/HMIExport.hxx b/src/hmi/HMIExport.hxx
index e3cbb9eba6e1d0a919dc67abe5acd19ba9972b16..1a40ee2cfcb25604bc412de5c0535387dc0f2087 100644 (file)
--- a/src/hmi/HMIExport.hxx
+++ b/src/hmi/HMIExport.hxx
@@ -20,7 +20,7 @@
 #ifndef _HMIEXPORT_HXX_
 #define _HMIEXPORT_HXX_
 
-#ifdef WNT
+#ifdef WIN32
 #  if defined HMI_EXPORTS
 #    define HMI_EXPORT __declspec( dllexport )
 #  else

diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt
index 788f5dc3da6667a987e4d2041b0ed0d95b6267ab..3946aac89b33c34e9ad47266aa61a5774b12795e 100644 (file)
--- a/src/runtime/CMakeLists.txt
+++ b/src/runtime/CMakeLists.txt
@@ -67,6 +67,9 @@ ADD_DEFINITIONS(
   ${PYTHON_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   )
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
 
 # libraries to link to
 SET(_link_LIBRARIES

diff --git a/src/runtime/CppContainer.cxx b/src/runtime/CppContainer.cxx
index f2183266dab6419c0339dd3bdf7af69a3e977dbd..eb374f01cabafa237f1c246fff42299f4a2c8161 100644 (file)
--- a/src/runtime/CppContainer.cxx
+++ b/src/runtime/CppContainer.cxx
@@ -19,7 +19,7 @@
 
 #include <iostream>
 #include <sstream>
-#ifdef WNT
+#ifdef WIN32
 #include <windows.h>
 #define dlopen LoadLibrary
 #define dlclose FreeLibrary
@@ -308,7 +308,7 @@ LocalLibrary  LocalContainer::loadComponentLibrary(const std::string & aCompName
         }
     }
   
-#ifndef WNT
+#ifndef WIN32
   std::string impl_name = std::string ("lib") + aCompName + std::string("Local.so");
   if(sprefix != "")
     impl_name = sprefix + std::string("/") + impl_name;
@@ -318,7 +318,7 @@ LocalLibrary  LocalContainer::loadComponentLibrary(const std::string & aCompName
 #endif
   DEBTRACE("impl_name = " << impl_name);
     
-#if defined( WNT )
+#if defined( WIN32 )
   HMODULE handle;
   handle = dlopen( impl_name.c_str() ) ;
 #else
@@ -327,11 +327,11 @@ LocalLibrary  LocalContainer::loadComponentLibrary(const std::string & aCompName
 #endif
 
   const char * sError;
-#if defined( WNT )
+#if defined( WIN32 )
   sError = "Not available here !";
 #endif
   
-#if defined( WNT )
+#if defined( WIN32 )
   if (!handle) 
 #else
   sError = dlerror();
@@ -348,7 +348,7 @@ LocalLibrary  LocalContainer::loadComponentLibrary(const std::string & aCompName
   void *ihandle, *rhandle, *phandle = NULL, *thandle = NULL;
       
   ihandle = dlsym(handle, "__init");
-#if defined( WNT )
+#if defined( WIN32 )
   if (!ihandle)
 #else
   if (sError = dlerror()) 
@@ -363,7 +363,7 @@ LocalLibrary  LocalContainer::loadComponentLibrary(const std::string & aCompName
     }
   
   rhandle = dlsym(handle, "__run");
-#if defined( WNT )
+#if defined( WIN32 )
   if (!rhandle)
 #else
   if (sError = dlerror()) 
@@ -378,7 +378,7 @@ LocalLibrary  LocalContainer::loadComponentLibrary(const std::string & aCompName
     }
       
   thandle = dlsym(handle, "__terminate");
-#if defined( WNT )
+#if defined( WIN32 )
   if (!thandle)
 #else
   if (sError = dlerror()) 

diff --git a/src/runtime/CppContainer.hxx b/src/runtime/CppContainer.hxx
index 142e30f52d63e8d59b196c29b32ee1d2d401079d..2710147140e1ca0a66455497432ef60a1b9db108 100644 (file)
--- a/src/runtime/CppContainer.hxx
+++ b/src/runtime/CppContainer.hxx
@@ -26,7 +26,7 @@
 #include "Container.hxx"
 #include "CppComponent.hxx"
 
-#ifdef WNT
+#ifdef WIN32
 #include <windows.h>
 #endif
 
@@ -37,7 +37,7 @@ namespace YACS
   
     struct LocalLibrary {
       
-#if defined( WNT )
+#if defined( WIN32 )
       HMODULE handle;
 #else
       void * handle;
@@ -48,7 +48,7 @@ namespace YACS
       PingFunction pingHandle;
       TerminateFunction terminateHandle;
       
-#if defined( WNT )
+#if defined( WIN32 )
       LocalLibrary(HMODULE h, InitFunction i, RunFunction r, 
 #else
       LocalLibrary(void *h, InitFunction i, RunFunction r, 

diff --git a/src/runtime/PythonNode.cxx b/src/runtime/PythonNode.cxx
index a53106ddc5ae8a4c8802b4f881f9f722887fee5d..3dea3eefdf0734bd119aba7591235fa0c38a06e3 100644 (file)
--- a/src/runtime/PythonNode.cxx
+++ b/src/runtime/PythonNode.cxx
@@ -30,7 +30,7 @@
 #include <sstream>
 #include <fstream>
 
-#ifdef WNT
+#ifdef WIN32
 #include <process.h>
 #define getpid _getpid
 #endif

diff --git a/src/runtime/SalomeContainer.cxx b/src/runtime/SalomeContainer.cxx
index 2d1583e2755407f0999fe7dd9bbf6b2eae9f97cb..849d3a6045156d37cc1e3a054c734dde473b5927 100644 (file)
--- a/src/runtime/SalomeContainer.cxx
+++ b/src/runtime/SalomeContainer.cxx
@@ -40,7 +40,7 @@
 #include <sstream>
 #include <iostream>
 
-#ifdef WNT
+#ifdef WIN32
 #include <process.h>
 #define getpid _getpid
 #endif

diff --git a/src/runtime/TypeConversions.cxx b/src/runtime/TypeConversions.cxx
index 9e6dddf98d86bb1369045ecfed3d38f41e715aff..c9b7ae208a17c3820a6ea2a538a127ec76998781 100644 (file)
--- a/src/runtime/TypeConversions.cxx
+++ b/src/runtime/TypeConversions.cxx
@@ -37,7 +37,7 @@
 #include <iostream>
 #include <sstream>
 
-#ifdef WNT
+#ifdef WIN32
 #include <fcntl.h>
 #define _S_IREAD 256
 #define _S_IWRITE 128

diff --git a/src/runtime/XMLNode.cxx b/src/runtime/XMLNode.cxx
index 9e18f4c8403c90a1513d239665a57ae98848044a..c3f15f58b390ddca9a12752cc5571914bbe965aa 100644 (file)
--- a/src/runtime/XMLNode.cxx
+++ b/src/runtime/XMLNode.cxx
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef WNT
+#ifdef WIN32
 #include <windows.h>
 #include <io.h>
 #define chmod _chmod
@@ -92,7 +92,7 @@ void XmlNode::execute()
   char dir[]="yacsXXXXXX";
   // add a lock around mkdtemp (seems not thread safe)
   MUTEX.lock();
-#ifdef WNT
+#ifdef WIN32
   char mdir [512+1];
   GetTempPath(MAX_PATH+1, mdir);
   CreateDirectory(mdir, NULL);

diff --git a/src/runtime/YACSRuntimeSALOMEExport.hxx b/src/runtime/YACSRuntimeSALOMEExport.hxx
index 4d1b32f7eccb9b3b8a14012ef7dbf3b4a1a74569..4b742dca04dd53c1d2cc42b1c21460e8ae92cd3f 100644 (file)
--- a/src/runtime/YACSRuntimeSALOMEExport.hxx
+++ b/src/runtime/YACSRuntimeSALOMEExport.hxx
@@ -20,7 +20,7 @@
 #ifndef _YACSRUNTIMESALOMEEXPORT_HXX_
 #define _YACSRUNTIMESALOMEEXPORT_HXX_
 
-#ifdef WNT
+#ifdef WIN32
 #  if defined YACSRuntimeSALOME_EXPORTS
 #    define YACSRUNTIMESALOME_EXPORT __declspec( dllexport )
 #  else

diff --git a/src/runtime_swig/CMakeLists.txt b/src/runtime_swig/CMakeLists.txt
index 57ab977ac9c06e075db01b72948f4c68e9c1c869..d16e18382b3145d65a58b619e4e6b3d2a6d5160b 100644 (file)
--- a/src/runtime_swig/CMakeLists.txt
+++ b/src/runtime_swig/CMakeLists.txt
@@ -40,6 +40,9 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/engine_swig
   ${PROJECT_SOURCE_DIR}/src/runtime
 )
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
 
 # swig flags
 SET_SOURCE_FILES_PROPERTIES(SALOMERuntime.i PROPERTIES 
@@ -98,9 +101,9 @@ ADD_DEPENDENCIES(_SALOMERuntime
                   ${SWIGINCLUDES})
 
 SWIG_LINK_LIBRARIES(SALOMERuntime ${_link_LIBRARIES})
-IF(WINDOWS)
+IF(WIN32)
   SET_TARGET_PROPERTIES(_SALOMERuntime PROPERTIES DEBUG_OUTPUT_NAME _SALOMERuntime_d)
-ENDIF(WINDOWS)
+ENDIF(WIN32)
 
 INSTALL(TARGETS ${SWIG_MODULE_SALOMERuntime_REAL_NAME} DESTINATION ${SALOME_INSTALL_PYTHON})
 

diff --git a/src/salomegui/CMakeLists.txt b/src/salomegui/CMakeLists.txt
index 16b1bcfdff86d9e8fe6ced1c5267ce1bce761e4c..6991dde61044915b5a2cee3c1c323ff50b8f1741 100644 (file)
--- a/src/salomegui/CMakeLists.txt
+++ b/src/salomegui/CMakeLists.txt
@@ -53,6 +53,9 @@ ADD_DEFINITIONS(
   ${QSCINTILLA_DEFINITIONS}
   ${GRAPHVIZ_DEFINITIONS}
   )
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
 
 # libraries to link to
 SET(_link_LIBRARIES

diff --git a/src/salomegui/YACSExport.hxx b/src/salomegui/YACSExport.hxx
index dfc2aa23a46f322ca8af64016418d88dbcc35194..1316195528381575fa2d96d0cb092e44a5d7e436 100644 (file)
--- a/src/salomegui/YACSExport.hxx
+++ b/src/salomegui/YACSExport.hxx
@@ -20,7 +20,7 @@
 #ifndef _YACSEXPORT_HXX_
 #define _YACSEXPORT_HXX_
 
-#ifdef WNT
+#ifdef WIN32
 #  if defined YACS_EXPORTS
 #    define YACS_EXPORT __declspec( dllexport )
 #  else

diff --git a/src/salomegui_swig/CMakeLists.txt b/src/salomegui_swig/CMakeLists.txt
index 3ee7b76dbbf2399b436dc1e5d26ff5b226f57c72..a0155133249fcdff5d44e48cd82f134eca420298 100644 (file)
--- a/src/salomegui_swig/CMakeLists.txt
+++ b/src/salomegui_swig/CMakeLists.txt
@@ -87,9 +87,9 @@ SWIG_ADD_MODULE(libYACS_Swig python libYACS_Swig.i YACSGUI_Swig.cxx)
 ADD_DEPENDENCIES(_libYACS_Swig libYACS_Swig.i doc.i YACSGUI_Swig.hxx)
 
 SWIG_LINK_LIBRARIES(libYACS_Swig "${_link_LIBRARIES}")
-IF(WINDOWS)
+IF(WIN32)
   SET_TARGET_PROPERTIES(_libYACS_Swig PROPERTIES DEBUG_OUTPUT_NAME _libYACS_Swig_d)
-ENDIF(WINDOWS)
+ENDIF(WIN32)
 
 INSTALL(TARGETS ${SWIG_MODULE_libYACS_Swig_REAL_NAME} DESTINATION ${SALOME_INSTALL_PYTHON})
 

diff --git a/src/salomewrap/SalomeWrapExport.hxx b/src/salomewrap/SalomeWrapExport.hxx
index 236a4289b35fe32561ab4b4a5f4c3f7004fbedc3..6bd11e38b951d72c4252c4599b99bfc6d03eedb3 100644 (file)
--- a/src/salomewrap/SalomeWrapExport.hxx
+++ b/src/salomewrap/SalomeWrapExport.hxx
@@ -20,7 +20,7 @@
 #ifndef _SALOMEWRAPEXPORT_HXX_
 #define _SALOMEWRAPEXPORT_HXX_
 
-#ifdef WNT
+#ifdef WIN32
 #  if defined SalomeWrap_EXPORTS
 #    define SALOMEWRAP_EXPORT __declspec( dllexport )
 #  else

diff --git a/src/yacsloader/CMakeLists.txt b/src/yacsloader/CMakeLists.txt
index 42d1f13c5d297a8a68ec0dd7d87899fbcddff0c7..2a1cd1b05796ff55d481deb33f812922b50fb21b 100644 (file)
--- a/src/yacsloader/CMakeLists.txt
+++ b/src/yacsloader/CMakeLists.txt
@@ -66,6 +66,9 @@ ADD_DEFINITIONS(
   ${PYTHON_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   )
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
 SET(_exec_DEFINITIONS
   -g
   )

diff --git a/src/yacsloader/Test/YacsLoaderTest.cxx b/src/yacsloader/Test/YacsLoaderTest.cxx
index 36b391ba2b2d37c1da49ae4bf0c48c35c7b74142..52b67b8c5e701c202d3d4cd88fcdf095c20b4929 100644 (file)
--- a/src/yacsloader/Test/YacsLoaderTest.cxx
+++ b/src/yacsloader/Test/YacsLoaderTest.cxx
@@ -31,7 +31,7 @@
 #include <iostream>
 #include <fstream>
 #include <stdlib.h>
-#ifdef WNT
+#ifdef WIN32
 #include <io.h>
 #define F_OK 0
 #define access _access

diff --git a/src/yacsloader/Test/echoSrv.cxx b/src/yacsloader/Test/echoSrv.cxx
index d83a9ab20fb8a373aec6b67f15c491df817e2764..57969ee0fb2e7f65ea99ec2a3014a518dcdb39fd 100644 (file)
--- a/src/yacsloader/Test/echoSrv.cxx
+++ b/src/yacsloader/Test/echoSrv.cxx
@@ -19,7 +19,7 @@
 
 #include <time.h>
 #include <pthread.h>
-#ifdef WNT
+#ifdef WIN32
 #include <windows.h>
 #define sleep _sleep
 #else

diff --git a/src/yacsloader/YACSloaderExport.hxx b/src/yacsloader/YACSloaderExport.hxx
index dd7705e0a7b2f1432da4bc3f4104f1483099d53e..a533202b776f01e883abf4dd57f6700651eb9b72 100644 (file)
--- a/src/yacsloader/YACSloaderExport.hxx
+++ b/src/yacsloader/YACSloaderExport.hxx
@@ -20,7 +20,7 @@
 #ifndef _YACSLOADEREXPORT_HXX_
 #define _YACSLOADEREXPORT_HXX_
 
-#ifdef WNT
+#ifdef WIN32
 #  if defined YACSloader_EXPORTS
 #    define YACSLOADER_EXPORT __declspec( dllexport )
 #  else

diff --git a/src/yacsloader/driver.cxx b/src/yacsloader/driver.cxx
index 0432d5e768980f40b575ba2974b7f37186cb9e99..146fdda9aeffd2fd01c75a70809bdd01d766d085 100644 (file)
--- a/src/yacsloader/driver.cxx
+++ b/src/yacsloader/driver.cxx
@@ -40,7 +40,7 @@
 #include <fstream>
 #include <signal.h>
 
-#ifdef WNT
+#ifdef WIN32
 #else
 #include <argp.h>
 #endif
@@ -57,7 +57,7 @@ const char *argp_program_bug_address ="<nepal@nepal.edf.fr>";
 static char doc[] ="driver -- a SALOME YACS graph executor";
 static char args_doc[] = "graph.xml";
 
-#ifdef WNT
+#ifdef WIN32
 #else
 static struct argp_option options[] =
   {
@@ -98,14 +98,14 @@ typedef struct {
   string lockFile;
 } thread_st;
 
-#ifdef WNT
+#ifdef WIN32
 static int
 #else
 static error_t
 #endif
 parse_opt (int key, char *arg, struct argp_state *state)
 {
-#ifdef WNT
+#ifdef WIN32
 #else
   // Get the input argument from argp_parse, which we
   // know is a pointer to our arguments structure. 
@@ -179,14 +179,14 @@ parse_opt (int key, char *arg, struct argp_state *state)
 }
 
 // Our argp parser.
-#ifdef WNT
+#ifdef WIN32
 #else
 static struct argp argp = { options, parse_opt, args_doc, doc };
 #endif
 
 void timer(std::string msg)
 {
-#ifdef WNT
+#ifdef WIN32
 #else
   struct timeval tv;
   gettimeofday(&tv,NULL);
@@ -289,7 +289,7 @@ int main (int argc, char* argv[])
   myArgs.killPort = 0;
 
   // Parse our arguments; every option seen by parse_opt will be reflected in arguments.
-#ifdef WNT
+#ifdef WIN32
 #else
   argp_parse (&argp, argc, argv, 0, 0, &myArgs);
   std::cerr << "graph = " << myArgs.args[0];
@@ -306,7 +306,7 @@ int main (int argc, char* argv[])
     std::cerr << std::endl;
 #endif
 
-#ifndef WNT
+#ifndef WIN32
   setsig(SIGINT,&Handler);
   setsig(SIGTERM,&Handler);
 #endif

diff --git a/src/yacsloader_swig/CMakeLists.txt b/src/yacsloader_swig/CMakeLists.txt
index 1b76fc332f6a45d071ac340968e3ddfd5cca36aa..13c542cb4f376214bf4998a7feda66801bb06f5a 100644 (file)
--- a/src/yacsloader_swig/CMakeLists.txt
+++ b/src/yacsloader_swig/CMakeLists.txt
@@ -50,6 +50,9 @@ ADD_DEFINITIONS(
   ${PYTHON_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   )
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
 
 # libraries to link to
 SET(_link_LIBRARIES
@@ -89,9 +92,9 @@ ADD_DEPENDENCIES(_loader
                   ${SWIGINCLUDES})
 
 SWIG_LINK_LIBRARIES(loader ${_link_LIBRARIES})
-IF(WINDOWS)
+IF(WIN32)
   SET_TARGET_PROPERTIES(_loader PROPERTIES DEBUG_OUTPUT_NAME _loader_d)
-ENDIF(WINDOWS)
+ENDIF(WIN32)
 
 INSTALL(TARGETS ${SWIG_MODULE_loader_REAL_NAME} DESTINATION ${SALOME_INSTALL_PYTHON})