From a270a7635e1366f449439678056b597743bf6b56 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 19 Jul 2013 06:39:06 +0000 Subject: [PATCH] From Wang Rui, "A very small clerical error in the src/osgViewer/CMakeLists.txt makes MinGW/Cygwin builds fail. Now it is fixed and now OSG works well again with Cygwin. :-) The OSC plugin also needs a small fix to compile with Cygwin, as attached file src/osgPlugins/osc/osc/OscHostEndianness.h shows." --- src/osgPlugins/osc/osc/OscHostEndianness.h | 2 +- src/osgViewer/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgPlugins/osc/osc/OscHostEndianness.h b/src/osgPlugins/osc/osc/OscHostEndianness.h index 569e025d3..ca52b930f 100644 --- a/src/osgPlugins/osc/osc/OscHostEndianness.h +++ b/src/osgPlugins/osc/osc/OscHostEndianness.h @@ -51,7 +51,7 @@ #else - #if defined(__GLIBC__) || defined(__ANDROID__) + #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) #include #if (__BYTE_ORDER == __LITTLE_ENDIAN) #define __LITTLE_ENDIAN__ diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt index a5587c13c..4f09e8822 100644 --- a/src/osgViewer/CMakeLists.txt +++ b/src/osgViewer/CMakeLists.txt @@ -259,7 +259,7 @@ SET(TARGET_LIBRARIES SET(TARGET_EXTERNAL_LIBRARIES ${LIB_EXTRA_LIBS}) IF(MINGW OR CYGWIN) - SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARY} gdi32 ) + SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} gdi32 ) ENDIF() SETUP_LIBRARY(${LIB_NAME})