From 462067c5d924bd51123d80d70c04003f3d17a6cd Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 11 Apr 2008 10:30:00 +0000 Subject: [PATCH] From Benoit Laniel, "I use mingw to cross-compile openscenegraph to win32. However, linux filesystem is case-sensitive. Here are the modifications needed to make the compiler happy. These are only some include lines rewritten (Io.h to io.h, Windows.h to windows.h etc.) for version 2.3.7." --- src/osgDB/DynamicLibrary.cpp | 6 +++--- src/osgDB/FileUtils.cpp | 6 +++--- src/osgPlugins/cfg/CameraConfig.cpp | 6 +++--- src/osgPlugins/net/sockstream.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/osgDB/DynamicLibrary.cpp b/src/osgDB/DynamicLibrary.cpp index decde808b..cfc264767 100644 --- a/src/osgDB/DynamicLibrary.cpp +++ b/src/osgDB/DynamicLibrary.cpp @@ -20,9 +20,9 @@ #endif #if defined(WIN32) && !defined(__CYGWIN__) -#include -#include -#include +#include +#include +#include #elif defined(__APPLE__) && defined(APPLE_PRE_10_3) #include #else // all other unix diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp index 7fb17061c..526f784cb 100644 --- a/src/osgDB/FileUtils.cpp +++ b/src/osgDB/FileUtils.cpp @@ -16,9 +16,9 @@ // for now, the above include is commented out, and the below code takes precedence. #if defined(WIN32) && !defined(__CYGWIN__) - #include - #include - #include + #include + #include + #include #include #include #include // for _mkdir diff --git a/src/osgPlugins/cfg/CameraConfig.cpp b/src/osgPlugins/cfg/CameraConfig.cpp index 39718a59a..58a54bc7b 100644 --- a/src/osgPlugins/cfg/CameraConfig.cpp +++ b/src/osgPlugins/cfg/CameraConfig.cpp @@ -16,9 +16,9 @@ #include #if defined(WIN32) && !defined(__CYGWIN__) - #include - #include - #include + #include + #include + #include // set up for windows so acts just like unix access(). #define F_OK 4 #else // unix diff --git a/src/osgPlugins/net/sockstream.h b/src/osgPlugins/net/sockstream.h index 9a2e7a168..846b62624 100644 --- a/src/osgPlugins/net/sockstream.h +++ b/src/osgPlugins/net/sockstream.h @@ -48,7 +48,7 @@ # define SOCKET_ERROR -1 #else # include -# include +# include //# include #ifdef _MSC_VER # pragma comment(lib, "Wininet")