Commit 728f2798 by apatrick@chromium.org
parent 989c1c85
...@@ -5,22 +5,6 @@ ...@@ -5,22 +5,6 @@
{ {
'variables': { 'variables': {
'component%': 'static_library', 'component%': 'static_library',
'gcc_or_clang_warnings': [
'-Wall',
'-Wchar-subscripts',
'-Werror',
'-Wextra',
'-Wformat=2',
'-Winit-self',
'-Wno-sign-compare',
'-Wno-unused-function',
'-Wno-unused-parameter',
'-Wno-unknown-pragmas',
'-Wpacked',
'-Wpointer-arith',
'-Wundef',
'-Wwrite-strings',
],
}, },
'target_defaults': { 'target_defaults': {
'default_configuration': 'Debug', 'default_configuration': 'Debug',
......
...@@ -43,16 +43,6 @@ ...@@ -43,16 +43,6 @@
'compiler/preprocessor/new/Tokenizer.cpp', 'compiler/preprocessor/new/Tokenizer.cpp',
'compiler/preprocessor/new/Tokenizer.h', 'compiler/preprocessor/new/Tokenizer.h',
], ],
'conditions': [
['OS=="mac"', {
'xcode_settings': {
'WARNING_CFLAGS': ['<@(gcc_or_clang_warnings)']
},
}],
['OS=="linux"', {
'cflags': ['<@(gcc_or_clang_warnings)']
}],
],
}, },
{ {
'target_name': 'translator_common', 'target_name': 'translator_common',
...@@ -164,14 +154,6 @@ ...@@ -164,14 +154,6 @@
}, { # else: posix }, { # else: posix
'sources': ['compiler/ossource_posix.cpp'], 'sources': ['compiler/ossource_posix.cpp'],
}], }],
['OS=="mac"', {
'xcode_settings': {
'WARNING_CFLAGS': ['<@(gcc_or_clang_warnings)']
},
}],
['OS=="linux"', {
'cflags': ['<@(gcc_or_clang_warnings)']
}],
], ],
}, },
{ {
...@@ -201,16 +183,6 @@ ...@@ -201,16 +183,6 @@
'compiler/VersionGLSL.cpp', 'compiler/VersionGLSL.cpp',
'compiler/VersionGLSL.h', 'compiler/VersionGLSL.h',
], ],
'conditions': [
['OS=="mac"', {
'xcode_settings': {
'WARNING_CFLAGS': ['<@(gcc_or_clang_warnings)']
},
}],
['OS=="linux"', {
'cflags': ['<@(gcc_or_clang_warnings)']
}],
],
}, },
], ],
'conditions': [ 'conditions': [
......
#define MAJOR_VERSION 1 #define MAJOR_VERSION 1
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 1242 #define BUILD_REVISION 1243
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
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