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

Switching debug/release to the canonical Debug/Release.

This commit is contained in:
Ben Vanik 2013-11-16 01:58:42 -08:00
parent 443e0308e7
commit 31243eb096
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xenia.gyp
View File

@ -12,9 +12,9 @@
'variables': { 'variables': {
'configurations': { 'configurations': {
'debug': { 'Debug': {
}, },
'release': { 'Release': {
}, },
}, },
@ -77,22 +77,12 @@
'/EHsc', # C++ exception handling, '/EHsc', # C++ exception handling,
], ],
}, },
#'VCLibrarianTool': {
# 'AdditionalLibraryDirectories!':
# ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
# 'AdditionalLibraryDirectories':
# ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'],
#},
'VCLinkerTool': { 'VCLinkerTool': {
'GenerateDebugInformation': 'true', 'GenerateDebugInformation': 'true',
#'LinkIncremental': '1', # 1 = NO, 2 = YES #'LinkIncremental': '1', # 1 = NO, 2 = YES
'TargetMachine': '17', # x86 - 64 'TargetMachine': '17', # x86 - 64
'AdditionalLibraryDirectories': [ 'AdditionalLibraryDirectories': [
], ],
#'AdditionalLibraryDirectories!':
# ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
#'AdditionalLibraryDirectories':
# ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'],
}, },
}, },
@ -120,14 +110,14 @@
], ],
}, },
'debug': { 'Debug': {
'inherit_from': ['common_base',], 'inherit_from': ['common_base',],
'defines': [ 'defines': [
'DEBUG', 'DEBUG',
'ASMJIT_DEBUG=', 'ASMJIT_DEBUG=',
], ],
'msvs_configuration_attributes': { 'msvs_configuration_attributes': {
'OutputDirectory': '<(DEPTH)\\build\\xenia\\debug', 'OutputDirectory': '<(DEPTH)\\build\\xenia\\Debug',
}, },
'msvs_settings': { 'msvs_settings': {
'VCCLCompilerTool': { 'VCCLCompilerTool': {
@ -148,11 +138,11 @@
'GCC_OPTIMIZATION_LEVEL': '0', 'GCC_OPTIMIZATION_LEVEL': '0',
}, },
}, },
'debug_x64': { 'Debug_x64': {
'inherit_from': ['debug',], 'inherit_from': ['Debug',],
}, },
'release': { 'Release': {
'inherit_from': ['common_base',], 'inherit_from': ['common_base',],
'defines': [ 'defines': [
'RELEASE', 'RELEASE',
@ -181,8 +171,8 @@
}, },
}, },
}, },
'release_x64': { 'Release_x64': {
'inherit_from': ['release',], 'inherit_from': ['Release',],
}, },
}, },
}, },
@ -191,7 +181,7 @@
{ {
'target_name': 'xenia', 'target_name': 'xenia',
'product_name': 'xenia', 'product_name': 'xenia',
'type': '<(library)', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'asmjit', 'asmjit',