diff --git a/CMakeLists.txt b/CMakeLists.txt index a8e24d4..cb88be7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,14 +32,19 @@ if (APPLE) SET(SDKROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk) # force disable Qt and Jasper, and ensure an SDKROOT is set, or # osgViewer system detection goes wrongh - SET(OSG_CMAKE_ARGS -DCMAKE_OSX_SYSROOT=${SDKROOT} -DOSG_USE_QT=0 -DJASPER_LIBRARY= -DCMAKE_OSX_ARCHITECTURES=x86_64) + SET(OSG_CMAKE_ARGS -DCMAKE_OSX_SYSROOT=${SDKROOT} + -DOSG_USE_QT=0 + -DJASPER_LIBRARY= + -DCMAKE_OSX_ARCHITECTURES=x86_64 + -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 + ) # OSG with some patches applied for Mac # SET(OSG_SOURCE GIT_REPOSITORY git://gitorious.org/+flightgear-developers/openscenegraph/mac-release-osg.git) - SET(OSG_SOURCE SVN_REPOSITORY http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.1.4) + SET(OSG_SOURCE URL http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.1.4.zip) else() # normal OSG - SET(OSG_SOURCE SVN_REPOSITORY http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.1.4) + SET(OSG_SOURCE URL http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.1.4.zip) endif() if (WIN32) diff --git a/simgear b/simgear index a530712..06bfa4f 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit a53071249171facbbfd0a1840155248f2175dc3c +Subproject commit 06bfa4f1a1ef13ce8e52b8b610fa05786ecbe5a6