Merge branch 'master' of https://github.com/q-gears/q-gears

.travis.yml

@@ -92,15 +92,15 @@ script:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OGRE_SDK=/Users/travis/build/q-gears/q-gears/OgreSDK; fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OIS_HOME=/Users/travis/build/q-gears/q-gears/Dependencies; fi
 
-#- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -DCMAKE_INSTALL_PREFIX=/usr /Volumes/OgreSDK/OgreSDK; fi
-#- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make install /Volumes/OgreSDK/OgreSDK; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export C_FLAGS=-m32; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CXX_FLAGS=-m32; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export L_FLAGS=-m32; fi
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export LD_FLAGS=-m32; fi
 
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -GXcode ..; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ls .; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xcodebuild ARCHS=i386 ONLY_ACTIVE_ARCH=NO -configuration Release; fi
+
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -G"Unix Makefiles" ..; fi
 
 
-#- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cat /Users/travis/build/q-gears/q-gears/build_qgears/CMakeFiles/CMakeOutput.log; fi
 
 - if [[ ${COVERITY_SCAN_BRANCH} != 1 ]]; then make -j2; fi
 - if [[ ${COVERITY_SCAN_BRANCH} != 1 ]]; then cpack -C Release; fi
@@ -140,10 +140,10 @@ after_success:
 - chmod 700 ~/.ssh
 - md5sum ~/.ssh/id_rsa
 
-- if [[ $TRAVIS_PULL_REQUEST == 'false' && ${COVERITY_SCAN_BRANCH} != 1 && "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then ssh -o StrictHostKeyChecking=no paul@itscovarr.com mkdir -p /var/www/storage/qgears/$hash/linux/ fi
-- if [[ $TRAVIS_PULL_REQUEST == 'false' && ${COVERITY_SCAN_BRANCH} != 1 && "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then scp -o StrictHostKeyChecking=no ~/build/q-gears/q-gears/build_qgears/*.deb paul@itscovarr.com:/var/www/storage/qgears/$hash/linux/ fi
+- if [[ $TRAVIS_PULL_REQUEST == 'false' && ${COVERITY_SCAN_BRANCH} != 1 && "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then ssh -o StrictHostKeyChecking=no paul@itscovarr.com mkdir -p /var/www/storage/qgears/$hash/linux/; fi
+- if [[ $TRAVIS_PULL_REQUEST == 'false' && ${COVERITY_SCAN_BRANCH} != 1 && "$TRAVIS_OS_NAME" == "linux" && "$CXX" == "g++" ]]; then scp -o StrictHostKeyChecking=no ~/build/q-gears/q-gears/build_qgears/*.deb paul@itscovarr.com:/var/www/storage/qgears/$hash/linux/; fi
 
-- if [[ $TRAVIS_PULL_REQUEST == 'false' && ${COVERITY_SCAN_BRANCH} != 1 && "$TRAVIS_OS_NAME" == "osx" && "$CXX" == "clang" ]]; then ssh -o StrictHostKeyChecking=no paul@itscovarr.com mkdir -p /var/www/storage/qgears/$hash/mac/ fi
+- if [[ $TRAVIS_PULL_REQUEST == 'false' && ${COVERITY_SCAN_BRANCH} != 1 && "$TRAVIS_OS_NAME" == "osx" && "$CXX" == "clang" ]]; then ssh -o StrictHostKeyChecking=no paul@itscovarr.com mkdir -p /var/www/storage/qgears/$hash/mac/; fi
 
 
 notifications: 

CMakeLists.txt

@@ -7,6 +7,12 @@ set(QGears_VERSION_MAJOR 0)
 set(QGears_VERSION_MINOR 22)
 set(QGears_VERSION_PATCH 0)
 
+if (APPLE)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32")
+endif()
+
 set(CMAKE_FRAMEWORK_PATH
       ${CMAKE_FRAMEWORK_PATH}
        /Users/travis/build/q-gears/q-gears/OgreSDK/lib/macosx/Release

dependencies/luajit

@@ -1 +1 @@
-Subproject commit 6c4a18258631ff01f963e9a1e64df57d7a453fd6
+Subproject commit b9628b8964005ae862587b469342494c8df4e22e

output/data

@@ -1 +1 @@
-Subproject commit 9f1f1be0aeacb9c5eaf337e05a90157a34ea6936
+Subproject commit 83152bb0ae951d4af8ecdb81de19a706e734c862