FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Fix builds with case sensitive includes
This commit is contained in:
OpenSceneGraph git repository 2018-10-10 18:26:03 +01:00 committed by GitHub
commit 83e51f1ab4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osghangglide/hat.cpp
View File

@ -17,7 +17,7 @@
*/ */
#ifdef _MSC_VER #ifdef _MSC_VER
#include <Windows.h> #include <windows.h>
#pragma warning( disable : 4244 ) #pragma warning( disable : 4244 )
#endif #endif

2
src/osgPlugins/ZeroConfDevice/CMakeLists.txt
View File

@ -19,7 +19,7 @@ IF(WIN32)
mdns_win/dns_sd.h mdns_win/dns_sd.h
mdns_win/dns-sd.c 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) SET(TARGET_LIBRARIES_VARS ZEROCONF_LIBRARY)
ADD_DEFINITIONS(-DNOT_HAVE_GETOPT) ADD_DEFINITIONS(-DNOT_HAVE_GETOPT)
ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF) ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF)

4
src/osgPlugins/ply/typedefs.h
View File

@ -13,8 +13,8 @@
#define MESH_TYPEDEFS_H #define MESH_TYPEDEFS_H
# if defined(_MSC_VER) # if defined(_MSC_VER)
# include <Winsock2.h> # include <winsock2.h>
# include <Windows.h> # include <windows.h>
# endif # endif
# include <osg/Notify> # include <osg/Notify>

2
src/osgPlugins/vrml/CMakeLists.txt
View File

@ -27,7 +27,7 @@ IF (WIN32)
PNG_LIBRARY PNG_LIBRARY
ZLIB_LIBRARIES) ZLIB_LIBRARIES)
SET(TARGET_EXTERNAL_LIBRARIES SET(TARGET_EXTERNAL_LIBRARIES
Ws2_32.lib) ws2_32.lib)
ELSE() ELSE()
SET(TARGET_LIBRARIES_VARS SET(TARGET_LIBRARIES_VARS
OPENVRML_LIBRARY) OPENVRML_LIBRARY)