diff --git a/QGCApplication.pro b/QGCApplication.pro
index 8198081cfdc1e3a7012c66c9dda3b087c059b031..8a60935341eb0425c056b4fda4dc86f55133f4a8 100644
--- a/QGCApplication.pro
+++ b/QGCApplication.pro
@@ -21,7 +21,12 @@ include(QGCCommon.pri)
TARGET = qgroundcontrol
TEMPLATE = app
-DESTDIR = $${OUT_PWD}/build
+
+DebugBuild {
+ DESTDIR = $${OUT_PWD}/debug
+} else {
+ DESTDIR = $${OUT_PWD}/release
+}
# Load additional config flags from user_config.pri
exists(user_config.pri):infile(user_config.pri, CONFIG) {
@@ -35,7 +40,7 @@ LinuxBuild {
# QGC QtLocation plugin (for ios, it's all compiled in with the rest.)
-!ios {
+!iOSBuild {
LIBS += -L$${LOCATION_PLUGIN_DESTDIR}
LIBS += -l$${LOCATION_PLUGIN_NAME}
}
@@ -78,18 +83,25 @@ QT += testlib
#
MacBuild {
- QMAKE_INFO_PLIST = Custom-Info.plist
- ICON = $${BASEDIR}/resources/icons/macx.icns
- OTHER_FILES += Custom-Info.plist
+ QMAKE_INFO_PLIST = Custom-Info.plist
+ ICON = $${BASEDIR}/resources/icons/macx.icns
+ OTHER_FILES += Custom-Info.plist
}
iOSBuild {
- QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist
- OTHER_FILES += $${BASEDIR}/ios/iOS-Info.plist
- BUNDLE.files = $$files($$PWD/ios/AppIcon*.png) $$PWD/ios/LaunchScreen.xib
+ BUNDLE.files = $$files($$PWD/ios/AppIcon*.png) $$PWD/ios/QGCLaunchScreen.xib
QMAKE_BUNDLE_DATA += BUNDLE
LIBS += -framework AVFoundation
OBJECTIVE_SOURCES += src/audio/QGCAudioWorker_iOS.mm
+ #-- Info.plist (need an "official" one for the App Store)
+ ForAppStore {
+ message(App Store Build)
+ QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOSForAppStore-Info.plist
+ OTHER_FILES += $${BASEDIR}/ios/iOSForAppStore-Info.plist
+ } else {
+ QMAKE_INFO_PLIST = $${BASEDIR}/ios/iOS-Info.plist
+ OTHER_FILES += $${BASEDIR}/ios/iOS-Info.plist
+ }
#-- TODO: Add iTunesArtwork
}
@@ -662,6 +674,14 @@ AndroidBuild {
$$PWD/android/src/com/hoho/android/usbserial/driver/UsbSerialRuntimeException.java \
$$PWD/android/src/org/qgroundcontrol/qgchelper/UsbDeviceJNI.java \
$$PWD/android/src/org/qgroundcontrol/qgchelper/UsbIoManager.java
+
+ DISTFILES += \
+ android/gradle/wrapper/gradle-wrapper.jar \
+ android/gradlew \
+ android/res/values/libs.xml \
+ android/build.gradle \
+ android/gradle/wrapper/gradle-wrapper.properties \
+ android/gradlew.bat
}
#-------------------------------------------------------------------------------------
@@ -676,11 +696,3 @@ include(QGCSetup.pri)
#
include(QGCInstaller.pri)
-
-DISTFILES += \
- android/gradle/wrapper/gradle-wrapper.jar \
- android/gradlew \
- android/res/values/libs.xml \
- android/build.gradle \
- android/gradle/wrapper/gradle-wrapper.properties \
- android/gradlew.bat
diff --git a/QGCCommon.pri b/QGCCommon.pri
index 809dd9672cc1e90eb248d1fb4fc6466c9d8492ad..ef571bdfad2efbcba853cd72ed9bb68b6908714d 100644
--- a/QGCCommon.pri
+++ b/QGCCommon.pri
@@ -122,7 +122,7 @@ win32:debug_and_release {
BASEDIR = $$IN_PWD
-!ios {
+!iOSBuild {
OBJECTS_DIR = $${OUT_PWD}/obj
MOC_DIR = $${OUT_PWD}/moc
UI_DIR = $${OUT_PWD}/ui
diff --git a/QGCInstaller.pri b/QGCInstaller.pri
index 553916cc107484c3068ecac005383947dba53a53..84f36d83a14e8e39cf35394fa10d886c01de61ef 100644
--- a/QGCInstaller.pri
+++ b/QGCInstaller.pri
@@ -23,39 +23,41 @@ installer {
VideoEnabled {
# Install the gstreamer framework
# This will:
- # Copy from the original distibution into libs/lib/Framworks (if not already there)
+ # Copy from the original distibution into DESTDIR/gstwork (if not already there)
# Prune the framework, removing stuff we don't need
# Relocate all dylibs so they can work under @executable_path/...
# Copy the result into the app bundle
# Make sure qgroundcontrol can find them
message("Preparing GStreamer Framework")
- QMAKE_POST_LINK += && $$BASEDIR/tools/prepare_gstreamer_framework.sh $$BASEDIR/libs/lib/Frameworks/ $$DESTDIR/$${TARGET}.app $${TARGET}
+ QMAKE_POST_LINK += && $$BASEDIR/tools/prepare_gstreamer_framework.sh $${OUT_PWD}/gstwork/ $${DESTDIR}/$${TARGET}.app $${TARGET}
} else {
message("Skipping GStreamer Framework")
}
# We cd to release directory so we can run macdeployqt without a path to the
# qgroundcontrol.app file. If you specify a path to the .app file the symbolic
# links to plugins will not be created correctly.
- QMAKE_POST_LINK += && cd release && mkdir package
- QMAKE_POST_LINK += && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -verbose=2 -qmldir=../src
- QMAKE_POST_LINK += && cd ..
+ QMAKE_POST_LINK += && cd $${DESTDIR} && mkdir package
+ QMAKE_POST_LINK += && $$dirname(QMAKE_QMAKE)/macdeployqt qgroundcontrol.app -verbose=2 -qmldir=$${BASEDIR}/src
+ QMAKE_POST_LINK += && cd $${OUT_PWD}
QMAKE_POST_LINK += && hdiutil create -layout SPUD -srcfolder $${DESTDIR}/qgroundcontrol.app -volname QGroundControl $${DESTDIR}/package/qgroundcontrol.dmg
}
WindowsBuild {
- # The pdb moving command are commented out for now since we are including the .pdb in the installer. This makes it much
- # easier to debug user crashes.
- #QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY $${DESTDIR_WIN}\\qgroundcontrol.pdb
- #QMAKE_POST_LINK += $$escape_expand(\\n) del $${DESTDIR_WIN}\\qgroundcontrol.pdb
+ # The pdb moving command are commented out for now since we are including the .pdb in the installer. This makes it much
+ # easier to debug user crashes.
+ #QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY $${DESTDIR_WIN}\\qgroundcontrol.pdb
+ #QMAKE_POST_LINK += $$escape_expand(\\n) del $${DESTDIR_WIN}\\qgroundcontrol.pdb
QMAKE_POST_LINK += $$escape_expand(\\n) $$quote("\"C:\\Program Files \(x86\)\\NSIS\\makensis.exe\"" /NOCD "\"/XOutFile $${DESTDIR_WIN}\\qgroundcontrol-installer.exe\"" "$$BASEDIR_WIN\\deploy\\qgroundcontrol_installer.nsi")
- #QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY qgroundcontrol.pdb $${DESTDIR_WIN}
- #QMAKE_POST_LINK += $$escape_expand(\\n) del qgroundcontrol.pdb
+ #QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY qgroundcontrol.pdb $${DESTDIR_WIN}
+ #QMAKE_POST_LINK += $$escape_expand(\\n) del qgroundcontrol.pdb
OTHER_FILES += deploy/qgroundcontrol_installer.nsi
}
LinuxBuild {
+ #-- TODO: This uses hardcoded paths. It should use $${DESTDIR}
QMAKE_POST_LINK += && mkdir -p release/package
- QMAKE_POST_LINK += && tar -cjf release/package/qgroundcontrol.tar.bz2 release --exclude='package' --transform 's/release/qgroundcontrol/'
+ QMAKE_POST_LINK += && tar -cjf release/package/qgroundcontrol.tar.bz2 release --exclude='package' --transform 's/release/qgroundcontrol/'
}
AndroidBuild {
+ #-- TODO: This uses hardcoded paths. It should use $${DESTDIR}
QMAKE_POST_LINK += && mkdir -p release/package
QMAKE_POST_LINK += && make install INSTALL_ROOT=release/android-build/
QMAKE_POST_LINK += && androiddeployqt --input android-libqgroundcontrol.so-deployment-settings.json --output release/android-build --deployment bundled --gradle --sign android/android_release.keystore dagar --storepass $$(ANDROID_STOREPASS)
diff --git a/QGCSetup.pri b/QGCSetup.pri
index edc6288690dbcf10da0bc89f1c3ddca05747280f..02020d452e9fdf610df4ee325df23e740bc2008b 100644
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -51,106 +51,10 @@ WindowsBuild {
#
MacBuild {
-
- # Copy non-standard libraries and frameworks into app package
- QMAKE_POST_LINK += && $$QMAKE_COPY_DIR $$BASEDIR/libs/lib/mac64/lib $$DESTDIR/$${TARGET}.app/Contents/libs
+ # Copy non-standard frameworks into app package
QMAKE_POST_LINK += && rsync -a --delete $$BASEDIR/libs/lib/Frameworks $$DESTDIR/$${TARGET}.app/Contents/
-
- # Fix library paths inside executable
-
- INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
- INSTALL_NAME_LIB_LIST = \
- libOpenThreads.dylib \
- libosg.dylib \
- libosgViewer.dylib \
- libosgGA.dylib \
- libosgDB.dylib \
- libosgText.dylib \
- libosgWidget.dylib
- for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
- QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
- }
-
- # Fix library paths within libraries (inter-library dependencies)
-
- # OSG GA LIBRARY
- INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/libs/libosgGA.dylib
- INSTALL_NAME_LIB_LIST = \
- libOpenThreads.dylib \
- libosg.dylib \
- libosgGA.dylib \
- libosgDB.dylib \
- libosgUtil.dylib
- for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
- QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
- }
-
- # OSG DB LIBRARY
- INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/libs/libosgDB.dylib
- INSTALL_NAME_LIB_LIST = \
- libOpenThreads.dylib \
- libosg.dylib \
- libosgDB.dylib \
- libosgUtil.dylib
- for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
- QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
- }
-
- # OSG TEXT LIBRARY
- INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/libs/libosgText.dylib
- INSTALL_NAME_LIB_LIST = \
- libOpenThreads.dylib \
- libosg.dylib \
- libosgDB.dylib \
- libosgUtil.dylib \
- libosgText.dylib
- for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
- QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
- }
-
- # OSG UTIL LIBRARY
- INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/libs/libosgUtil.dylib
- INSTALL_NAME_LIB_LIST = \
- libOpenThreads.dylib \
- libosg.dylib
- for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
- QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
- }
-
-
- # OSG VIEWER LIBRARY
- INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/libs/libosgViewer.dylib
- INSTALL_NAME_LIB_LIST = \
- libOpenThreads.dylib \
- libosg.dylib \
- libosgGA.dylib \
- libosgDB.dylib \
- libosgUtil.dylib \
- libosgText.dylib
- for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
- QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
- }
-
- # OSG WIDGET LIBRARY
- INSTALL_NAME_TARGET = $$DESTDIR/$${TARGET}.app/Contents/libs/libosgWidget.dylib
- INSTALL_NAME_LIB_LIST = \
- libOpenThreads.dylib \
- libosg.dylib \
- libosgGA.dylib \
- libosgDB.dylib \
- libosgUtil.dylib \
- libosgText.dylib \
- libosgViewer.dylib
- for(INSTALL_NAME_LIB, INSTALL_NAME_LIB_LIST) {
- QMAKE_POST_LINK += && install_name_tool -change $$INSTALL_NAME_LIB "@executable_path/../libs/$${INSTALL_NAME_LIB}" $$INSTALL_NAME_TARGET
- }
-
- # CORE OSG LIBRARY
- QMAKE_POST_LINK += && install_name_tool -change libOpenThreads.dylib "@executable_path/../libs/libOpenThreads.dylib" $$DESTDIR/$${TARGET}.app/Contents/libs/libosg.dylib
-
# SDL Framework
QMAKE_POST_LINK += && install_name_tool -change "@rpath/SDL.framework/Versions/A/SDL" "@executable_path/../Frameworks/SDL.framework/Versions/A/SDL" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
-
}
WindowsBuild {
@@ -165,29 +69,29 @@ WindowsBuild {
$$BASEDIR\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll
for(COPY_FILE, COPY_FILE_LIST) {
- QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR_WIN\"
+ QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR_WIN\"
}
ReleaseBuild {
- # Copy Visual Studio DLLs
- # Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
- win32-msvc2010 {
- QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp100.dll\" \"$$DESTDIR_WIN\"
- QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr100.dll\" \"$$DESTDIR_WIN\"
- }
- else:win32-msvc2012 {
- QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp110.dll\" \"$$DESTDIR_WIN\"
- QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr110.dll\" \"$$DESTDIR_WIN\"
- }
- else:win32-msvc2013 {
- QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp120.dll\" \"$$DESTDIR_WIN\"
- QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr120.dll\" \"$$DESTDIR_WIN\"
- }
- else {
- error("Visual studio version not supported, installation cannot be completed.")
- }
- }
+ # Copy Visual Studio DLLs
+ # Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
+ win32-msvc2010 {
+ QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp100.dll\" \"$$DESTDIR_WIN\"
+ QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr100.dll\" \"$$DESTDIR_WIN\"
+ }
+ else:win32-msvc2012 {
+ QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp110.dll\" \"$$DESTDIR_WIN\"
+ QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr110.dll\" \"$$DESTDIR_WIN\"
+ }
+ else:win32-msvc2013 {
+ QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp120.dll\" \"$$DESTDIR_WIN\"
+ QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr120.dll\" \"$$DESTDIR_WIN\"
+ }
+ else {
+ error("Visual studio version not supported, installation cannot be completed.")
+ }
+ }
DEPLOY_TARGET = $$shell_quote($$shell_path($$DESTDIR_WIN\\$${TARGET}.exe))
QMAKE_POST_LINK += $$escape_expand(\\n) windeployqt --no-compiler-runtime --qmldir=$${BASEDIR_WIN}\\src $${DEPLOY_TARGET}
diff --git a/android_environment.sh b/android_environment.sh
index 477c0dbd1b3d3e3be5afd084fd7e7e47f65a8405..04abee5d505eb0cd56e001ec42982cfdc4766b91 100644
--- a/android_environment.sh
+++ b/android_environment.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#----------------------------------------------------------
# You will need:
-# - Qt 5.4 android_armv7 kit
+# - Qt 5.5.x android_armv7 kit
# - Android SDK
# - Androig NDK
# - Current Java
@@ -10,7 +10,7 @@
# Update with correct location for these
export ANDROID_HOME=~/Library/Android/sdk
export ANDROID_SDK_ROOT=~/Library/Android/sdk
-export ANDROID_NDK_ROOT=~/Library/Android/ndk
+export ANDROID_NDK_ROOT=~/Library/Android/sdk/ndk-bundle
export ANDROID_NDK_HOST=darwin-x86_64
export ANDROID_NDK_PLATFORM=/android-9
export ANDROID_NDK_TOOLCHAIN_PREFIX=arm-linux-androideabi
@@ -19,19 +19,11 @@ export ANDROID_NDK_TOOLS_PREFIX=arm-linux-androideabi
#----------------------------------------------------------
# To build it, run (replacing the path with where you have Qt installed)
#
-# For a shadow build: (strongly recomended)
-#
# >source android_environment.sh
# cd ../
# mkdir android_build
# cd android_build
# >~/local/Qt/5.4/android_armv7/bin/qmake -r -spec android-g++ CONFIG+=debug ../qgroundcontrol/qgroundcontrol.pro
-# >make -j24
-# >~/local/Qt/5.4/android_armv7/bin/androiddeployqt --input ./android-libqgroundcontrol.so-deployment-settings.json --output ./android-build --deployment bundled --android-platform android-22 --jdk /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home --verbose --ant /opt/local/bin/ant
-#
-# For an in place build (not recomended)
+# >make -j24 install INSTALL_ROOT=./android-build/
+# >~/local/Qt/5.4/android_armv7/bin/androiddeployqt --input ./android-libqgroundcontrol.so-deployment-settings.json --output ./android-build --deployment bundled --android-platform android-22 --jdk /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home --verbose --ant /usr/local/bin/ant
#
-# >source android_environment.sh
-# >~/local/Qt/5.4/android_armv7/bin/qmake -r -spec android-g++ CONFIG+=debug qgroundcontrol.pro
-# >make -j24
-# >~/local/Qt/5.4/android_armv7/bin/androiddeployqt --input ./android-libqgroundcontrol.so-deployment-settings.json --output ./android-build --deployment bundled --android-platform android-22 --jdk /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home --verbose --ant /opt/local/bin/ant
diff --git a/ios/LaunchScreen.xib b/ios/QGCLaunchScreen.xib
similarity index 100%
rename from ios/LaunchScreen.xib
rename to ios/QGCLaunchScreen.xib
diff --git a/ios/iOS-Info.plist b/ios/iOS-Info.plist
index 884b7b5b5f26a4984d8b5fec939a371cd87fce14..cef6abd540b20c6f0c7d9408a8bcd9833c82e148 100644
--- a/ios/iOS-Info.plist
+++ b/ios/iOS-Info.plist
@@ -11,7 +11,7 @@
CFBundleIconFile
CFBundleIdentifier
- com.grubba.qgroundcontrol
+ org.mavlink.qgroundcontrol
CFBundleName
QGroundControl
CFBundlePackageType
@@ -27,13 +27,13 @@
NOTE
This file was generated by Qt/QMake.
UILaunchStoryboardName
- LaunchScreen.xib
+ QGCLaunchScreen
UIRequiresFullScreen
CFBundleInfoDictionaryVersion
6.0
ForAppStore
- Yes
+ No
UISupportedInterfaceOrientations
UIInterfaceOrientationLandscapeLeft
diff --git a/ios/iOSForAppStore-Info.plist b/ios/iOSForAppStore-Info.plist
new file mode 100644
index 0000000000000000000000000000000000000000..f7da584756cdc10f33111b24736257077139ff77
--- /dev/null
+++ b/ios/iOSForAppStore-Info.plist
@@ -0,0 +1,83 @@
+
+
+
+
+ CFBundleDisplayName
+ QGroundControl
+ CFBundleExecutable
+ qgroundcontrol
+ CFBundleGetInfoString
+ Created by Qt/QMake
+ CFBundleIconFile
+
+ CFBundleIdentifier
+ com.grubba.qgroundcontrol
+ CFBundleName
+ QGroundControl
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ 1.0
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ 1.0
+ LSRequiresIPhoneOS
+
+ NOTE
+ This file was generated by Qt/QMake.
+ UILaunchStoryboardName
+ QGCLaunchScreen
+ UIRequiresFullScreen
+
+ CFBundleInfoDictionaryVersion
+ 6.0
+ ForAppStore
+ Yes
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationLandscapeLeft
+ UIInterfaceOrientationLandscapeRight
+
+ CFBundleIcons
+
+ CFBundlePrimaryIcon
+
+ CFBundleIconFiles
+
+ AppIcon29x29.png
+ AppIcon29x29@2x.png
+ AppIcon40x40@2x.png
+ AppIcon57x57.png
+ AppIcon57x57@2x.png
+ AppIcon60x60@2x.png
+
+
+
+ CFBundleIcons~ipad
+
+ CFBundlePrimaryIcon
+
+ CFBundleIconFiles
+
+ AppIcon29x29.png
+ AppIcon29x29@2x.png
+ AppIcon40x40@2x.png
+ AppIcon57x57.png
+ AppIcon57x57@2x.png
+ AppIcon60x60@2x.png
+ AppIcon29x29~ipad.png
+ AppIcon29x29@2x~ipad.png
+ AppIcon40x40~ipad.png
+ AppIcon40x40@2x~ipad.png
+ AppIcon50x50~ipad.png
+ AppIcon50x50@2x~ipad.png
+ AppIcon72x72~ipad.png
+ AppIcon72x72@2x~ipad.png
+ AppIcon76x76~ipad.png
+ AppIcon76x76@2x~ipad.png
+
+
+
+
+
diff --git a/libs/lib/lib.pro b/libs/lib/lib.pro
deleted file mode 100644
index a60585f0297a7b585f351517d1c6fe6920960388..0000000000000000000000000000000000000000
--- a/libs/lib/lib.pro
+++ /dev/null
@@ -1 +0,0 @@
-TEMPLATE = subdirs
\ No newline at end of file
diff --git a/libs/lib/mac32/frameworks/.gitignore b/libs/lib/mac32/frameworks/.gitignore
deleted file mode 100644
index 39aa8067655ced203e5e936db165559cad9040d8..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/frameworks/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.framework
-osgPlugins*
diff --git a/libs/lib/mac32/frameworks/README b/libs/lib/mac32/frameworks/README
deleted file mode 100644
index 2436e3d15e557bb60a2adcecf99663c59df5963b..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/frameworks/README
+++ /dev/null
@@ -1,3 +0,0 @@
-For instructions how to download or build the frameworks necessary to get OSG / osgEarth support, please refer to the QGroundControl wiki:
-
-http://qgroundcontrol.org/dev/open_scene_graph
diff --git a/libs/lib/mac32/include/OpenThreads/Atomic b/libs/lib/mac32/include/OpenThreads/Atomic
deleted file mode 100644
index 8b8ac4de304836fd40419100fd20a3710d49f0b1..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/OpenThreads/Atomic
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*-c++-*- OpenThreads library, Copyright (C) 2008 The Open Thread Group
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-#ifndef _OPENTHREADS_ATOMIC_
-#define _OPENTHREADS_ATOMIC_
-
-#include
-#include
-
-#if defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
-# include
-# define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES
-#elif defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS) && defined(__i386__)
-# define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES
-#elif defined(_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED)
-# define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES
-#elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
-# include
-# include "Mutex"
-# include "ScopedLock"
-#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
-# include "Mutex"
-# include "ScopedLock"
-#endif
-
-#if defined(_OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES)
-#define _OPENTHREADS_ATOMIC_INLINE
-#else
-#define _OPENTHREADS_ATOMIC_INLINE inline
-#endif
-
-namespace OpenThreads {
-
-/**
- * @class Atomic
- * @brief This class provides an atomic increment and decrement operation.
- */
-class OPENTHREAD_EXPORT_DIRECTIVE Atomic {
- public:
- Atomic(unsigned value = 0) : _value(value)
- { }
- _OPENTHREADS_ATOMIC_INLINE unsigned operator++();
- _OPENTHREADS_ATOMIC_INLINE unsigned operator--();
- _OPENTHREADS_ATOMIC_INLINE unsigned AND(unsigned value);
- _OPENTHREADS_ATOMIC_INLINE unsigned OR(unsigned value);
- _OPENTHREADS_ATOMIC_INLINE unsigned XOR(unsigned value);
- _OPENTHREADS_ATOMIC_INLINE unsigned exchange(unsigned value = 0);
- _OPENTHREADS_ATOMIC_INLINE operator unsigned() const;
- private:
-
- Atomic(const Atomic&);
- Atomic& operator=(const Atomic&);
-
-#if defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
- mutable Mutex _mutex;
-#endif
-#if defined(_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED)
- volatile long _value;
-#elif defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
- volatile int32_t _value;
-#elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
- volatile uint_t _value;
- mutable Mutex _mutex; // needed for xor
-#else
- volatile unsigned _value;
-#endif
-};
-
-/**
- * @class AtomicPtr
- * @brief This class provides an atomic pointer assignment using cas operations.
- */
-class OPENTHREAD_EXPORT_DIRECTIVE AtomicPtr {
-public:
- AtomicPtr(void* ptr = 0) : _ptr(ptr)
- { }
- ~AtomicPtr()
- { _ptr = 0; }
-
- // assigns a new pointer
- _OPENTHREADS_ATOMIC_INLINE bool assign(void* ptrNew, const void* const ptrOld);
- _OPENTHREADS_ATOMIC_INLINE void* get() const;
-
-private:
- AtomicPtr(const AtomicPtr&);
- AtomicPtr& operator=(const AtomicPtr&);
-
-#if defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
- mutable Mutex _mutex;
-#endif
- void* volatile _ptr;
-};
-
-#if !defined(_OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES)
-
-_OPENTHREADS_ATOMIC_INLINE unsigned
-Atomic::operator++()
-{
-#if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
- return __sync_add_and_fetch(&_value, 1);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
- return __add_and_fetch(&_value, 1);
-#elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
- return atomic_inc_uint_nv(&_value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
- ScopedLock lock(_mutex);
- return ++_value;
-#else
- return ++_value;
-#endif
-}
-
-_OPENTHREADS_ATOMIC_INLINE unsigned
-Atomic::operator--()
-{
-#if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
- return __sync_sub_and_fetch(&_value, 1);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
- return __sub_and_fetch(&_value, 1);
-#elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
- return atomic_dec_uint_nv(&_value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
- ScopedLock lock(_mutex);
- return --_value;
-#else
- return --_value;
-#endif
-}
-
-_OPENTHREADS_ATOMIC_INLINE unsigned
-Atomic::AND(unsigned value)
-{
-#if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
- return __sync_fetch_and_and(&_value, value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
- return __and_and_fetch(&_value, value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
- return atomic_and_uint_nv(&_value, value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
- ScopedLock lock(_mutex);
- _value &= value;
- return _value;
-#else
- _value &= value;
- return _value;
-#endif
-}
-
-_OPENTHREADS_ATOMIC_INLINE unsigned
-Atomic::OR(unsigned value)
-{
-#if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
- return __sync_fetch_and_or(&_value, value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
- return __or_and_fetch(&_value, value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
- return atomic_or_uint_nv(&_value, value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
- ScopedLock lock(_mutex);
- _value |= value;
- return _value;
-#else
- _value |= value;
- return _value;
-#endif
-}
-
-_OPENTHREADS_ATOMIC_INLINE unsigned
-Atomic::XOR(unsigned value)
-{
-#if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
- return __sync_fetch_and_xor(&_value, value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
- return __xor_and_fetch(&_value, value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
- ScopedLock lock(_mutex);
- _value ^= value;
- return _value;
-#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
- ScopedLock lock(_mutex);
- _value ^= value;
- return _value;
-#else
- _value ^= value;
- return _value;
-#endif
-}
-
-_OPENTHREADS_ATOMIC_INLINE unsigned
-Atomic::exchange(unsigned value)
-{
-#if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
- return __sync_lock_test_and_set(&_value, value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
- return __compare_and_swap(&_value, _value, value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
- return atomic_cas_uint(&_value, _value, value);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
- ScopedLock lock(_mutex);
- unsigned oldval = _value;
- _value = value;
- return oldval;
-#else
- unsigned oldval = _value;
- _value = value;
- return oldval;
-#endif
-}
-
-_OPENTHREADS_ATOMIC_INLINE
-Atomic::operator unsigned() const
-{
-#if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
- __sync_synchronize();
- return _value;
-#elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
- __synchronize();
- return _value;
-#elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
- membar_consumer(); // Hmm, do we need???
- return _value;
-#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
- ScopedLock lock(_mutex);
- return _value;
-#else
- return _value;
-#endif
-}
-
-_OPENTHREADS_ATOMIC_INLINE bool
-AtomicPtr::assign(void* ptrNew, const void* const ptrOld)
-{
-#if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
- return __sync_bool_compare_and_swap(&_ptr, ptrOld, ptrNew);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
- return __compare_and_swap((unsigned long*)&_ptr, (unsigned long)ptrOld, (unsigned long)ptrNew);
-#elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
- return ptrOld == atomic_cas_ptr(&_ptr, const_cast(ptrOld), ptrNew);
-#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
- ScopedLock lock(_mutex);
- if (_ptr != ptrOld)
- return false;
- _ptr = ptrNew;
- return true;
-#else
- if (_ptr != ptrOld)
- return false;
- _ptr = ptrNew;
- return true;
-#endif
-}
-
-_OPENTHREADS_ATOMIC_INLINE void*
-AtomicPtr::get() const
-{
-#if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
- __sync_synchronize();
- return _ptr;
-#elif defined(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
- __synchronize();
- return _ptr;
-#elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
- membar_consumer(); // Hmm, do we need???
- return _ptr;
-#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
- ScopedLock lock(_mutex);
- return _ptr;
-#else
- return _ptr;
-#endif
-}
-
-#endif // !defined(_OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES)
-
-}
-
-#endif // _OPENTHREADS_ATOMIC_
diff --git a/libs/lib/mac32/include/OpenThreads/Barrier b/libs/lib/mac32/include/OpenThreads/Barrier
deleted file mode 100644
index 663d198f12fa93d3cc1eb644a756b81d6fef8283..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/OpenThreads/Barrier
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*-c++-*- OpenThreads library, Copyright (C) 2002 - 2007 The Open Thread Group
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-
-//
-// Barrier - C++ barrier class
-// ~~~~~~~
-//
-
-#ifndef _OPENTHREADS_BARRIER_
-#define _OPENTHREADS_BARRIER_
-
-#include
-
-namespace OpenThreads {
-
-
-/**
- * @class Barrier
- * @brief This class provides an object-oriented thread barrier interface
- *
- * @warning It is unwise to use the construct "Barrier barrier" in the
- * global namespace on sgi's. The object "barrier"
- * will confilict with the c-library sproc function "barrier" and
- * unpredictable results may occur. You have been warned.
- */
-class OPENTHREAD_EXPORT_DIRECTIVE Barrier {
-
-public:
-
- /**
- * Constructor
- */
- Barrier(int numThreads=0);
-
- /**
- * Destructor
- */
- virtual ~Barrier();
-
- /**
- * Reset the barrier to it's original state.
- */
- virtual void reset();
-
- /**
- * Block until numThreads threads have entered the barrier.
- */
- virtual void block(unsigned int numThreads=0);
-
- /**
- * Release the barrier, now.
- */
- virtual void release();
-
- /**
- * Return the number of threads currently blocked in the barrier,
- * Return -1 if error.
- */
- virtual int numThreadsCurrentlyBlocked();
-
-
- void invalidate();
-
-private:
-
- /**
- * Private copy constructor, to prevent tampering.
- */
- Barrier(const Barrier &/*b*/) {};
-
- /**
- * Private copy assignment, to prevent tampering.
- */
- Barrier &operator=(const Barrier &/*b*/) {return *(this);};
-
- /**
- * Implementation-specific private data.
- */
- void *_prvData;
-
-
- bool _valid;
-
-};
-
-}
-
-#endif // !_OPENTHREADS_BARRIER_
-
diff --git a/libs/lib/mac32/include/OpenThreads/Block b/libs/lib/mac32/include/OpenThreads/Block
deleted file mode 100644
index 0b821e4ed126c5fd59ef5c5da58002d80ac8ea95..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/OpenThreads/Block
+++ /dev/null
@@ -1,177 +0,0 @@
-/* -*-c++-*- OpenThreads - Copyright (C) 1998-2007 Robert Osfield
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-#ifndef _OPENTHREADS_BLOCK_
-#define _OPENTHREADS_BLOCK_
-
-#include
-#include
-#include
-#include
-
-namespace OpenThreads {
-
-/** Block is a block that can be used to halt a thread that is waiting another thread to release it.*/
-class Block
-{
- public:
-
- Block():
- _released(false) {}
-
- ~Block()
- {
- release();
- }
-
- inline bool block()
- {
- ScopedLock mutlock(_mut);
- if( !_released )
- {
- return _cond.wait(&_mut)==0;
- }
- else
- {
- return true;
- }
- }
-
- inline bool block(unsigned long timeout)
- {
- ScopedLock mutlock(_mut);
- if( !_released )
- {
- return _cond.wait(&_mut, timeout)==0;
- }
- else
- {
- return true;
- }
- }
-
- inline void release()
- {
- ScopedLock mutlock(_mut);
- if (!_released)
- {
- _released = true;
- _cond.broadcast();
- }
- }
-
- inline void reset()
- {
- ScopedLock mutlock(_mut);
- _released = false;
- }
-
- inline void set(bool doRelease)
- {
- if (doRelease!=_released)
- {
- if (doRelease) release();
- else reset();
- }
- }
-
- protected:
-
- Mutex _mut;
- Condition _cond;
- bool _released;
-
- private:
-
- Block(const Block&) {}
-};
-
-/** BlockCount is a block that can be used to halt a thread that is waiting for a specified number of operations to be completed.*/
-class BlockCount
-{
- public:
-
- BlockCount(unsigned int blockCount):
- _blockCount(blockCount),
- _currentCount(0) {}
-
- ~BlockCount()
- {
- _blockCount = 0;
- release();
- }
-
- inline void completed()
- {
- OpenThreads::ScopedLock mutlock(_mut);
- if (_currentCount>0)
- {
- --_currentCount;
-
- if (_currentCount==0)
- {
- // osg::notify(osg::NOTICE)<<"Released"< mutlock(_mut);
- if (_currentCount)
- _cond.wait(&_mut);
- }
-
- inline void reset()
- {
- OpenThreads::ScopedLock mutlock(_mut);
- if (_currentCount!=_blockCount)
- {
- if (_blockCount==0) _cond.broadcast();
- _currentCount = _blockCount;
- }
- }
-
- inline void release()
- {
- OpenThreads::ScopedLock mutlock(_mut);
- if (_currentCount)
- {
- _currentCount = 0;
- _cond.broadcast();
- }
- }
-
- inline void setBlockCount(unsigned int blockCount) { _blockCount = blockCount; }
-
- inline unsigned int getBlockCount() const { return _blockCount; }
-
- inline unsigned int getCurrentCount() const { return _currentCount; }
-
- protected:
-
- OpenThreads::Mutex _mut;
- OpenThreads::Condition _cond;
- unsigned int _blockCount;
- unsigned int _currentCount;
-
- private:
-
- BlockCount(const BlockCount&) {}
-
-};
-
-}
-
-#endif
diff --git a/libs/lib/mac32/include/OpenThreads/Condition b/libs/lib/mac32/include/OpenThreads/Condition
deleted file mode 100644
index 454c079d3d7569d00ce352e9bd11a6d0b4048a33..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/OpenThreads/Condition
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*-c++-*- OpenThreads library, Copyright (C) 2002 - 2007 The Open Thread Group
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-
-//
-// Condition - C++ condition class
-// ~~~~~~~~~
-//
-
-#ifndef _OPENTHREADS_CONDITION_
-#define _OPENTHREADS_CONDITION_
-
-#include
-#include
-
-namespace OpenThreads {
-
-/**
- * @class Condition
- * @brief This class provides an object-oriented thread condition interface.
- */
-class OPENTHREAD_EXPORT_DIRECTIVE Condition {
-
-public:
-
- /**
- * Constructor
- */
- Condition();
-
- /**
- * Destructor
- */
- virtual ~Condition();
-
- /**
- * Wait on a mutex.
- */
- virtual int wait(Mutex *mutex);
-
- /**
- * Wait on a mutex for a given amount of time (ms)
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- virtual int wait(Mutex *mutex, unsigned long int ms);
-
- /**
- * Signal a SINGLE thread to wake if it's waiting.
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- virtual int signal();
-
- /**
- * Wake all threads waiting on this condition.
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- virtual int broadcast();
-
-private:
-
- /**
- * Private copy constructor, to prevent tampering.
- */
- Condition(const Condition &/*c*/) {};
-
- /**
- * Private copy assignment, to prevent tampering.
- */
- Condition &operator=(const Condition &/*c*/) {return *(this);};
-
- /**
- * Implementation-specific data
- */
- void *_prvData;
-
-};
-
-}
-
-#endif // !_OPENTHREADS_CONDITION_
diff --git a/libs/lib/mac32/include/OpenThreads/Config b/libs/lib/mac32/include/OpenThreads/Config
deleted file mode 100644
index 1e6a686796a0063a03a674e5bc32efb00fccee85..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/OpenThreads/Config
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 2008 Robert Osfield
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-/****************************************************************************
- * THIS FILE IS AUTOGENERATED BY CMAKE. DO NOT EDIT!
- ****************************************************************************/
-
-/* Changes to the configuration reflected here can be made with ccmake on
- * unix or with cmake-gui on windows. Alternatively you can use cmake's -D
- * or -P switches to set some configuration values at cmake configuration time.
- */
-
-#ifndef _OPENTHREADS_CONFIG
-#define _OPENTHREADS_CONFIG
-
-#define _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS
-/* #undef _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS */
-/* #undef _OPENTHREADS_ATOMIC_USE_SUN */
-/* #undef _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED */
-#define _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC
-/* #undef _OPENTHREADS_ATOMIC_USE_MUTEX */
-/* #undef OT_LIBRARY_STATIC */
-
-#endif
diff --git a/libs/lib/mac32/include/OpenThreads/Exports b/libs/lib/mac32/include/OpenThreads/Exports
deleted file mode 100644
index 2a54144241c6a08b9fbbe009e8a60c3a1a26c0dc..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/OpenThreads/Exports
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*-c++-*- OpenThreads library, Copyright (C) 2002 - 2007 The Open Thread Group
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-#ifndef _OPENTHREAD_EXPORTS_H_
-#define _OPENTHREAD_EXPORTS_H_
-
-#include
-
-#ifndef WIN32
- #define OPENTHREAD_EXPORT_DIRECTIVE
-#else
- #if defined( OT_LIBRARY_STATIC )
- #define OPENTHREAD_EXPORT_DIRECTIVE
- #elif defined( OPENTHREADS_EXPORTS )
- #define OPENTHREAD_EXPORT_DIRECTIVE __declspec(dllexport)
- #else
- #define OPENTHREAD_EXPORT_DIRECTIVE __declspec(dllimport)
-
- #if 0 // Commented out for now
-
- #ifdef _MSC_VER
- #ifdef _DEBUG
- #pragma comment(lib ,"OpenThreadsWin32d")
- #else
- #pragma comment(lib, "OpenThreadsWin32")
- #endif
- #endif
- #endif
- #endif
-#endif
-
-#endif
-
-
diff --git a/libs/lib/mac32/include/OpenThreads/Mutex b/libs/lib/mac32/include/OpenThreads/Mutex
deleted file mode 100644
index e13ad189f148abd458e6ddf4ac3333c365af599b..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/OpenThreads/Mutex
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*-c++-*- OpenThreads library, Copyright (C) 2002 - 2007 The Open Thread Group
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-
-//
-// Mutex - C++ mutex class
-// ~~~~~
-//
-
-#ifndef _OPENTHREADS_MUTEX_
-#define _OPENTHREADS_MUTEX_
-
-#include
-
-namespace OpenThreads {
-
-/**
- * @class Mutex
- * @brief This class provides an object-oriented thread mutex interface.
- */
-class OPENTHREAD_EXPORT_DIRECTIVE Mutex {
-
- friend class Condition;
-
-public:
-
- enum MutexType
- {
- MUTEX_NORMAL,
- MUTEX_RECURSIVE
- };
-
- /**
- * Constructor
- */
- Mutex(MutexType type=MUTEX_NORMAL);
-
- /**
- * Destructor
- */
- virtual ~Mutex();
-
-
- MutexType getMutexType() const { return _mutexType; }
-
-
- /**
- * Lock the mutex
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- virtual int lock();
-
- /**
- * Unlock the mutex
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- virtual int unlock();
-
- /**
- * Test if mutex can be locked.
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- virtual int trylock();
-
-private:
-
- /**
- * Private copy constructor, to prevent tampering.
- */
- Mutex(const Mutex &/*m*/) {};
-
- /**
- * Private copy assignment, to prevent tampering.
- */
- Mutex &operator=(const Mutex &/*m*/) {return *(this);};
-
- /**
- * Implementation-specific private data.
- */
- void *_prvData;
- MutexType _mutexType;
-
-};
-
-}
-
-#endif // _OPENTHREADS_MUTEX_
diff --git a/libs/lib/mac32/include/OpenThreads/ReadWriteMutex b/libs/lib/mac32/include/OpenThreads/ReadWriteMutex
deleted file mode 100644
index c78a651d6e34fadbb5f8d7e4d759b87e226a7b1e..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/OpenThreads/ReadWriteMutex
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*-c++-*- OpenThreads - Copyright (C) 1998-2007 Robert Osfield
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-#ifndef _OPENTHREADS_READWRITEMUTEX_
-#define _OPENTHREADS_READWRITEMUTEX_
-
-#include
-#include
-
-namespace OpenThreads {
-
-class ReadWriteMutex
-{
- public:
-
- ReadWriteMutex():
- _readCount(0) {}
-
- virtual ~ReadWriteMutex() {}
-
- virtual int readLock()
- {
- OpenThreads::ScopedLock lock(_readCountMutex);
- int result = 0;
- if (_readCount==0)
- {
- result = _readWriteMutex.lock();
- }
- ++_readCount;
- return result;
- }
-
-
- virtual int readUnlock()
- {
- OpenThreads::ScopedLock lock(_readCountMutex);
- int result = 0;
- if (_readCount>0)
- {
- --_readCount;
- if (_readCount==0)
- {
- result = _readWriteMutex.unlock();
- }
- }
- return result;
- }
-
- virtual int writeLock()
- {
- return _readWriteMutex.lock();
- }
-
- virtual int writeUnlock()
- {
- return _readWriteMutex.unlock();
- }
-
- protected:
-
- ReadWriteMutex(const ReadWriteMutex&) {}
- ReadWriteMutex& operator = (const ReadWriteMutex&) { return *(this); }
-
-#if 0
- ReentrantMutex _readWriteMutex;
- ReentrantMutex _readCountMutex;
-#else
- OpenThreads::Mutex _readWriteMutex;
- OpenThreads::Mutex _readCountMutex;
-#endif
- unsigned int _readCount;
-
-};
-
-class ScopedReadLock
-{
- public:
-
- ScopedReadLock(ReadWriteMutex& mutex):_mutex(mutex) { _mutex.readLock(); }
- ~ScopedReadLock() { _mutex.readUnlock(); }
-
- protected:
- ReadWriteMutex& _mutex;
-
- ScopedReadLock& operator = (const ScopedReadLock&) { return *this; }
-};
-
-
-class ScopedWriteLock
-{
- public:
-
- ScopedWriteLock(ReadWriteMutex& mutex):_mutex(mutex) { _mutex.writeLock(); }
- ~ScopedWriteLock() { _mutex.writeUnlock(); }
-
- protected:
- ReadWriteMutex& _mutex;
-
- ScopedWriteLock& operator = (const ScopedWriteLock&) { return *this; }
-};
-
-}
-
-#endif
diff --git a/libs/lib/mac32/include/OpenThreads/ReentrantMutex b/libs/lib/mac32/include/OpenThreads/ReentrantMutex
deleted file mode 100644
index fdfefb32d1761baf52d4bb8b1a71edaa73bec590..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/OpenThreads/ReentrantMutex
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*-c++-*- OpenThreads - Copyright (C) 1998-2007 Robert Osfield
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-#ifndef _OPENTHREADS_REENTRANTMUTEX_
-#define _OPENTHREADS_REENTRANTMUTEX_
-
-#include
-#include
-#include
-
-namespace OpenThreads {
-
-class ReentrantMutex : public OpenThreads::Mutex
-{
- public:
-
- ReentrantMutex():
- Mutex(MUTEX_RECURSIVE) {}
-
-};
-
-}
-
-#endif
diff --git a/libs/lib/mac32/include/OpenThreads/ScopedLock b/libs/lib/mac32/include/OpenThreads/ScopedLock
deleted file mode 100644
index b665ecaa8ffef33faf6bf8036f4a2032c7afc3fc..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/OpenThreads/ScopedLock
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*-c++-*- OpenThreads library, Copyright (C) 2002 - 2007 The Open Thread Group
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-
-//
-// ScopedLock and ReverseScopedLock templates
-// ~~~~~~~
-//
-#ifndef _ScopedLock_
-#define _ScopedLock_
-
-namespace OpenThreads{
-
-template class ScopedLock
-{
- private:
- M& m_lock;
- ScopedLock(const ScopedLock&); // prevent copy
- ScopedLock& operator=(const ScopedLock&); // prevent assign
- public:
- explicit ScopedLock(M& m):m_lock(m) {m_lock.lock();}
- ~ScopedLock(){m_lock.unlock();}
-};
-
-template class ReverseScopedLock
-{
- private:
- M& m_lock;
- ReverseScopedLock(const ReverseScopedLock&); // prevent copy
- ReverseScopedLock& operator=(const ReverseScopedLock&); // prevent assign
- public:
- explicit ReverseScopedLock(M& m):m_lock(m) {m_lock.unlock();}
- ~ReverseScopedLock(){m_lock.lock();}
-};
-
-
-template class ScopedPointerLock
-{
- private:
- M* m_lock;
- ScopedPointerLock(const ScopedPointerLock&); // prevent copy
- ScopedPointerLock& operator=(const ScopedPointerLock&); // prevent assign
- public:
- explicit ScopedPointerLock(M* m):m_lock(m) { if (m_lock) m_lock->lock();}
- ~ScopedPointerLock(){ if (m_lock) m_lock->unlock();}
-};
-
-template class ReverseScopedPointerLock
-{
- private:
- M* m_lock;
- ReverseScopedPointerLock(const ReverseScopedPointerLock&); // prevent copy
- ReverseScopedPointerLock& operator=(const ReverseScopedPointerLock&); // prevent assign
- public:
- explicit ReverseScopedPointerLock(M* m):m_lock(m) { if (m_lock) m_lock->unlock();}
- ~ReverseScopedPointerLock(){ if (m_lock) m_lock->lock();}
-};
-
-}
-#endif
diff --git a/libs/lib/mac32/include/OpenThreads/Thread b/libs/lib/mac32/include/OpenThreads/Thread
deleted file mode 100644
index 0297b98768df84f293578b5e43e8aa1eec8819ce..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/OpenThreads/Thread
+++ /dev/null
@@ -1,389 +0,0 @@
-/* -*-c++-*- OpenThreads library, Copyright (C) 2002 - 2007 The Open Thread Group
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-
-//
-// Thread - C++ Thread class
-// ~~~~~~~~
-//
-
-#ifndef _OPENTHREADS_THREAD_
-#define _OPENTHREADS_THREAD_
-
-#include
-
-#include
-
-namespace OpenThreads {
-
-/**
- * Get the number of processors.
- *
- * Note, systems where no support exists for querrying the number of processors, 1 is returned.
- *
- */
-extern OPENTHREAD_EXPORT_DIRECTIVE int GetNumberOfProcessors();
-
-/**
- * Set the processor affinity of current thread.
- *
- * Note, systems where no support exists no affinity will be set, and -1 will be returned.
- *
- */
-extern OPENTHREAD_EXPORT_DIRECTIVE int SetProcessorAffinityOfCurrentThread(unsigned int cpunum);
-
-/**
- * @class Thread
- * @brief This class provides an object-oriented thread interface.
- */
-class OPENTHREAD_EXPORT_DIRECTIVE Thread {
-
-public:
-
- /**
- * Set the concurrency level for a running application. This method
- * only has effect if the pthreads thread model is being used, and
- * then only when that model is many-to-one (eg. irix).
- * in other cases it is ignored. The concurrency level is only a
- * *hint* as to the number of execution vehicles to use, the actual
- * implementation may do anything it wants. Setting the value
- * to 0 returns things to their default state.
- *
- * @return previous concurrency level, -1 indicates no-op.
- */
- static int SetConcurrency(int concurrencyLevel);
-
- /**
- * Get the concurrency level for a running application. In this
- * case, a return code of 0 means that the application is in default
- * mode. A return code of -1 means that the application is incapable
- * of setting an arbitrary concurrency, because it is a one-to-one
- * execution model (sprocs, linuxThreads)
- */
- static int GetConcurrency();
-
- /**
- * Enumerated Type for thread priority
- */
- enum ThreadPriority {
-
- THREAD_PRIORITY_MAX, /**< The maximum possible priority */
- THREAD_PRIORITY_HIGH, /**< A high (but not max) setting */
- THREAD_PRIORITY_NOMINAL, /**< An average priority */
- THREAD_PRIORITY_LOW, /**< A low (but not min) setting */
- THREAD_PRIORITY_MIN, /**< The miniumum possible priority */
- THREAD_PRIORITY_DEFAULT /**< Priority scheduling default */
-
- };
-
- /**
- * Enumerated Type for thread scheduling policy
- */
- enum ThreadPolicy {
-
- THREAD_SCHEDULE_FIFO, /**< First in, First out scheduling */
- THREAD_SCHEDULE_ROUND_ROBIN, /**< Round-robin scheduling (LINUX_DEFAULT) */
- THREAD_SCHEDULE_TIME_SHARE, /**< Time-share scheduling (IRIX DEFAULT) */
- THREAD_SCHEDULE_DEFAULT /**< Default scheduling */
-
- };
-
- /**
- * Constructor
- */
- Thread();
-
- /**
- * Destructor
- */
- virtual ~Thread();
-
-
- /**
- * Return a pointer to the current running thread
- */
- static Thread *CurrentThread();
-
-
- /**
- * Initialize Threading in a program. This method must be called before
- * you can do any threading in a program.
- */
- static void Init();
-
- /**
- * Yield the processor.
- *
- * @note This method operates on the calling process. And is
- * equivalent to calling sched_yield().
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- static int YieldCurrentThread();
-
- /**
- * This method will return the ThreadPriority of the master process.
- * (ie, the one calling the thread->start() methods for the first time)
- * The method will almost certainly return
- * Thread::THREAD_PRIORITY_DEFAULT if
- * Init() has not been called.
- *
- * @return the Thread::ThreadPriority of the master thread.
- */
- static ThreadPriority GetMasterPriority() {return s_masterThreadPriority;};
-
-
- /**
- * Get a unique thread id. This id is monotonically increasing.
- *
- * @return a unique thread identifier
- */
- int getThreadId();
-
- /**
- * Get the thread's process id. This is the pthread_t or pid_t value
- * depending on the threading model being used.
- *
- * @return thread process id.
- */
- size_t getProcessId();
-
- /**
- * Start the thread. This method will configure the thread, set
- * it's priority, and spawn it.
- *
- * @note if the stack size specified setStackSize is smaller than the
- * smallest allowable stack size, the threads stack size will be set to
- * the minimum allowed, and may be retrieved via the getStackSize()
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- int start();
- int startThread();
-
- /**
- * Test the cancel state of the thread. If the thread has been canceled
- * this method will cause the thread to exit now. This method operates
- * on the calling thread.
- *
- * Returns 0 if normal, -1 if called from a thread other that this.
- */
- int testCancel();
-
-
- /**
- * Cancel the thread. Equivalent to SIGKILL.
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- virtual int cancel();
-
- /**
- * Set the thread's schedule priority. This is a complex method.
- * Beware of thread priorities when using a many-to-many kernel
- * entity implemenation (such as IRIX pthreads). If one is not carefull
- * to manage the thread priorities, a priority inversion deadlock can
- * easily occur (Although the OpenThreads::Mutex & OpenThreads::Barrier
- * constructs have been designed with this senario in mind). Unless
- * you have explicit need to set the schedule pirorites for a given
- * task, it is best to leave them alone.
- *
- * @note some implementations (notably LinuxThreads and IRIX Sprocs)
- * only alow you to decrease thread priorities dynamically. Thus,
- * a lower priority thread will not allow it's priority to be raised
- * on the fly.
- *
- * @note seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO
- * will output scheduling information for each thread to stdout.
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- int setSchedulePriority(ThreadPriority priority);
-
- /**
- * Get the thread's schedule priority (if able)
- *
- * @note seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO
- * will output scheduling information for each thread to stdout.
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- int getSchedulePriority();
-
- /**
- * Set the thread's scheduling policy (if able)
- *
- * @note On some implementations (notably IRIX Sprocs & LinuxThreads)
- * The policy may prohibit the use of SCHEDULE_ROUND_ROBIN and
- * SCHEDULE_FIFO policies - due to their real-time nature, and
- * the danger of deadlocking the machine when used as super-user.
- * In such cases, the command is a no-op.
- *
- * @note seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO
- * will output scheduling information for each thread to stdout.
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- int setSchedulePolicy(ThreadPolicy policy);
-
- /**
- * Get the thread's policy (if able)
- *
- * @note seting the environment variable OUTPUT_THREADLIB_SCHEDULING_INFO
- * will output scheduling information for each thread to stdout.
- *
- * @return policy if normal, -1 if errno set, errno code otherwise.
- */
- int getSchedulePolicy();
-
- /**
- * Set the thread's desired stack size (in bytes).
- * This method is an attribute of the thread and must be called
- * *before* the start() method is invoked.
- *
- * @note a return code of 13 (EACESS) means that the thread stack
- * size can no longer be changed.
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- int setStackSize(size_t size);
-
- /**
- * Get the thread's desired stack size.
- *
- * @return the thread's stack size. 0 indicates that the stack size
- * has either not yet been initialized, or not yet been specified by
- * the application.
- */
- size_t getStackSize();
-
- /**
- * Print the thread's scheduling information to stdout.
- */
- void printSchedulingInfo();
-
- /**
- * Detach the thread from the calling process.
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- int detach();
-
- /**
- * Join the calling process with the thread
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- int join();
-
- /**
- * Disable thread cancelation altogether. Thread::cancel() has no effect.
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- int setCancelModeDisable();
-
- /**
- * Mark the thread to cancel aysncronously on Thread::cancel().
- * (May not be available with process-level implementations).
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- int setCancelModeAsynchronous();
-
- /**
- * Mark the thread to cancel at the earliest convenience on
- * Thread::cancel() (This is the default)
- *
- * @return 0 if normal, -1 if errno set, errno code otherwise.
- */
- int setCancelModeDeferred();
-
- /**
- * Query the thread's running status
- *
- * @return true if running, false if not.
- */
- bool isRunning();
-
- /**
- * Thread's run method. Must be implemented by derived classes.
- * This is where the action happens.
- */
- virtual void run() = 0;
-
- /**
- * Thread's cancel cleanup routine, called upon cancel(), after the
- * cancelation has taken place, but before the thread exits completely.
- * This method should be used to repair parts of the thread's data
- * that may have been damaged by a pre-mature cancel. No-op by default.
- */
- virtual void cancelCleanup() {};
-
- void* getImplementation(){ return _prvData; };
-
- /** Thread's processor affinity method. This binds a thread to a
- * processor whenever possible. This call must be made before
- * start() or startThread() and has no effect after the thread
- * has been running. In the pthreads implementation, this is only
- * implemented on sgi, through a pthread extension. On other pthread
- * platforms this is ignored. Returns 0 on success, implementation's
- * error on failure, or -1 if ignored.
- */
- int setProcessorAffinity( unsigned int cpunum );
-
- /** microSleep method, equivilant to the posix usleep(microsec).
- * This is not strictly thread API but is used
- * so often with threads. It's basically UNIX usleep. Parameter is
- * number of microseconds we current thread to sleep. Returns 0 on
- * succes, non-zero on failure (UNIX errno or GetLastError() will give
- * detailed description.
- */
- static int microSleep( unsigned int microsec);
-
-private:
-
- /**
- * The Private Actions class is allowed to operate on private data.
- */
- friend class ThreadPrivateActions;
-
- /**
- * Private copy constructor, to prevent tampering.
- */
- Thread(const Thread &/*t*/) {};
-
- /**
- * Private copy assignment, to prevent tampering.
- */
- Thread &operator=(const Thread &/*t*/) {return *(this);};
-
- /**
- * Implementation-specific data
- */
- void * _prvData;
-
- /**
- * Master thread's priority, set by Thread::Init.
- */
- static ThreadPriority s_masterThreadPriority;
-
- /**
- * Is initialized flag
- */
- static bool s_isInitialized;
-};
-
-}
-
-#endif // !_OPENTHREADS_THREAD_
diff --git a/libs/lib/mac32/include/OpenThreads/Version b/libs/lib/mac32/include/OpenThreads/Version
deleted file mode 100644
index 39e5608ecb0e9805f902dbdaf7b2c45bcb9d55a3..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/OpenThreads/Version
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*-c++-*- OpenThreads library, Copyright (C) 2002 - 2007 The Open Thread Group
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-#ifndef OPENTHREADS_VERSION
-#define OPENTHREADS_VERSION 1
-
-#include
-
-extern "C" {
-
-#define OPENTHREADS_MAJOR_VERSION 2
-#define OPENTHREADS_MINOR_VERSION 6
-#define OPENTHREADS_PATCH_VERSION 0
-#define OPENTHREADS_SOVERSION 12
-
-/** OpenThreadsGetVersion() returns the library version number.
- * Numbering convention : OpenThreads-1.0 will return 1.0 from OpenThreadsGetVersion. */
-extern OPENTHREAD_EXPORT_DIRECTIVE const char* OpenThreadsGetVersion();
-
-/** The OpenThreadsGetSOVersion() method returns the OpenSceneGraph soversion number. */
-extern OPENTHREAD_EXPORT_DIRECTIVE const char* OpenThreadsGetSOVersion();
-
-/** The OpenThreadsGetLibraryName() method returns the library name in human-friendly form. */
-extern OPENTHREAD_EXPORT_DIRECTIVE const char* OpenThreadsGetLibraryName();
-
-}
-
-#endif
diff --git a/libs/lib/mac32/include/osg/AlphaFunc b/libs/lib/mac32/include/osg/AlphaFunc
deleted file mode 100644
index c35dc3c910428c2804454dc58c812a4f9d059e55..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/osg/AlphaFunc
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-#ifndef OSG_ALPHAFUNC
-#define OSG_ALPHAFUNC 1
-
-#include
-
-#ifndef GL_ALPHA_TEST
- #define GL_ALPHA_TEST 0x0BC0
-#endif
-
-namespace osg {
-
-/** Encapsulates OpenGL glAlphaFunc.
-*/
-class OSG_EXPORT AlphaFunc : public StateAttribute
-{
- public :
-
- enum ComparisonFunction {
- NEVER = GL_NEVER,
- LESS = GL_LESS,
- EQUAL = GL_EQUAL,
- LEQUAL = GL_LEQUAL,
- GREATER = GL_GREATER,
- NOTEQUAL = GL_NOTEQUAL,
- GEQUAL = GL_GEQUAL,
- ALWAYS = GL_ALWAYS
- };
-
-
- AlphaFunc();
-
- AlphaFunc(ComparisonFunction func,float ref):
- _comparisonFunc(func),
- _referenceValue(ref) {}
-
- /** Copy constructor using CopyOp to manage deep vs shallow copy. */
- AlphaFunc(const AlphaFunc& af,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
- StateAttribute(af,copyop),
- _comparisonFunc(af._comparisonFunc),
- _referenceValue(af._referenceValue) {}
-
- META_StateAttribute(osg, AlphaFunc,ALPHAFUNC);
-
- /** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */
- virtual int compare(const StateAttribute& sa) const
- {
- // Check for equal types, then create the rhs variable
- // used by the COMPARE_StateAttribute_Parameter macros below.
- COMPARE_StateAttribute_Types(AlphaFunc,sa)
-
- // Compare each parameter in turn against the rhs.
- COMPARE_StateAttribute_Parameter(_comparisonFunc)
- COMPARE_StateAttribute_Parameter(_referenceValue)
-
- return 0; // Passed all the above comparison macros, so must be equal.
- }
-
- virtual bool getModeUsage(StateAttribute::ModeUsage& usage) const
- {
- usage.usesMode(GL_ALPHA_TEST);
- return true;
- }
-
- inline void setFunction(ComparisonFunction func,float ref)
- {
- _comparisonFunc = func;
- _referenceValue = ref;
- }
-
- inline void setFunction(ComparisonFunction func) { _comparisonFunc=func; }
- inline ComparisonFunction getFunction() const { return _comparisonFunc; }
-
- inline void setReferenceValue(float value) { _referenceValue=value; }
- inline float getReferenceValue() const { return _referenceValue; }
-
- virtual void apply(State& state) const;
-
- protected:
-
- virtual ~AlphaFunc();
-
- ComparisonFunction _comparisonFunc;
- float _referenceValue;
-
-};
-
-}
-
-#endif
diff --git a/libs/lib/mac32/include/osg/AnimationPath b/libs/lib/mac32/include/osg/AnimationPath
deleted file mode 100644
index 9062e3cd5810b71dc83fb4da57a5b972fa24cc99..0000000000000000000000000000000000000000
--- a/libs/lib/mac32/include/osg/AnimationPath
+++ /dev/null
@@ -1,314 +0,0 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
- *
- * This library is open source and may be redistributed and/or modified under
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
- * (at your option) any later version. The full license is in LICENSE file
- * included with this distribution, and on the openscenegraph.org website.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * OpenSceneGraph Public License for more details.
-*/
-
-#ifndef OSG_ANIMATIONPATH
-#define OSG_ANIMATIONPATH 1
-
-#include