ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweaking compile options and switching back to VS2010.

This commit is contained in:
Ben Vanik 2013-05-21 16:08:56 -07:00
parent 85804f7415
commit 1ec06bd7d0
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.gypi
View File

@ -29,6 +29,7 @@
['OS == "win"', { ['OS == "win"', {
'defines': [ 'defines': [
'_WIN64=1', '_WIN64=1',
'_AMD64_=1',
], ],
}], }],
], ],
@ -52,7 +53,7 @@
'msvs_cygwin_shell': '0', 'msvs_cygwin_shell': '0',
'msvs_settings': { 'msvs_settings': {
'VCCLCompilerTool': { 'VCCLCompilerTool': {
#'MinimalRebuild': 'false', #'MinimalRebuild': 'true',
'BufferSecurityCheck': 'true', 'BufferSecurityCheck': 'true',
'EnableFunctionLevelLinking': 'true', 'EnableFunctionLevelLinking': 'true',
'RuntimeTypeInfo': 'false', 'RuntimeTypeInfo': 'false',
@ -61,8 +62,9 @@
'DebugInformationFormat': '3', 'DebugInformationFormat': '3',
'ExceptionHandling': '1', # /EHsc 'ExceptionHandling': '1', # /EHsc
'AdditionalOptions': [ 'AdditionalOptions': [
'/MP', # Multiprocessor '/MP', # Multiprocessor build
'/TP', # Compile as C++ '/TP', # Compile as C++
'/EHsc', # C++ exception handling,
], ],
}, },
#'VCLibrarianTool': { #'VCLibrarianTool': {

2
src/xenia/cpu/ppc/instr_tables.h
View File

@ -21,7 +21,7 @@ namespace tables {
static InstrType* instr_table_prep( static InstrType* instr_table_prep(
InstrType* unprep, int unprep_count, int a, int b) { 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)); InstrType* prep = (InstrType*)xe_calloc(prep_count * sizeof(InstrType));
for (int n = 0; n < unprep_count; n++) { for (int n = 0; n < unprep_count; n++) {
int ordinal = XESELECTBITS(unprep[n].opcode, a, b); int ordinal = XESELECTBITS(unprep[n].opcode, a, b);

2
third_party/libjit vendored

@ -1 +1 @@
Subproject commit 542a478da976013a748f37e83825c95d45a965ec Subproject commit 8f8233e31fa6eeef67c29bf8e84a4384a1a0388b

2
xenia-build.py
View File

@ -300,7 +300,7 @@ def run_gyp(format):
'-f %s' % (format), '-f %s' % (format),
# Set the VS version. # Set the VS version.
# TODO(benvanik): allow user to set? # TODO(benvanik): allow user to set?
'-G msvs_version=2012e', '-G msvs_version=2010',
# Removes the out/ from ninja builds. # Removes the out/ from ninja builds.
'-G output_dir=.', '-G output_dir=.',
'--depth=.', '--depth=.',