Tweaking compile options and switching back to VS2010.
This commit is contained in:
parent
85804f7415
commit
1ec06bd7d0
|
@ -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': {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 542a478da976013a748f37e83825c95d45a965ec
|
||||
Subproject commit 8f8233e31fa6eeef67c29bf8e84a4384a1a0388b
|
|
@ -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=.',
|
||||
|
|
Loading…
Reference in New Issue