From 6e437c449b485265d0466ef2708540ca73a37be3 Mon Sep 17 00:00:00 2001
From: Geoffrey Plitt <geoff@gweb.org>
Date: Tue, 3 Mar 2015 16:07:04 -0800
Subject: [PATCH] Mac OS X / CircleCI fixes

adding artifact step

installing Cg

curl instead of wget

specifying the xcodeproject path

fixing path

troubleshooting

adding configure step

fixing configure step

adding submodule fetch step

disabling artifact step

using zip to upload just one file to artifacts

fine tuning build.zip

bugfix

undoing whitespace changes

fixing zip step
---
 circle.yml    | 17 +++++++++++++++++
 qb/qb.libs.sh |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index d1a9f55d85..4d16967bc8 100644
--- a/circle.yml
+++ b/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
diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh
index 6086786147..f73ebca7a2 100644
--- a/qb/qb.libs.sh
+++ b/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()