Commit b236212e by Geoff Lang

Updated the gyp build system for the ninja generator to work.

TRAC #24018 Signed-off-by: Jamie Madill Signed-off-by: Shannon Woods
parent 78059907
...@@ -17,4 +17,4 @@ debug.txt ...@@ -17,4 +17,4 @@ debug.txt
.gclient_entries .gclient_entries
third_party third_party
tests/third_party tests/third_party
build/trunk out
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
# angle_code is set to 0 for test code, sample code, and third party code. # angle_code is set to 0 for test code, sample code, and third party code.
# When angle_code is 1, we build with additional warning flags on Mac and Linux. # When angle_code is 1, we build with additional warning flags on Mac and Linux.
'angle_code%': 0, 'angle_code%': 0,
'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
'gcc_or_clang_warnings': [ 'gcc_or_clang_warnings': [
'-Wall', '-Wall',
'-Wchar-subscripts', '-Wchar-subscripts',
...@@ -72,7 +73,6 @@ ...@@ -72,7 +73,6 @@
], ],
'RuntimeTypeInfo': 'false', 'RuntimeTypeInfo': 'false',
'WarningLevel': '4', 'WarningLevel': '4',
'DisableSpecificWarnings': [4100, 4127, 4189, 4239, 4244, 4245, 4512, 4702],
}, },
'VCLinkerTool': { 'VCLinkerTool': {
'FixedBaseAddress': '1', 'FixedBaseAddress': '1',
...@@ -102,9 +102,10 @@ ...@@ -102,9 +102,10 @@
'Culture': '1033', 'Culture': '1033',
}, },
}, },
'msvs_disabled_warnings': [4100, 4127, 4189, 4239, 4244, 4245, 4512, 4702, 4530, 4718],
'msvs_system_include_dirs': [ 'msvs_system_include_dirs': [
'$(ProgramFiles)/Windows Kits/8.0/Include/shared', '<(windows_sdk_path)/Include/shared',
'$(ProgramFiles)/Windows Kits/8.0/Include/um', '<(windows_sdk_path)/Include/um',
], ],
}, # Common_Base }, # Common_Base
...@@ -148,12 +149,12 @@ ...@@ -148,12 +149,12 @@
'VCLinkerTool': { 'VCLinkerTool': {
'TargetMachine': '1', 'TargetMachine': '1',
'AdditionalLibraryDirectories': [ 'AdditionalLibraryDirectories': [
'$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86', '<(windows_sdk_path)/Lib/win8/um/x86',
], ],
}, },
'VCLibrarianTool': { 'VCLibrarianTool': {
'AdditionalLibraryDirectories': [ 'AdditionalLibraryDirectories': [
'$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86', '<(windows_sdk_path)/Lib/win8/um/x86',
], ],
}, },
}, },
...@@ -166,12 +167,12 @@ ...@@ -166,12 +167,12 @@
'VCLinkerTool': { 'VCLinkerTool': {
'TargetMachine': '17', # x86 - 64 'TargetMachine': '17', # x86 - 64
'AdditionalLibraryDirectories': [ 'AdditionalLibraryDirectories': [
'$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x64', '<(windows_sdk_path)/Lib/win8/um/x64',
], ],
}, },
'VCLibrarianTool': { 'VCLibrarianTool': {
'AdditionalLibraryDirectories': [ 'AdditionalLibraryDirectories': [
'$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x64', '<(windows_sdk_path)/Lib/win8/um/x64',
], ],
}, },
}, },
......
...@@ -26,7 +26,7 @@ if __name__ == '__main__': ...@@ -26,7 +26,7 @@ if __name__ == '__main__':
# Set the depth to get the top-level Makefile generated into the # Set the depth to get the top-level Makefile generated into the
# correct directory. This only has an effect on Linux. # correct directory. This only has an effect on Linux.
args.append('--depth'); args.append('--depth');
args.append('./trunk'); args.append('.');
# Add common.gypi to the include path. # Add common.gypi to the include path.
args.append('-I' + os.path.join(script_dir, 'common.gypi')) args.append('-I' + os.path.join(script_dir, 'common.gypi'))
# Add all.gyp as the main gyp file to be generated. # Add all.gyp as the main gyp file to be generated.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment