From f893dc5ad14d8dd5c4dd55060cd63e6361b1ff13 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 23 Oct 2015 15:04:13 +0000 Subject: [PATCH] From Alberto Luaces, "here are two minimal capitalization fixes for mingw cross-compilation, where case sensitivity matters." git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15169 16af8721-9629-0410-8352-f15c8da7e697 --- src/osg/DisplaySettings.cpp | 2 +- src/osgPlugins/osc/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp index 8ebae0d3f..8731c10b9 100644 --- a/src/osg/DisplaySettings.cpp +++ b/src/osg/DisplaySettings.cpp @@ -24,7 +24,7 @@ using namespace osg; using namespace std; #if defined(WIN32) && !defined(__CYGWIN__) -#include +#include extern "C" { OSG_EXPORT DWORD NvOptimusEnablement=0x00000001; } #else extern "C" { int NvOptimusEnablement=0x00000001; } diff --git a/src/osgPlugins/osc/CMakeLists.txt b/src/osgPlugins/osc/CMakeLists.txt index 6bf61277c..0529e17e5 100644 --- a/src/osgPlugins/osc/CMakeLists.txt +++ b/src/osgPlugins/osc/CMakeLists.txt @@ -35,7 +35,7 @@ if(WIN32 AND NOT ANDROID) ip/win32/NetworkingUtils.cpp ip/win32/UdpSocket.cpp ) - SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm") + SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm") ELSE() SET(TARGET_SRC ${TARGET_SRC}