From 1f50f23f86ba62cbce3dea2bc3cb1a42198ec4f6 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 22 Nov 2012 11:55:38 +0000 Subject: [PATCH] Simplified CMakeLists and adjusted OscHostEndianness to automatically detect the endian at compile time --- src/osgPlugins/osc/CMakeLists.txt | 8 -------- src/osgPlugins/osc/osc/OscHostEndianness.h | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/osgPlugins/osc/CMakeLists.txt b/src/osgPlugins/osc/CMakeLists.txt index c313424e1..133eabe2f 100755 --- a/src/osgPlugins/osc/CMakeLists.txt +++ b/src/osgPlugins/osc/CMakeLists.txt @@ -1,13 +1,5 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}) -INCLUDE(TestBigEndian) -TEST_BIG_ENDIAN(WORDS_BIGENDIAN) -IF (WORDS_BIGENDIAN) - ADD_DEFINITIONS("-DOSC_HOST_BIG_ENDIAN") -ELSE (WORDS_BIGENDIAN) - ADD_DEFINITIONS("-DOSC_HOST_LITTLE_ENDIAN") -ENDIF (WORDS_BIGENDIAN) - SET(TARGET_SRC ip/IpEndpointName.cpp osc/OscOutboundPacketStream.cpp diff --git a/src/osgPlugins/osc/osc/OscHostEndianness.h b/src/osgPlugins/osc/osc/OscHostEndianness.h index 8cbfa44a2..25bbfb644 100644 --- a/src/osgPlugins/osc/osc/OscHostEndianness.h +++ b/src/osgPlugins/osc/osc/OscHostEndianness.h @@ -49,7 +49,7 @@ #define OSC_HOST_LITTLE_ENDIAN 1 #undef OSC_HOST_BIG_ENDIAN -#elif defined(__APPLE__) +#else #if defined(__GLIBC__) #include