diff --git a/common.gypi b/common.gypi
index 9624a88a6..3bec009e0 100644
--- a/common.gypi
+++ b/common.gypi
@@ -132,11 +132,17 @@
           'SYMROOT': '<(DEPTH)/build/xenia/',
           'ALWAYS_SEARCH_USER_PATHS': 'NO',
           'ARCHS': ['x86_64'],
+          #'CLANG_CXX_LANGUAGE_STANDARD': 'c++0x',
+          'COMBINE_HIDPI_IMAGES': 'YES',
           'GCC_C_LANGUAGE_STANDARD': 'c99',
+          'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
           'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',
           'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',
+          'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
           'WARNING_CFLAGS': ['-Wall', '-Wendif-labels'],
-          'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
+          'LIBRARY_SEARCH_PATHS': [
+            '<@(llvm_libdir)',
+          ],
         },
 
         'defines': [
diff --git a/private/runtest.sh b/private/runtest.sh
index af3e573ee..bebfcfc94 100755
--- a/private/runtest.sh
+++ b/private/runtest.sh
@@ -14,7 +14,7 @@ fi
     --trace_kernel_calls=true \
     --trace_user_calls=true \
     --trace_instructions=false \
-    --abort_before_entry=true \
+    \#--abort_before_entry=true \
     1>build/run.txt
     #2>build/run.llvm.txt \
 
diff --git a/src/cpu/codegen/function_generator.cc b/src/cpu/codegen/function_generator.cc
index 76170f274..8bc8809fa 100644
--- a/src/cpu/codegen/function_generator.cc
+++ b/src/cpu/codegen/function_generator.cc
@@ -602,7 +602,7 @@ void FunctionGenerator::FillRegisters() {
   }
 
   // Note that we skip zero.
-  for (int n = 0; n < XECOUNT(locals_.gpr); n++) {
+  for (size_t n = 0; n < XECOUNT(locals_.gpr); n++) {
     if (locals_.gpr[n]) {
       b.CreateStore(LoadStateValue(
           offsetof(xe_ppc_state_t, r) + 8 * n,
diff --git a/src/kernel/modules/xbdm/xbdm_table.h b/src/kernel/modules/xbdm/xbdm_table.h
index db482629b..e1fd6227b 100644
--- a/src/kernel/modules/xbdm/xbdm_table.h
+++ b/src/kernel/modules/xbdm/xbdm_table.h
@@ -22,7 +22,7 @@ namespace xbdm {
 
 
 static KernelExport xbdm_export_table[] = {
-  0,
+  { 0 },
 };
 
 
diff --git a/xenia.gyp b/xenia.gyp
index 78bd33366..9cea94ee1 100644
--- a/xenia.gyp
+++ b/xenia.gyp
@@ -84,20 +84,20 @@
             ],
           }],
           ['_type=="executable"', {
-            'libraries': [
-              '<@(llvm_libs)',
+            'conditions': [
+              ['OS != "mac"', {
+                'libraries': [
+                  '<@(llvm_libs)',
+                ],
+              }],
+              ['OS == "mac"', {
+                'xcode_settings': {
+                  'OTHER_LDFLAGS': [
+                    '<!@(<(llvm_config) --libs all)',
+                  ],
+                },
+              }],
             ],
-            'library_dirs': [
-              # NOTE: this doesn't actually do anything...
-              # http://code.google.com/p/gyp/issues/detail?id=130
-              #'<!@(<(llvm_config) --libdir)',
-            ],
-            'xcode_settings': {
-              'OTHER_LDFLAGS': [
-                #'<!@(<(llvm_config) --ldflags)',
-                #'<!@(<(llvm_config) --libs all)',
-              ],
-            },
           }],
         ],
       },