Skip to content
Browse files

From Valeriy Dubov, fix for Android build under OSX

  • Loading branch information...
1 parent 84b3b66 commit 931fae4899f1d7e12bff3c6ffe1c1860643543db Robert OSFIELD committed
Showing with 4 additions and 4 deletions.
  1. +1 −1 CMakeLists.txt
  2. +2 −2 src/osgDB/CMakeLists.txt
  3. +1 −1 src/osgViewer/CMakeLists.txt
View
2 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)
View
4 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})
View
2 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.")

0 comments on commit 931fae4

Please sign in to comment.
Something went wrong with that request. Please try again.