GYP updates for Windows.
This will break OSX for a moment.
This commit is contained in:
136
common.gypi
136
common.gypi
@@ -14,6 +14,54 @@
|
||||
# TODO(benvanik): switch based on configuration.
|
||||
'llvm_path': 'build/llvm/release/',
|
||||
'llvm_config': '<(llvm_path)bin/llvm-config',
|
||||
'llvm_includedir': '<(llvm_path)/include',
|
||||
'llvm_cxxflags': [
|
||||
# ?
|
||||
],
|
||||
'llvm_libdir': '<(llvm_path)/lib',
|
||||
'llvm_libs': [
|
||||
#'pthread',
|
||||
'LLVMCppBackendCodeGen',
|
||||
'LLVMCppBackendInfo',
|
||||
'LLVMAsmParser',
|
||||
'LLVMTableGen',
|
||||
'LLVMDebugInfo',
|
||||
'LLVMX86Disassembler',
|
||||
'LLVMX86AsmParser',
|
||||
'LLVMX86CodeGen',
|
||||
'LLVMSelectionDAG',
|
||||
'LLVMAsmPrinter',
|
||||
'LLVMX86Desc',
|
||||
'LLVMX86Info',
|
||||
'LLVMX86AsmPrinter',
|
||||
'LLVMX86Utils',
|
||||
'LLVMMCDisassembler',
|
||||
'LLVMMCParser',
|
||||
'LLVMInstrumentation',
|
||||
'LLVMOption',
|
||||
'LLVMArchive',
|
||||
'LLVMBitReader',
|
||||
'LLVMInterpreter',
|
||||
'LLVMipo',
|
||||
'LLVMVectorize',
|
||||
'LLVMLinker',
|
||||
'LLVMBitWriter',
|
||||
'LLVMMCJIT',
|
||||
'LLVMJIT',
|
||||
'LLVMCodeGen',
|
||||
'LLVMScalarOpts',
|
||||
'LLVMInstCombine',
|
||||
'LLVMTransformUtils',
|
||||
'LLVMipa',
|
||||
'LLVMAnalysis',
|
||||
'LLVMRuntimeDyld',
|
||||
'LLVMExecutionEngine',
|
||||
'LLVMTarget',
|
||||
'LLVMMC',
|
||||
'LLVMObject',
|
||||
'LLVMCore',
|
||||
'LLVMSupport',
|
||||
],
|
||||
},
|
||||
|
||||
|
||||
@@ -32,7 +80,71 @@
|
||||
],
|
||||
|
||||
'configurations': {
|
||||
'common_base': {
|
||||
'abstract': 1,
|
||||
|
||||
'msvs_configuration_platform': 'x64',
|
||||
'msvs_configuration_attributes': {
|
||||
'OutputDirectory': '$(SolutionDir)$(ConfigurationName)',
|
||||
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
|
||||
'CharacterSet': '1',
|
||||
},
|
||||
'msvs_disabled_warnings': [],
|
||||
'msvs_configuration_platform': 'x64',
|
||||
'msvs_cygwin_shell': '0',
|
||||
'msvs_settings': {
|
||||
'VCCLCompilerTool': {
|
||||
#'MinimalRebuild': 'false',
|
||||
'BufferSecurityCheck': 'true',
|
||||
'EnableFunctionLevelLinking': 'true',
|
||||
'RuntimeTypeInfo': 'false',
|
||||
'WarningLevel': '3',
|
||||
#'WarnAsError': 'true',
|
||||
'DebugInformationFormat': '3',
|
||||
'ExceptionHandling': '1', # /EHsc
|
||||
'AdditionalOptions': ['/MP'],
|
||||
},
|
||||
#'VCLibrarianTool': {
|
||||
# 'AdditionalLibraryDirectories!':
|
||||
# ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
|
||||
# 'AdditionalLibraryDirectories':
|
||||
# ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'],
|
||||
#},
|
||||
'VCLinkerTool': {
|
||||
'GenerateDebugInformation': 'true',
|
||||
#'LinkIncremental': '1', # 1 = NO, 2 = YES
|
||||
'TargetMachine': '17', # x86 - 64
|
||||
'AdditionalLibraryDirectories': [
|
||||
'../../<(llvm_libdir)',
|
||||
],
|
||||
#'AdditionalLibraryDirectories!':
|
||||
# ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
|
||||
#'AdditionalLibraryDirectories':
|
||||
# ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'],
|
||||
},
|
||||
},
|
||||
|
||||
'scons_settings': {
|
||||
'sconsbuild_dir': '<(DEPTH)/build/xenia/',
|
||||
},
|
||||
|
||||
'xcode_settings': {
|
||||
'SYMROOT': '<(DEPTH)/build/xenia/',
|
||||
'ALWAYS_SEARCH_USER_PATHS': 'NO',
|
||||
'ARCHS': ['x86_64'],
|
||||
'GCC_C_LANGUAGE_STANDARD': 'c99',
|
||||
'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',
|
||||
'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',
|
||||
'WARNING_CFLAGS': ['-Wall', '-Wendif-labels'],
|
||||
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
|
||||
},
|
||||
|
||||
'defines': [
|
||||
],
|
||||
},
|
||||
|
||||
'debug': {
|
||||
'inherit_from': ['common_base',],
|
||||
'defines': [
|
||||
'DEBUG',
|
||||
],
|
||||
@@ -58,7 +170,12 @@
|
||||
'GCC_OPTIMIZATION_LEVEL': '0',
|
||||
},
|
||||
},
|
||||
'debug_x64': {
|
||||
'inherit_from': ['debug',],
|
||||
},
|
||||
|
||||
'release': {
|
||||
'inherit_from': ['common_base',],
|
||||
'defines': [
|
||||
'RELEASE',
|
||||
'NDEBUG',
|
||||
@@ -86,22 +203,9 @@
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
'msvs_configuration_platform': 'x64',
|
||||
'msvs_cygwin_shell': '0',
|
||||
'scons_settings': {
|
||||
'sconsbuild_dir': '<(DEPTH)/build/xenia/',
|
||||
},
|
||||
'xcode_settings': {
|
||||
'SYMROOT': '<(DEPTH)/build/xenia/',
|
||||
'ALWAYS_SEARCH_USER_PATHS': 'NO',
|
||||
'ARCHS': ['x86_64'],
|
||||
'GCC_C_LANGUAGE_STANDARD': 'c99',
|
||||
'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',
|
||||
'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',
|
||||
'WARNING_CFLAGS': ['-Wall', '-Wendif-labels'],
|
||||
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
|
||||
'release_x64': {
|
||||
'inherit_from': ['release',],
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user