Skip to content

A
angle
Commit 3cd50f7e by Geoff Lang
Options

Fix remaining discrepencies between master and es3proto project files.

Change-Id: I335c9346ac268beab25184e2b18ccfdd0b15c7b1 Reviewed-on: https://chromium-review.googlesource.com/182150Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 91382e55
Showing with 157 additions and 119 deletions
build/all.gyp
......@@ -3,31 +3,23 @@
# found in the LICENSE file.
{
'targets': [
'targets':
[
{
'target_name': 'All',
'type': 'none',
'dependencies': [
'../src/angle.gyp:*',
],
'conditions': [
['angle_build_samples==1', {
'dependencies': [
'../samples/samples.gyp:*',
],
'dependencies': [ '../src/angle.gyp:*', ],
'conditions':
[
['angle_build_samples==1',
{
'dependencies': [ '../samples/samples.gyp:*', ],
}],
['angle_build_tests==1', {
'dependencies': [
'../tests/tests.gyp:*',
],
['angle_build_tests==1',
{
'dependencies': [ '../tests/tests.gyp:*', ],
}],
],
},
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
build/common.gypi
......@@ -3,7 +3,8 @@
# found in the LICENSE file.
{
'variables': {
'variables':
{
'component%': 'static_library',
'angle_build_tests%': '1',
'angle_build_samples%': '1',
......@@ -12,7 +13,8 @@
# When angle_code is 1, we build with additional warning flags on Mac and Linux.
'angle_code%': 0,
'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
'gcc_or_clang_warnings': [
'gcc_or_clang_warnings':
[
'-Wall',
'-Wchar-subscripts',
'-Werror',
......@@ -29,30 +31,41 @@
'-Wwrite-strings',
],
},
'target_defaults': {
'target_defaults':
{
'default_configuration': 'Debug',
'variables': {
'variables':
{
'warn_as_error%': 1,
},
'target_conditions': [
['warn_as_error == 1', {
'msvs_settings': {
'VCCLCompilerTool': {
'target_conditions':
[
['warn_as_error == 1',
{
'msvs_settings':
{
'VCCLCompilerTool':
{
'WarnAsError': 'true',
},
},
}],
],
'configurations': {
'Common_Base': {
'configurations':
{
'Common_Base':
{
'abstract': 1,
'msvs_configuration_attributes': {
'msvs_configuration_attributes':
{
'OutputDirectory': '$(SolutionDir)$(ConfigurationName)_$(Platform)',
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
'CharacterSet': '1', # UNICODE
},
'msvs_settings': {
'VCCLCompilerTool': {
'msvs_settings':
{
'VCCLCompilerTool':
{
'AdditionalOptions': ['/MP'],
'BufferSecurityCheck': 'true',
'DebugInformationFormat': '3',
......@@ -60,7 +73,8 @@
#'ExceptionHandling': '0',
'EnableFunctionLevelLinking': 'true',
'MinimalRebuild': 'false',
'PreprocessorDefinitions': [
'PreprocessorDefinitions':
[
'_CRT_SECURE_NO_DEPRECATE',
'_SCL_SECURE_NO_WARNINGS',
'_HAS_EXCEPTIONS=0',
......@@ -74,7 +88,8 @@
'RuntimeTypeInfo': 'false',
'WarningLevel': '4',
},
'VCLinkerTool': {
'VCLinkerTool':
{
'FixedBaseAddress': '1',
'GenerateDebugInformation': 'true',
'ImportLibrary': '$(OutDir)\\lib\\$(TargetName).lib',
......@@ -82,7 +97,8 @@
# Most of the executables we'll ever create are tests
# and utilities with console output.
'SubSystem': '1', # /SUBSYSTEM:CONSOLE
'AdditionalDependencies': [
'AdditionalDependencies':
[
'kernel32.lib',
'gdi32.lib',
'winspool.lib',
......@@ -98,80 +114,102 @@
'delayimp.lib',
],
},
'VCResourceCompilerTool': {
'VCResourceCompilerTool':
{
'Culture': '1033',
},
},
'msvs_disabled_warnings': [4100, 4127, 4189, 4239, 4244, 4245, 4512, 4702, 4530, 4718],
'msvs_system_include_dirs': [
'msvs_disabled_warnings': [ 4100, 4127, 4189, 4239, 4244, 4245, 4512, 4702, 4530, 4718 ],
'msvs_system_include_dirs':
[
'<(windows_sdk_path)/Include/shared',
'<(windows_sdk_path)/Include/um',
],
}, # Common_Base
'Debug_Base': {
'Debug_Base':
{
'abstract': 1,
'msvs_settings': {
'VCCLCompilerTool': {
'msvs_settings':
{
'VCCLCompilerTool':
{
'Optimization': '0', # /Od
'PreprocessorDefinitions': ['_DEBUG'],
'PreprocessorDefinitions': [ '_DEBUG' ],
'BasicRuntimeChecks': '3',
'RuntimeLibrary': '1', # /MTd (debug static)
},
'VCLinkerTool': {
'VCLinkerTool':
{
'LinkIncremental': '2',
},
},
'xcode_settings': {
'xcode_settings':
{
'COPY_PHASE_STRIP': 'NO',
'GCC_OPTIMIZATION_LEVEL': '0',
},
}, # Debug_Base
'Release_Base': {
'Release_Base':
{
'abstract': 1,
'msvs_settings': {
'VCCLCompilerTool': {
'msvs_settings':
{
'VCCLCompilerTool':
{
'Optimization': '2', # /Os
'PreprocessorDefinitions': ['NDEBUG'],
'RuntimeLibrary': '0', # /MT (static)
},
'VCLinkerTool': {
'VCLinkerTool':
{
'LinkIncremental': '1',
},
},
}, # Release_Base
'x86_Base': {
'x86_Base':
{
'abstract': 1,
'msvs_configuration_platform': 'Win32',
'msvs_settings': {
'VCLinkerTool': {
'msvs_settings':
{
'VCLinkerTool':
{
'TargetMachine': '1',
'AdditionalLibraryDirectories': [
'AdditionalLibraryDirectories':
[
'<(windows_sdk_path)/Lib/win8/um/x86',
],
},
'VCLibrarianTool': {
'AdditionalLibraryDirectories': [
'VCLibrarianTool':
{
'AdditionalLibraryDirectories':
[
'<(windows_sdk_path)/Lib/win8/um/x86',
],
},
},
}, # x86_Base
'x64_Base': {
'x64_Base':
{
'abstract': 1,
'msvs_configuration_platform': 'x64',
'msvs_settings': {
'VCLinkerTool': {
'msvs_settings':
{
'VCLinkerTool':
{
'TargetMachine': '17', # x86 - 64
'AdditionalLibraryDirectories': [
'AdditionalLibraryDirectories':
[
'<(windows_sdk_path)/Lib/win8/um/x64',
],
},
'VCLibrarianTool': {
'AdditionalLibraryDirectories': [
'AdditionalLibraryDirectories':
[
'<(windows_sdk_path)/Lib/win8/um/x64',
],
},
......@@ -179,53 +217,73 @@
}, # x64_Base
# Concrete configurations
'Debug': {
'Debug':
{
'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'],
},
'Release': {
'Release':
{
'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'],
},
'conditions': [
[ 'OS=="win" and MSVS_VERSION != "2010e" and MSVS_VERSION != "2012e"', {
'Debug_x64': {
'conditions':
[
[ 'OS == "win" and MSVS_VERSION != "2010e" and MSVS_VERSION != "2012e"',
{
'Debug_x64':
{
'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
},
'Release_x64': {
'Release_x64':
{
'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
},
}],
],
}, # configurations
'conditions': [
['component=="shared_library"', {
'defines': ['COMPONENT_BUILD'],
'conditions':
[
['component=="shared_library"',
{
'defines': [ 'COMPONENT_BUILD' ],
}],
],
}, # target_defaults
'conditions': [
['OS=="win"', {
'target_defaults': {
'conditions':
[
['OS == "win"',
{
'target_defaults':
{
'msvs_cygwin_dirs': ['../third_party/cygwin'],
},
}],
['OS!="win" and OS!="mac"', {
'target_defaults': {
'cflags': [
['OS != "win" and OS != "mac"',
{
'target_defaults':
{
'cflags':
[
'-pthread',
'-fno-exceptions',
],
'ldflags': [
'ldflags':
[
'-pthread',
],
'configurations': {
'Debug': {
'variables': {
'configurations':
{
'Debug':
{
'variables':
{
'debug_optimize%': '0',
},
'defines': [
'defines':
[
'_DEBUG',
],
'cflags': [
'cflags':
[
'-O>(debug_optimize)',
'-g',
],
......@@ -233,15 +291,21 @@
},
},
}],
['angle_code==1', {
'target_defaults': {
'conditions': [
['OS=="mac"', {
'xcode_settings': {
['angle_code==1',
{
'target_defaults':
{
'conditions':
[
['OS == "mac"',
{
'xcode_settings':
{
'WARNING_CFLAGS': ['<@(gcc_or_clang_warnings)']
},
}],
['OS!="win" and OS!="mac"', {
['OS != "win" and OS != "mac"',
{
'cflags': ['<@(gcc_or_clang_warnings)']
}],
]
......@@ -249,9 +313,3 @@
}],
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
build/gyp_angle
......@@ -14,7 +14,6 @@ script_dir = os.path.dirname(__file__)
angle_dir = os.path.normpath(os.path.join(script_dir, os.pardir))
sys.path.append(os.path.join(angle_dir, 'third_party', 'gyp', 'pylib'))
print os.path.join(angle_dir, 'third_party', 'gyp', 'pylib')
import gyp
if __name__ == '__main__':
......
generate_projects
......@@ -35,7 +35,7 @@ if __name__ == '__main__':
gyp_cmd += ' -D angle_relative_src_path=..\\..\\src\\'
gyp_cmd += ' ' + os.path.join(script_dir, 'all.gyp')
print 'Generating projects to' + generation_dir + ' from gyp files...'
print 'Generating projects to ' + generation_dir + ' from gyp files...'
print gyp_cmd
sys.stdout.flush()
os.system(gyp_cmd)
......
projects/src/translator.vcxproj.filters
......@@ -95,7 +95,7 @@
<Filter>compiler\translator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.h">
<Filter>..\..\src\compiler\translator</Filter>
<Filter>compiler\translator</Filter>
</ClInclude>
<ClCompile Include="..\..\src\compiler\translator\ValidateLimitations.cpp">
<Filter>compiler\translator</Filter>
......@@ -335,7 +335,7 @@
<Filter>compiler\translator</Filter>
</ClInclude>
<ClCompile Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.cpp">
<Filter>..\..\src\compiler\translator</Filter>
<Filter>compiler\translator</Filter>
</ClCompile>
<ClInclude Include="..\..\src\compiler\translator\MMap.h">
<Filter>compiler\translator</Filter>
......
projects/src/translator_static.vcxproj.filters
......@@ -95,7 +95,7 @@
<Filter>compiler\translator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.h">
<Filter>..\..\src\compiler\translator</Filter>
<Filter>compiler\translator</Filter>
</ClInclude>
<ClCompile Include="..\..\src\compiler\translator\ValidateLimitations.cpp">
<Filter>compiler\translator</Filter>
......@@ -335,7 +335,7 @@
<Filter>compiler\translator</Filter>
</ClInclude>
<ClCompile Include="..\..\src\compiler\translator\UnfoldShortCircuitAST.cpp">
<Filter>..\..\src\compiler\translator</Filter>
<Filter>compiler\translator</Filter>
</ClCompile>
<ClInclude Include="..\..\src\compiler\translator\MMap.h">
<Filter>compiler\translator</Filter>
......
src/angle.gyp
......@@ -8,9 +8,3 @@
'angle.gypi',
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
src/angle.gypi
......@@ -88,12 +88,3 @@
]
] # conditions
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
# Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
src/build_angle.gyp
......@@ -8,9 +8,3 @@
'angle.gypi',
],
}
# Local Variables:
# tab-width:2
# indent-tabs-mode:nil
# End:
# vim: set expandtab tabstop=2 shiftwidth=2:
tests/build_tests.gyp 0 → 100644
# Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'includes':
[
'build_tests.gypi',
],
}
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