This patch provides the include file common.gypi (cargo culted from another

project) which implements basic support for Debug and Release targets in the
gyp-generated project files.  All configurations build on all platforms with
the exception of Windows/Release, which seems to have compile errors not
resolved here.

Review URL:  http://codereview.appspot.com/4391042/

git-svn-id: http://skia.googlecode.com/svn/trunk@1101 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/common.gypi b/gyp/common.gypi
new file mode 100644 (file)
index 0000000..aadaffb
--- /dev/null
+++ b/gyp/common.gypi
@@ -0,0 +1,94 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{
+  'conditions' : [
+    ['OS == "win"',
+      {
+        'target_defaults': {
+          'msvs_cygwin_shell': 0,
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              'WarningLevel': '1',
+              'WarnAsError': 'false',
+              'DebugInformationFormat': '3',
+              'AdditionalOptions': '/MP',
+            },
+          },
+          'configurations': {
+            'Debug': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'Optimization': '0',    # 0 = /Od
+                  'PreprocessorDefinitions': ['_DEBUG'],
+                  'RuntimeLibrary': '3',  # 3 = /MDd (debug DLL)
+                },
+                'VCLinkerTool': {
+                  'GenerateDebugInformation': 'true',
+                },
+              },
+            },
+            'Release': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'Optimization': '2',    # 2 = /Os
+                  'PreprocessorDefinitions': ['NDEBUG'],
+                  'RuntimeLibrary': '2',  # 2 = /MD (nondebug DLL)
+                },
+                'VCLinkerTool': {
+                  'GenerateDebugInformation': 'false',
+                },
+              },
+            },
+          },
+        },
+      },
+    ],
+    ['OS == "linux"', 
+      {
+        'target_defaults': {
+          'configurations': {
+            'Debug': {
+              'cflags': ['-g']
+            },
+            'Release': {
+              'cflags': ['-O2']
+            },
+          },
+        },
+      },
+    ],
+    ['OS == "mac"', 
+      {
+        'target_defaults': {
+          'configurations': {
+            'Debug': {
+              'cflags': ['-g']
+            },
+            'Release': {
+              'cflags': ['-O2']
+            },
+          },
+        },
+        'xcode_settings': {
+          'SYMROOT': '<(DEPTH)/xcodebuild',
+        },
+      },
+    ],
+  ],
+}
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:

diff --git a/gyp/gyp_skia b/gyp/gyp_skia
index 909c266..72b4879 100755 (executable)
--- a/gyp/gyp_skia
+++ b/gyp/gyp_skia
@@ -45,6 +45,9 @@ def additional_include_files(args=[]):
     if os.path.realpath(path) not in specified_includes:
       result.append(path)
 
+  # Always include common.gypi
+  AddInclude(os.path.join(script_dir, 'common.gypi'))
+
   return result
 
 if __name__ == '__main__':