Merge pull request #1472 from GeoffreyPlitt/master

Fix Mac build on CircleCI

circle.yml

@@ -1,4 +1,21 @@
+machine:
+  environment:
+    XCODE_PROJECT: apple/RetroArch_OSX.xcodeproj
+    XCODE_SCHEME: RetroArch_OSX
+
+dependencies:
+  post:
+    - ./fetch-submodules.sh
+    - echo 'Installing Cg'
+    - curl http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012.dmg > Cg.dmg
+    - hdiutil mount Cg.dmg
+    - cp /Volumes/Cg-3.1.0013/Cg-3.1.0013.app/Contents/Resources/Installer\ Items/NVIDIA_Cg.tgz /tmp
+    - cd /tmp && tar -zxvf NVIDIA_Cg.tgz
+    - sudo cp -r /tmp/Library/Frameworks/Cg.framework /Library/Frameworks
 test:
   override:
     - xcodebuild -target RetroArch_OSX -configuration Debug -project apple/RetroArch_OSX.xcodeproj
     - xcodebuild -target RetroArch_OSX -configuration Release -project apple/RetroArch_OSX.xcodeproj
+    - rm -rf ./apple/build/Release/RetroArch_OSX.app.dSYM
+    - cd ./apple/build && zip -r build.zip Debug Release
+    - cp -R ./apple/build/build.zip $CIRCLE_ARTIFACTS

qb/qb.libs.sh

@@ -45,7 +45,7 @@ check_lib()	#$1 = HAVE_$1	$2 = lib	$3 = function in lib	$4 = extralibs $5 = head
 		exit 1
 	}
 
-	/bin/true
+	true
 }
 
 check_lib_cxx()	#$1 = HAVE_$1	$2 = lib	$3 = function in lib	$4 = extralibs	$5 = critical error message [checked only if non-empty]
@@ -73,7 +73,7 @@ check_lib_cxx()	#$1 = HAVE_$1	$2 = lib	$3 = function in lib	$4 = extralibs	$5 =
 	
 	}
 
-	/bin/true
+	true
 }
 
 check_code_c()