diff --git a/.cproject b/.cproject deleted file mode 100644 index 2e8a70c9..00000000 --- a/.cproject +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sh - jack2.sh - install - true - true - true - - - - diff --git a/.project b/.project deleted file mode 100644 index bc6650cf..00000000 --- a/.project +++ /dev/null @@ -1,40 +0,0 @@ - - - jack2 - - - - - - org.python.pydev.PyDevBuilder - - - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, - - - - - org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder - full,incremental, - - - - - - org.eclipse.cdt.core.cnature - org.eclipse.cdt.core.ccnature - org.eclipse.cdt.managedbuilder.core.managedBuildNature - org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - org.python.pydev.pythonNature - - - - out - 2 - /home/coopera/Developer/gear/out/sdkbuild/build/target/jack2 - - - diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml deleted file mode 100644 index 37a3b954..00000000 --- a/.settings/language.settings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/.settings/org.eclipse.cdt.codan.core.prefs b/.settings/org.eclipse.cdt.codan.core.prefs deleted file mode 100644 index 1b60eb09..00000000 --- a/.settings/org.eclipse.cdt.codan.core.prefs +++ /dev/null @@ -1,69 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.cdt.codan.checkers.errnoreturn=-Warning -org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.checkers.errreturnvalue=-Error -org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.checkers.noreturn=-Error -org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false} -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error -org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error -org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>false,empty_case_param\=>false} -org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning -org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error -org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning -org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true} -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error -org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info -org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error -org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()} -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false} -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false} -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true} -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning -org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")} -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error -org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} -org.eclipse.cdt.qt.core.qtproblem=-Warning -org.eclipse.cdt.qt.core.qtproblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_ON_FILE_OPEN\=>true,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} diff --git a/.settings/org.eclipse.cdt.core.prefs b/.settings/org.eclipse.cdt.core.prefs deleted file mode 100644 index cbf998b3..00000000 --- a/.settings/org.eclipse.cdt.core.prefs +++ /dev/null @@ -1,18 +0,0 @@ -eclipse.preferences.version=1 -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/MAKEFLAGS/delimiter=\: -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/MAKEFLAGS/operation=append -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/MAKEFLAGS/value=-I/opt/qnx660/target/qnx6/usr/include -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/PATH/delimiter=\: -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/PATH/operation=replace -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/PATH/value=/opt/qnx660/host/linux/x86/usr/bin\:/opt/qnx660/.qnx/bin\:/opt/qnx660/jre/bin\:/opt/qnx660/host/linux/x86/usr/bin\:/opt/qnx660/.qnx/bin\:/opt/qnx660/jre/bin\:/home/coopera/.local/bin\:/usr/lib/qt-3.3/bin\:/usr/local/bin\:/usr/local/sbin\:/usr/bin\:/usr/sbin\:/bin\:/sbin -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/QNX_CONFIGURATION/delimiter=\: -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/QNX_CONFIGURATION/operation=replace -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/QNX_CONFIGURATION/value=/opt/qnx660/.qnx -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/QNX_HOST/delimiter=\: -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/QNX_HOST/operation=replace -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/QNX_HOST/value=/opt/qnx660/host/linux/x86 -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/QNX_TARGET/delimiter=\: -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/QNX_TARGET/operation=append -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/QNX_TARGET/value=/opt/qnx660/target/qnx6 -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/append=true -environment/project/cdt.managedbuild.toolchain.gnu.base.60399999/appendContributed=false diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index c2de88c1..00000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -encoding//common/wscript=utf-8 -encoding//example-clients/wscript=utf-8 -encoding//linux/wscript=utf-8 -encoding//tests/wscript=utf-8 -encoding/waf=ISO8859-1 -encoding/wscript=utf-8 diff --git a/install.sh b/install.sh deleted file mode 100755 index 501a5e6a..00000000 --- a/install.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -rsync -ai --exclude=usr/share /home/coopera/Developer/gear/out/sdkbuild/install/target/jack2/ /home/coopera/Developer/gear/out/sdkbuild/staging/target/ -rsync -ai --exclude=usr/share --exclude='*.sym' --exclude='*.h' /home/coopera/Developer/gear/out/sdkbuild/install/target/jack2/ /mnt/gear/ diff --git a/jack2.sh b/jack2.sh deleted file mode 100755 index a15e5800..00000000 --- a/jack2.sh +++ /dev/null @@ -1,173 +0,0 @@ -#!/bin/sh - -export NOCLIMB=1 -export OUT_DIR=/home/coopera/Developer/gear/out/sdkbuild -export PKG=jack2 - -if [ -z $QNX_VERSION ]; then - QNX_VERSION=660 -fi - -setup_dirs() { - # Set up the package's fetch and build directories - FETCH_ROOT=$OUT_DIR/fetch - BUILD_ROOT=$OUT_DIR/build - HOST_BUILD_ROOT=$BUILD_ROOT/host - TARGET_BUILD_ROOT=$BUILD_ROOT/target - INSTALL_ROOT=$OUT_DIR/install - HOST_INSTALL_ROOT=$INSTALL_ROOT/host - TARGET_INSTALL_ROOT=$INSTALL_ROOT/target - STAGING_DIR=$OUT_DIR/staging - HOST_STAGING_DIR=$STAGING_DIR/host - TARGET_STAGING_DIR=$STAGING_DIR/target - ARCHIVE_DIR=$OUT_DIR/archive - mkdir -p $HOST_INSTALL_ROOT $TARGET_INSTALL_ROOT -} - -setup_platform() { - - # Determine the platform we are running on - case $(uname -s) in - *MINGW* ) - if [ -z $(which gcc) ]; then - echo "This script must be run from a MinGW shell." - exit 1 - fi - PLATFORM=win32 - - # Put the win32 wrapper directory into the path - WIN32=$ROOT/win32 - QNX_PATH=$WIN32/qnx${QNX_VERSION} - export PATH=$WIN32:$QNX_PATH:$PATH - - ;; - - *Linux* ) - PLATFORM=linux - QNX_PATH=/opt/qnx${QNX_VERSION} - ;; - esac - - # Aggressively error out (even if the current command is for a host - # portion of the build) - if [ ! -d $QNX_PATH ]; then - echo "Unsupported QNX version $QNX_VERSION" - exit 1 - fi - - # SDP 6.6.0 has a shell programming construct in its /opt/qnx660-env.sh - # script that 'set -e' doesn't like. We have to temporarily disable it. - case "$-" in - *e* ) - set +e - . $QNX_PATH/qnx${QNX_VERSION}-env.sh - set -e - ;; - * ) - . $QNX_PATH/qnx${QNX_VERSION}-env.sh - ;; - esac -} - -# Set up the build environment for either a host- or cross-build -setup_env() { - local type=$1 - case $type in - host ) - export PKG_CONFIG_LIBDIR=$HOST_STAGING_DIR/usr/lib/pkgconfig - if [ $PLATFORM != win32 ]; then - # Windows pkg-config will auto-guess the sysroot - export PKG_CONFIG_SYSROOT_DIR=$HOST_STAGING_DIR - fi - export CPPFLAGS=-I$HOST_STAGING_DIR/usr/include - export LDFLAGS=-L$HOST_STAGING_DIR/usr/lib - export OBJCOPY=objcopy - export STRIP=strip - export READELF=readelf - unset CC - unset CXX - unset LD - - case $PLATFORM in - linux ) - export CFLAGS="-m32" - export CXXFLAGS="-m32" - export LDFLAGS="$LDFLAGS -m32" - ;; - * ) - unset CFLAGS - unset CXXFLAGS - esac - ;; - target ) - case $QNX_VERSION in - platform8 ) - export QNX_TRIPLET=arm-unknown-nto-qnx8.0.0eabi - ;; - 660 ) - export QNX_TRIPLET=arm-unknown-nto-qnx6.6.0eabi - ;; - * ) - echo "Unsupported QNX version $QNX_VERSION" - exit 1 - ;; - esac - - export PKG_CONFIG_LIBDIR=$TARGET_STAGING_DIR/usr/lib/pkgconfig - if [ $PLATFORM != win32 ]; then - # Windows pkg-config will auto-guess the sysroot - export PKG_CONFIG_SYSROOT_DIR=$TARGET_STAGING_DIR - fi - export AR=${QNX_TRIPLET}-ar - export CPPFLAGS=-I$TARGET_STAGING_DIR/usr/include - export LDFLAGS=-L$TARGET_STAGING_DIR/usr/lib - - #export CC="qcc -Vgcc_ntoarmv7le" - #export CXX="qcc -Vgcc_ntoarmv7le -lang-c++" - export CC=${QNX_TRIPLET}-gcc - export CXX=${QNX_TRIPLET}-g++ - export LD=${QNX_TRIPLET}-ld - export OBJCOPY=${QNX_TRIPLET}-objcopy - export STRIP=${QNX_TRIPLET}-strip - export READELF=${QNX_TRIPLET}-readelf - export CFLAGS="-g -funwind-tables" - unset CXXFLAGS - ;; - esac - - export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 - export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 - export PATH=$HOST_STAGING_DIR/usr/bin:$PATH - - if [ $PLATFORM = win32 ]; then - # Windows pkg-config does not supply a pkg.m4 file to aclocal, so we must supply our own - export ACLOCAL_FLAGS="-I $ROOT/aclocal" - fi -} - -setup_dirs -setup_platform -setup_env target - -# Set up all of the directories -FETCH_DIR=$FETCH_ROOT/$PKG -HOST_BUILD_DIR=$HOST_BUILD_ROOT/$PKG -TARGET_BUILD_DIR=$TARGET_BUILD_ROOT/$PKG -HOST_INSTALL_DIR=$HOST_INSTALL_ROOT/$PKG -TARGET_INSTALL_DIR=$TARGET_INSTALL_ROOT/$PKG -mkdir -p $HOST_BUILD_DIR $TARGET_BUILD_DIR $HOST_INSTALL_DIR $TARGET_INSTALL_DIR $HOST_STAGING_DIR $TARGET_STAGING_DIR - -exec ./waf \ - --debug\ - --out=${TARGET_BUILD_DIR}\ - --prefix=/usr\ - --destdir=${TARGET_INSTALL_DIR}\ - --dist-target=qnx\ - --doxygen=no\ - --samplerate=yes\ - --sndfile=yes\ - --ioaudio=yes\ - --check-cxx-compiler=qcc\ - --check-c-compiler=qcc\ - --ports-per-application=16\ - configure "$@" diff --git a/qnx/ioaudio/JackIoAudioDriver.cpp b/qnx/ioaudio/JackIoAudioDriver.cpp index 2841cdfb..d6c203f8 100644 --- a/qnx/ioaudio/JackIoAudioDriver.cpp +++ b/qnx/ioaudio/JackIoAudioDriver.cpp @@ -64,11 +64,6 @@ #include "JackError.h" -static struct jack_constraint_enum_str_descriptor midi_constraint_descr_array[] = - { { "none", "no MIDI driver" }, { "seq", "io-audio Sequencer driver" }, { - "raw", "io-audio RawMIDI driver" }, - { 0 } }; - static struct jack_constraint_enum_char_descriptor dither_constraint_descr_array[] = { { 'n', "none" }, { 'r', "rectangular" }, { 's', "shaped" }, { 't', "triangular" }, { 0 } }; @@ -164,9 +159,6 @@ namespace Jack JackIoAudioDriver::~JackIoAudioDriver() { - //if (fmidi) - // (midi->destroy)(midi); - if( capture.handle ) { snd_pcm_close( capture.handle ); @@ -300,12 +292,6 @@ namespace Jack update_latencies(); - //if (midi) { - // int err = (midi->attach)(midi); - // if (err) - // jack_error ("io-audio: cannot attach MIDI: %d", err); - //} - return 0; } @@ -314,8 +300,6 @@ namespace Jack // Generic audio driver close int res = JackAudioDriver::Close(); -// destroy(); - if( JackServerGlobals::on_device_release != NULL ) { char audio_name[32]; @@ -345,10 +329,6 @@ namespace Jack int JackIoAudioDriver::Detach() { - //ioaudio_driver_t* ioaudio_driver = (ioaudio_driver_t*)fDriver; - //if (midi) - // (midi->detach)(midi); - return JackAudioDriver::Detach(); } @@ -372,14 +352,6 @@ namespace Jack return -1; } - //ioaudio_midi_t *midi = 0; - //if (strcmp(midi_driver_name, "seq") == 0) - // midi = ioaudio_seqmidi_new((jack_client_t*)this, 0); - //else if (strcmp(midi_driver_name, "raw") == 0) - // midi = ioaudio_rawmidi_new((jack_client_t*)this); - - //midi = midi_driver; - err = check_card_type(); if( err ) { @@ -710,9 +682,6 @@ namespace Jack hw->set_input_monitor_mask( 0 ); } - //if (midi && !xrun_recovery) - // (midi->stop)(midi); - res = JackAudioDriver::Stop(); return res; @@ -726,7 +695,6 @@ namespace Jack ssize_t nwritten; ssize_t contiguous; size_t offset = 0; - //jack_port_t *port; int err; process_count++; @@ -741,9 +709,6 @@ namespace Jack return -1; } - //if (midi) - // (midi->write)(midi, nframes); - nwritten = 0; contiguous = 0; orig_nframes = nframes; @@ -1151,9 +1116,6 @@ namespace Jack return -1; } - //if (midi) - // (midi->read)(midi, nframes); - if( !capture.handle ) { return 0; @@ -1831,9 +1793,6 @@ namespace Jack } in_xrun_recovery = 0; - //if (res && midi) - // (midi->stop)(midi); - if( 0 != res ) { return -1; @@ -2185,21 +2144,6 @@ namespace Jack "Extra output latency (frames)", NULL ); - strcpy( value.str, - "none" ); - jack_driver_descriptor_add_parameter( desc, - &filler, - "midi-driver", - 'X', - JackDriverParamString, - &value, - jack_constraint_compose_enum_str( - JACK_CONSTRAINT_FLAG_STRICT - | JACK_CONSTRAINT_FLAG_FAKE_VALUE, - midi_constraint_descr_array ), - "io-audio MIDI driver", - NULL ); - return desc; } @@ -2228,7 +2172,6 @@ namespace Jack args.shorts_first = false; args.systemic_input_latency = 0; args.systemic_output_latency = 0; - args.midi_driver = "none"; const JSList * node; const jack_driver_param_t * param; @@ -2345,10 +2288,6 @@ namespace Jack case 'O': args.systemic_output_latency = param->value.ui; break; - - case 'X': - args.midi_driver = strdup( param->value.str ); - break; } } diff --git a/qnx/ioaudio/JackIoAudioDriver.h b/qnx/ioaudio/JackIoAudioDriver.h index 8193df80..16aea909 100644 --- a/qnx/ioaudio/JackIoAudioDriver.h +++ b/qnx/ioaudio/JackIoAudioDriver.h @@ -97,7 +97,6 @@ namespace Jack bool shorts_first; size_t systemic_input_latency; size_t systemic_output_latency; - const char* midi_driver; }; struct Voice @@ -214,8 +213,6 @@ namespace Jack int xrun_count; int process_count; - //ioaudio_midi_t *midi; - //char *midi; int in_xrun_recovery; int check_capabilities( diff --git a/qnx/wscript b/qnx/wscript index 9202d209..3eabd0ad 100644 --- a/qnx/wscript +++ b/qnx/wscript @@ -49,4 +49,3 @@ def build(bld): 'ioaudio/JackIoAudioDriver.cpp', ] create_jack_driver_obj(bld, 'ioaudio', ioaudio_driver_src, ['IOAUDIO', 'PTHREAD']) - \ No newline at end of file