Merge pull request #640 from tehnick/fix-build-with-case-sensitive-includes

Fix builds with case sensitive includes
2018-10-10 18:26:03 +01:00 · 2018-10-10 18:26:03 +01:00 · 83e51f1ab4
commit 83e51f1ab4
parent 81998b0e65 dbb00f6581
4 changed files with 5 additions and 5 deletions
--- a/examples/osghangglide/hat.cpp
+++ b/examples/osghangglide/hat.cpp
@ -17,7 +17,7 @@
 */

 #ifdef _MSC_VER
-#include <Windows.h>
+#include <windows.h>
 #pragma warning( disable : 4244 )
 #endif

--- a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
+++ b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt
@ -19,7 +19,7 @@ IF(WIN32)
        mdns_win/dns_sd.h
        mdns_win/dns-sd.c
    )
-    SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm")
+    SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm")
    SET(TARGET_LIBRARIES_VARS ZEROCONF_LIBRARY)
    ADD_DEFINITIONS(-DNOT_HAVE_GETOPT)
    ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF)
--- a/src/osgPlugins/ply/typedefs.h
+++ b/src/osgPlugins/ply/typedefs.h
@ -13,8 +13,8 @@
 #define MESH_TYPEDEFS_H

 #   if defined(_MSC_VER)
-#      include <Winsock2.h>
-#      include <Windows.h>
+#      include <winsock2.h>
+#      include <windows.h>
 #   endif

 #   include <osg/Notify>
--- a/src/osgPlugins/vrml/CMakeLists.txt
+++ b/src/osgPlugins/vrml/CMakeLists.txt
@ -27,7 +27,7 @@ IF (WIN32)
        PNG_LIBRARY
        ZLIB_LIBRARIES)
    SET(TARGET_EXTERNAL_LIBRARIES
-        Ws2_32.lib)
+        ws2_32.lib)
 ELSE()
    SET(TARGET_LIBRARIES_VARS
        OPENVRML_LIBRARY)