Paul 11 лет назад
Родитель
Сommit
4b7ccea932
2 измененных файлов с 6 добавлено и 3 удалено
  1. 4 1
      CIBuild/osx/dependencies.sh
  2. 2 2
      Tests/FinalFantasy7/CMakeLists.txt

+ 4 - 1
CIBuild/osx/dependencies.sh

@@ -1,17 +1,20 @@
 brew update
 # brew doctor
 # brew outdated wget || brew upgrade wget
+echo "Download deps"
 brew install qt
 wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/OgreDependencies_OSX_libc._20130610.zip
 wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/NVIDIA_Cg.tgz
 wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/OgreSDK.zip
+echo "Install deps"
 unzip OgreSDK.zip >> OgreSDK_extract.log
 sudo tar xfzC NVIDIA_Cg.tgz /
 unzip OgreDependencies_OSX_libc._20130610.zip >> extract.log
+echo "Setup env vars"
 export OGRE_HOME=${PWD}/../OgreSDK
 export OGRE_SDK=${PWD}/../OgreSDK
 export OIS_HOME=${PWD}/../Dependencies
-
+echo "Env vars are $OGRE_SDK and $OIS_HOME"
 # Overwrite broken symlink with actual file
 cp ${OGRE_SDK}/lib/macosx/Release/Ogre.framework/Versions/1.9.0/Ogre ${OGRE_SDK}/lib/macosx/Release/Ogre.framework/Ogre
 cp ${OGRE_SDK}/lib/macosx/Release/OgreOverlay.framework/Versions/1.9.0/OgreOverlay ${OGRE_SDK}/lib/macosx/Release/OgreOverlay.framework/OgreOverlay

+ 2 - 2
Tests/FinalFantasy7/CMakeLists.txt

@@ -8,9 +8,9 @@ include_directories(
 
 set(LIBRARIES
     ${QGears_TEST_LIBRARIES}
-    QGearsMain
-	q-gears-data
     FinalFantasy7
+	QGearsMain
+	q-gears-data
 )
 
 add_executable(TestFF7FLevelFileSerializer