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

.travis.yml

@@ -92,10 +92,10 @@ 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 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 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 -G"Unix Makefiles" ..; fi