From 1ec06bd7d00d6f3dba16a3cc871ebe5fa8c22b01 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Tue, 21 May 2013 16:08:56 -0700
Subject: [PATCH] Tweaking compile options and switching back to VS2010.

---
 common.gypi                      | 8 +++++---
 src/xenia/cpu/ppc/instr_tables.h | 2 +-
 third_party/libjit               | 2 +-
 xenia-build.py                   | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/common.gypi b/common.gypi
index 0dac659a5..deb3643d7 100644
--- a/common.gypi
+++ b/common.gypi
@@ -29,6 +29,7 @@
       ['OS == "win"', {
         'defines': [
           '_WIN64=1',
+          '_AMD64_=1',
         ],
       }],
     ],
@@ -52,7 +53,7 @@
         'msvs_cygwin_shell': '0',
         'msvs_settings': {
           'VCCLCompilerTool': {
-            #'MinimalRebuild': 'false',
+            #'MinimalRebuild': 'true',
             'BufferSecurityCheck': 'true',
             'EnableFunctionLevelLinking': 'true',
             'RuntimeTypeInfo': 'false',
@@ -61,8 +62,9 @@
             'DebugInformationFormat': '3',
             'ExceptionHandling': '1', # /EHsc
             'AdditionalOptions': [
-              '/MP', # Multiprocessor
-              '/TP', # Compile as C++
+              '/MP',    # Multiprocessor build
+              '/TP',    # Compile as C++
+              '/EHsc',  # C++ exception handling,
             ],
           },
           #'VCLibrarianTool': {
diff --git a/src/xenia/cpu/ppc/instr_tables.h b/src/xenia/cpu/ppc/instr_tables.h
index 73659ba6e..a976a03fd 100644
--- a/src/xenia/cpu/ppc/instr_tables.h
+++ b/src/xenia/cpu/ppc/instr_tables.h
@@ -21,7 +21,7 @@ namespace tables {
 
 static InstrType* instr_table_prep(
     InstrType* unprep, int unprep_count, int a, int b) {
-  int prep_count = (int)pow(2, b - a + 1);
+  int prep_count = (int)pow(2.0, b - a + 1);
   InstrType* prep = (InstrType*)xe_calloc(prep_count * sizeof(InstrType));
   for (int n = 0; n < unprep_count; n++) {
     int ordinal = XESELECTBITS(unprep[n].opcode, a, b);
diff --git a/third_party/libjit b/third_party/libjit
index 542a478da..8f8233e31 160000
--- a/third_party/libjit
+++ b/third_party/libjit
@@ -1 +1 @@
-Subproject commit 542a478da976013a748f37e83825c95d45a965ec
+Subproject commit 8f8233e31fa6eeef67c29bf8e84a4384a1a0388b
diff --git a/xenia-build.py b/xenia-build.py
index d16c30762..d1b7a47c0 100755
--- a/xenia-build.py
+++ b/xenia-build.py
@@ -300,7 +300,7 @@ def run_gyp(format):
       '-f %s' % (format),
       # Set the VS version.
       # TODO(benvanik): allow user to set?
-      '-G msvs_version=2012e',
+      '-G msvs_version=2010',
       # Removes the out/ from ninja builds.
       '-G output_dir=.',
       '--depth=.',