diff --git a/Externals/Cg/Cg.framework/Cg b/Externals/Cg/Cg.framework/Cg
index 0ab02b4282..e5c268a826 100755
Binary files a/Externals/Cg/Cg.framework/Cg and b/Externals/Cg/Cg.framework/Cg differ
diff --git a/Externals/Cg/Cg.framework/Resources/Info.plist b/Externals/Cg/Cg.framework/Resources/Info.plist
index c32d8cd525..2c84f20b13 100644
--- a/Externals/Cg/Cg.framework/Resources/Info.plist
+++ b/Externals/Cg/Cg.framework/Resources/Info.plist
@@ -3,13 +3,13 @@
 <plist version="2.1">
 <dict>
 	<key>CFBundleGetInfoString</key>
-	<string>NVIDIA Cg version 3.0.0015</string>
+	<string>NVIDIA Cg version 3.0.0007</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.nvidia.cg</string>
 	<key>CFBundleName</key>
 	<string>NVIDIA Cg</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.0015</string>
+	<string>3.0.0007</string>
 	<key>IFMajorVersion</key>
 	<integer>3</integer>
 	<key>IFMinorVersion</key>
diff --git a/Externals/Cg/cg.h b/Externals/Cg/cg.h
index f2f95d2593..d1e1c5bc82 100644
--- a/Externals/Cg/cg.h
+++ b/Externals/Cg/cg.h
@@ -757,43 +757,43 @@ typedef enum
   CG_PROFILE_FP40    = 6151,
   CG_PROFILE_ARBFP1  = 7000,
   CG_PROFILE_VP40    = 7001,
-  CG_PROFILE_GLSLV   = 7007, /* GLSL vertex shader                                       */
-  CG_PROFILE_GLSLF   = 7008, /* GLSL fragment shader                                     */
-  CG_PROFILE_GLSLG   = 7016, /* GLSL geometry shader                                     */
-  CG_PROFILE_GLSLC   = 7009, /* Combined GLSL program                                    */
+  CG_PROFILE_GLSLV   = 7007,
+  CG_PROFILE_GLSLF   = 7008,
+  CG_PROFILE_GLSLG   = 7016,
+  CG_PROFILE_GLSLC   = 7009,
   CG_PROFILE_GPU_FP  = 7010, /* Deprecated alias for CG_PROFILE_GP4FP                    */
   CG_PROFILE_GPU_VP  = 7011, /* Deprecated alias for CG_PROFILE_GP4VP                    */
   CG_PROFILE_GPU_GP  = 7012, /* Deprecated alias for CG_PROFILE_GP4GP                    */
-  CG_PROFILE_GP4FP   = 7010, /* NV_gpu_program4 fragment program                         */
-  CG_PROFILE_GP4VP   = 7011, /* NV_gpu_program4 vertex program                           */
-  CG_PROFILE_GP4GP   = 7012, /* NV_gpu_program4 geometry program                         */
-  CG_PROFILE_GP5FP   = 7017, /* NV_gpu_program5 fragment program                         */
-  CG_PROFILE_GP5VP   = 7018, /* NV_gpu_program5 vertex program                           */
-  CG_PROFILE_GP5GP   = 7019, /* NV_gpu_program5 geometry program                         */
-  CG_PROFILE_GP5TCP  = 7020, /* NV_tessellation_program5 tessellation control program    */
-  CG_PROFILE_GP5TEP  = 7021, /* NV_tessellation_program5 tessellation evaluation program */
+  CG_PROFILE_GP4FP   = 7010,
+  CG_PROFILE_GP4VP   = 7011,
+  CG_PROFILE_GP4GP   = 7012,
+  CG_PROFILE_GP5FP   = 7017, /* NV_gpu_program5                                          */
+  CG_PROFILE_GP5VP   = 7018, /* NV_gpu_program5                                          */
+  CG_PROFILE_GP5GP   = 7019, /* NV_gpu_program5                                          */
+  CG_PROFILE_GP5TCP  = 7020, /* NV_tessellation_program5 Tessellation control program    */
+  CG_PROFILE_GP5TEP  = 7021, /* NV_tessellation_program5 Tessellation evaluation program */
   CG_PROFILE_VS_1_1  = 6153,
   CG_PROFILE_VS_2_0  = 6154,
   CG_PROFILE_VS_2_X  = 6155,
   CG_PROFILE_VS_2_SW = 6156,
+  CG_PROFILE_VS_3_0  = 6157,
+  CG_PROFILE_HLSLV   = 6158,
   CG_PROFILE_PS_1_1  = 6159,
   CG_PROFILE_PS_1_2  = 6160,
   CG_PROFILE_PS_1_3  = 6161,
   CG_PROFILE_PS_2_0  = 6162,
   CG_PROFILE_PS_2_X  = 6163,
   CG_PROFILE_PS_2_SW = 6164,
-  CG_PROFILE_VS_3_0  = 6157, /* DX9 vertex shader                                        */
-  CG_PROFILE_PS_3_0  = 6165, /* DX9 pixel shader                                         */
-  CG_PROFILE_HLSLV   = 6158, /* DX9 HLSL vertex shader                                   */
-  CG_PROFILE_HLSLF   = 6166, /* DX9 HLSL fragment shader                                 */
-  CG_PROFILE_VS_4_0  = 6167, /* DX10 vertex shader                                       */
-  CG_PROFILE_PS_4_0  = 6168, /* DX10 pixel shader                                        */
-  CG_PROFILE_GS_4_0  = 6169, /* DX10 geometry shader                                     */
-  CG_PROFILE_VS_5_0  = 6170, /* DX11 vertex shader                                       */
-  CG_PROFILE_PS_5_0  = 6171, /* DX11 pixel shader                                        */
-  CG_PROFILE_GS_5_0  = 6172, /* DX11 geometry shader                                     */
-  CG_PROFILE_HS_5_0  = 6173, /* DX11 hull shader (tessellation control)                  */
-  CG_PROFILE_DS_5_0  = 6174, /* DX11 domain shader (tessellation evaluation)             */
+  CG_PROFILE_PS_3_0  = 6165,
+  CG_PROFILE_HLSLF   = 6166,
+  CG_PROFILE_VS_4_0  = 6167,
+  CG_PROFILE_PS_4_0  = 6168,
+  CG_PROFILE_GS_4_0  = 6169,
+  CG_PROFILE_VS_5_0  = 6170,
+  CG_PROFILE_PS_5_0  = 6171,
+  CG_PROFILE_GS_5_0  = 6172,
+  CG_PROFILE_HS_5_0  = 6173,
+  CG_PROFILE_DS_5_0  = 6174,
   CG_PROFILE_GENERIC = 7002
 } CGprofile;
 
diff --git a/SConstruct b/SConstruct
index 5a4a2303e6..02c41c20f3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -122,8 +122,8 @@ if sys.platform == 'darwin':
     env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof']
     env['CCFLAGS'] += ['-march=core2', '-mdynamic-no-pic']
     env['CCFLAGS'] += ['-Xarch_i386', '-msse3', '-Xarch_x86_64', '-mssse3']
-    env['CC'] = 'llvm-gcc'
-    env['CXX'] = 'llvm-g++'
+    env['CC'] = '/Developer/usr/bin/llvm-gcc'
+    env['CXX'] = '/Developer/usr/bin/llvm-g++'
     env['CXXFLAGS'] += ['-x', 'objective-c++']
     env['FRAMEWORKS'] += ['AppKit', 'Carbon', 'CoreFoundation', 'CoreServices']
     env['FRAMEWORKS'] += ['AudioToolbox', 'AudioUnit', 'CoreAudio', 'WebKit']