From 2daff5686003883eabe05972df5b8c0b28dcffa6 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 21 May 2013 10:22:54 +0000 Subject: [PATCH] From Valeriy Dubov, fix for Android build under OSX --- CMakeLists.txt | 2 +- src/osgDB/CMakeLists.txt | 4 ++-- src/osgViewer/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33c27e1b4..41a8aa646 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -820,7 +820,7 @@ IF (BUILD_OSG_EXAMPLES) ENDIF() -IF(APPLE) +IF(APPLE AND NOT ANDROID) #Here we check if the user specified IPhone SDK IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR) diff --git a/src/osgDB/CMakeLists.txt b/src/osgDB/CMakeLists.txt index db49b50bc..01a1fbf12 100644 --- a/src/osgDB/CMakeLists.txt +++ b/src/osgDB/CMakeLists.txt @@ -32,7 +32,7 @@ ELSE () ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC) ENDIF() -IF (APPLE) +IF(APPLE AND NOT ANDROID) IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR) # compile FileUtils.cpp as objective-c++ SET_SOURCE_FILES_PROPERTIES(FileUtils.cpp @@ -121,7 +121,7 @@ SET(TARGET_SRC ${OPENSCENEGRAPH_VERSIONINFO_RC} ) -IF(APPLE) +IF(APPLE AND NOT ANDROID) IF(NOT OSG_BUILD_PLATFORM_IPHONE AND NOT OSG_BUILD_PLATFORM_IPHONE_SIMULATOR) # Needs CoreFoundation calls and a Carbon function SET(OSGDB_PLATFORM_SPECIFIC_LIBRARIES ${CARBON_LIBRARY}) diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt index c1bcac983..a5587c13c 100644 --- a/src/osgViewer/CMakeLists.txt +++ b/src/osgViewer/CMakeLists.txt @@ -69,7 +69,7 @@ IF(WIN32 AND NOT ANDROID) PixelBufferWin32.cpp ) ELSE() - IF(APPLE) + IF(APPLE AND NOT ANDROID) IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR) SET(OSG_WINDOWING_SYSTEM "IOS" CACHE STRING "Windowing system type for graphics window creation, options only IOS.")