0030091: Patch needed to allow cross-compilation from linux (case sensitive filesyste...

Names of Windows header files are corrected to be lower case to match their actual names on Windows (except Windows.h) and MinGW.
Files COMMANDWINDOW.h and MAINWINDOW.h in Draw package are renamed to CamelCase according to names of corresponding CXX files.

diff --git a/adm/cmake/occt_csf.cmake b/adm/cmake/occt_csf.cmake
index 272fb9fdd6d77966f0aa8bfcf24996216c27b837..ec05ffc76a899704b8244b0db87377f78b70e255 100644 (file)
--- a/adm/cmake/occt_csf.cmake
+++ b/adm/cmake/occt_csf.cmake
@@ -63,7 +63,7 @@ if (WIN32)
   set (CSF_gdi32         "gdi32.lib")
   set (CSF_user32        "user32.lib")
   set (CSF_wsock32       "wsock32.lib")
-  set (CSF_psapi         "Psapi.lib")
+  set (CSF_psapi         "psapi.lib")
   set (CSF_d3d9          "D3D9.lib")
   if ("${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore" OR USE_GLES2)
     set (CSF_OpenGlLibs  "libEGL libGLESv2")

diff --git a/src/Draw/COMMANDWINDOW.h b/src/Draw/COMMANDWINDOW.h
deleted file mode 100644 (file)
index 01304f3..0000000
--- a/src/Draw/COMMANDWINDOW.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- Copyright (c) 1998-1999 Matra Datavision
- Copyright (c) 1999-2014 OPEN CASCADE SAS
-
- This file is part of Open CASCADE Technology software library.
-
- This library is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License version 2.1 as published
- by the Free Software Foundation, with special exception defined in the file
- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
- distribution for complete text of the license and disclaimer of any warranty.
-
- Alternatively, this file may be used under the terms of Open CASCADE
- commercial license or contractual agreement.
-*/
-
-#ifdef _WIN32
-
-
-#define COMMANDCLASS L"COMMANDWINDOW"
-#define COMMANDTITLE L"Command Window"
-
-
-HWND CreateCommandWindow(HWND, int);
-LRESULT APIENTRY CommandProc(HWND, UINT, WPARAM, LPARAM);
-BOOL CommandCreateProc(HWND);
-VOID CommandDestroyProc(HWND);
-BOOL CommandHandler(HWND, WPARAM, LPARAM);
-
-
-#include <sys/stat.h>
-#include <tcl.h>
-#include <Standard_Stream.hxx>
-#include <stdio.h>
-//#include <io.h>
-#include <fcntl.h>
-
-
-
-#endif

diff --git a/src/Draw/CommandWindow.cxx b/src/Draw/CommandWindow.cxx
index e7bf9065351a01475ea8604b9bb7477f7bc0a126..5e9909dd5a5d93a539b098d616d4af850aee624c 100644 (file)
--- a/src/Draw/CommandWindow.cxx
+++ b/src/Draw/CommandWindow.cxx
@@ -17,9 +17,9 @@
 #ifdef _WIN32
 #include <windows.h>
 
-#include <CommandWindow.h>
+#include <COMMANDWINDOW.h>
 #include <Draw_Window.hxx>
-#include <MainWindow.h>
+#include <MAINWINDOW.h>
 #include <Draw_Appli.hxx>
 #include <TCollection_AsciiString.hxx>
 

diff --git a/src/Draw/CommandWindow.h b/src/Draw/CommandWindow.h
new file mode 100644 (file)
index 0000000..01304f3
--- /dev/null
+++ b/src/Draw/CommandWindow.h
@@ -0,0 +1,40 @@
+/*
+ Copyright (c) 1998-1999 Matra Datavision
+ Copyright (c) 1999-2014 OPEN CASCADE SAS
+
+ This file is part of Open CASCADE Technology software library.
+
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License version 2.1 as published
+ by the Free Software Foundation, with special exception defined in the file
+ OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+ distribution for complete text of the license and disclaimer of any warranty.
+
+ Alternatively, this file may be used under the terms of Open CASCADE
+ commercial license or contractual agreement.
+*/
+
+#ifdef _WIN32
+
+
+#define COMMANDCLASS L"COMMANDWINDOW"
+#define COMMANDTITLE L"Command Window"
+
+
+HWND CreateCommandWindow(HWND, int);
+LRESULT APIENTRY CommandProc(HWND, UINT, WPARAM, LPARAM);
+BOOL CommandCreateProc(HWND);
+VOID CommandDestroyProc(HWND);
+BOOL CommandHandler(HWND, WPARAM, LPARAM);
+
+
+#include <sys/stat.h>
+#include <tcl.h>
+#include <Standard_Stream.hxx>
+#include <stdio.h>
+//#include <io.h>
+#include <fcntl.h>
+
+
+
+#endif

diff --git a/src/Draw/FILES b/src/Draw/FILES
index b4eb578743b344ebdde431d8b7af8bac867ab656..c43b33613f43e599cdfcdedc133bb35de457df48 100755 (executable)
--- a/src/Draw/FILES
+++ b/src/Draw/FILES
@@ -1,5 +1,5 @@
 CommandWindow.cxx
-COMMANDWINDOW.h
+CommandWindow.h
 Draw.cxx
 Draw.hxx
 Draw_Appli.hxx
@@ -75,4 +75,4 @@ DrawRessource.h
 init.cxx
 init.h
 MainWindow.cxx
-MAINWINDOW.h
+MainWindow.h

diff --git a/src/Draw/MAINWINDOW.h b/src/Draw/MAINWINDOW.h
deleted file mode 100644 (file)
index db092a7..0000000
--- a/src/Draw/MAINWINDOW.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- Copyright (c) 1998-1999 Matra Datavision
- Copyright (c) 1999-2014 OPEN CASCADE SAS
-
- This file is part of Open CASCADE Technology software library.
-
- This library is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License version 2.1 as published
- by the Free Software Foundation, with special exception defined in the file
- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
- distribution for complete text of the license and disclaimer of any warranty.
-
- Alternatively, this file may be used under the terms of Open CASCADE
- commercial license or contractual agreement.
-*/
-
-/****************************************************\
-*/ 
-/**  MainWindow.h
-*/ 
-/*\****************************************************/ 
-#ifdef _WIN32
-
-#define CLIENTWND 0
-
-/*
-** PROCEDURES DE MAIN WINDOW
-*/
-#include <Windows.h>
-
-LRESULT APIENTRY WndProc(HWND, UINT, WPARAM, LPARAM);
-BOOL CreateProc(HWND);
-VOID DestroyProc(HWND);
-LRESULT APIENTRY CmdProc(HWND, UINT, WPARAM, LPARAM);
-
-
-#endif

diff --git a/src/Draw/MainWindow.h b/src/Draw/MainWindow.h
new file mode 100644 (file)
index 0000000..6957cd2
--- /dev/null
+++ b/src/Draw/MainWindow.h
@@ -0,0 +1,37 @@
+/*
+ Copyright (c) 1998-1999 Matra Datavision
+ Copyright (c) 1999-2014 OPEN CASCADE SAS
+
+ This file is part of Open CASCADE Technology software library.
+
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License version 2.1 as published
+ by the Free Software Foundation, with special exception defined in the file
+ OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+ distribution for complete text of the license and disclaimer of any warranty.
+
+ Alternatively, this file may be used under the terms of Open CASCADE
+ commercial license or contractual agreement.
+*/
+
+/****************************************************\
+*/ 
+/**  MainWindow.h
+*/ 
+/*\****************************************************/ 
+#ifdef _WIN32
+
+#define CLIENTWND 0
+
+/*
+** PROCEDURES DE MAIN WINDOW
+*/
+#include <windows.h>
+
+LRESULT APIENTRY WndProc(HWND, UINT, WPARAM, LPARAM);
+BOOL CreateProc(HWND);
+VOID DestroyProc(HWND);
+LRESULT APIENTRY CmdProc(HWND, UINT, WPARAM, LPARAM);
+
+
+#endif

diff --git a/src/OSD/OSD.cxx b/src/OSD/OSD.cxx
index 38a28e6c282fe18c2e84063aec750cdfab74128f..b8c975744cb40354bf32a9c7744ae40b8c0a2126 100644 (file)
--- a/src/OSD/OSD.cxx
+++ b/src/OSD/OSD.cxx
@@ -61,7 +61,7 @@ Standard_Boolean OSD::CStringToReal(const Standard_CString aString,
 //=======================================================================
 
 #ifdef _WIN32
-# include <Windows.h>
+# include <windows.h>
 # define SLEEP(NSEC)                 Sleep(1000*(NSEC))
 #else
 #include <unistd.h>

diff --git a/src/OSD/OSD_Error.cxx b/src/OSD/OSD_Error.cxx
index 0be6517c95741504bc269ab4a7df948133cda0fc..89c1b35108d891c076dda29193b1bb88f4083634 100755 (executable)
--- a/src/OSD/OSD_Error.cxx
+++ b/src/OSD/OSD_Error.cxx
@@ -448,7 +448,7 @@ void OSD_Error::Perror() {
 #include <TCollection_ExtendedString.hxx>
 
 #include <windows.h>
-#include <Strsafe.h>
+#include <strsafe.h>
 
 typedef struct _error_table {
 

diff --git a/src/OSD/OSD_File.cxx b/src/OSD/OSD_File.cxx
index 43ef8a237054bf862dc34a3500b1d85c67855b80..4b759ed1471aec87823790095f3992b14876e9a2 100644 (file)
--- a/src/OSD/OSD_File.cxx
+++ b/src/OSD/OSD_File.cxx
@@ -34,7 +34,7 @@
   #include <stdio.h>
   #include <io.h>
 
-  #include <Strsafe.h>
+  #include <strsafe.h>
 
   #define ACE_HEADER_SIZE (sizeof(ACCESS_ALLOWED_ACE) - sizeof (DWORD))
 

diff --git a/src/OSD/OSD_FileNode.cxx b/src/OSD/OSD_FileNode.cxx
index 2ffcd5fe42e42f12feaac3bb7a627a63b5cf4b32..51555438080132598bdcd3192cdf05d469dc8a91 100644 (file)
--- a/src/OSD/OSD_FileNode.cxx
+++ b/src/OSD/OSD_FileNode.cxx
@@ -379,7 +379,7 @@ Standard_Integer OSD_FileNode::Error()const{
 # include <tchar.h>
 #endif  // _INC_TCHAR
 
-#include <Strsafe.h>
+#include <strsafe.h>
 
 #define TEST_RAISE( arg ) _test_raise (  fName, ( arg )  )
 #define RAISE( arg ) throw Standard_ProgramError (  ( arg )  )

diff --git a/src/OSD/OSD_MemInfo.cxx b/src/OSD/OSD_MemInfo.cxx
index 2d578d8bd43e3cd27670fa99cad45874887ef9a9..d5eda9ee262b9afea1952a331059e51c422fb252 100644 (file)
--- a/src/OSD/OSD_MemInfo.cxx
+++ b/src/OSD/OSD_MemInfo.cxx
@@ -18,7 +18,7 @@
   #include <winbase.h>
   #include <process.h>
   #include <malloc.h>
-  #include <Psapi.h>
+  #include <psapi.h>
   #ifdef _MSC_VER
     #pragma comment(lib, "Psapi.lib")
   #endif

diff --git a/src/OSD/OSD_Process.cxx b/src/OSD/OSD_Process.cxx
index 8742261465e2e65abb625d8b66e096797664012c..47178c97088f4912756835090c45b0632285762c 100644 (file)
--- a/src/OSD/OSD_Process.cxx
+++ b/src/OSD/OSD_Process.cxx
@@ -182,7 +182,7 @@ Standard_Integer OSD_Process::Error()const{
 #include <TCollection_ExtendedString.hxx>
 
 #include <OSD_WNT.hxx>
-#include <LMCONS.H> // for UNLEN - maximum user name length GetUserName()
+#include <lmcons.h> // for UNLEN - maximum user name length GetUserName()
 
 void _osd_wnt_set_error ( OSD_Error&, OSD_WhoAmI, ... );
 

diff --git a/src/OSD/OSD_WNT.cxx b/src/OSD/OSD_WNT.cxx
index 8bc78152e94d7973c4524f2107849a64cd4761f8..ef38d808fad82c5dc72aa32a075d1b0ec978d102 100644 (file)
--- a/src/OSD/OSD_WNT.cxx
+++ b/src/OSD/OSD_WNT.cxx
@@ -23,7 +23,7 @@
 /***/
 #include <OSD_WNT.hxx>
 
-#include <Strsafe.h>
+#include <strsafe.h>
 #include <wchar.h>
 #include <stdlib.h>
 

diff --git a/src/OSD/OSD_signal.cxx b/src/OSD/OSD_signal.cxx
index 06b6394039847b1bbc5c8927c61acc3b84070877..79031e62877eef3a4776efb47cb8e4b36f703afb 100644 (file)
--- a/src/OSD/OSD_signal.cxx
+++ b/src/OSD/OSD_signal.cxx
@@ -39,7 +39,7 @@ Standard_Boolean OSD::ToCatchFloatingSignals()
 #endif
 #include <windows.h>
 
-#include <Strsafe.h>
+#include <strsafe.h>
 
 #ifndef STATUS_FLOAT_MULTIPLE_FAULTS
   // <ntstatus.h>

diff --git a/src/Standard/Standard_MMgrOpt.cxx b/src/Standard/Standard_MMgrOpt.cxx
index b75854a308bd242175efc8a31b569300731489af..81889b4b26807a2609b264da4fe2acba43aa74c6 100644 (file)
--- a/src/Standard/Standard_MMgrOpt.cxx
+++ b/src/Standard/Standard_MMgrOpt.cxx
@@ -35,7 +35,7 @@ extern "C" int getpagesize() ;
 #endif
 
 #ifdef _WIN32
-#include <Strsafe.h>
+#include <strsafe.h>
 #endif
 //======================================================================
 // Assumptions