commit 0533971c5f54c63d471c2b93f0d0b47119bff85a
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Apr 28 21:04:06 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Apr 28 21:04:06 2011 +0000
tree a6b968015bd827e1d27526e44c1e00e65abcccc5
parent eaf6a5daf48fda323213f8de66b883d3aa772b8e

Make gyp file define GR/SK debug/release flags. Remove file that breaks release build.



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

gyp/skia.gyp

diff --git a/gyp/skia.gyp b/gyp/skia.gyp
index 94ba3cf..3d1f2e1 100644
--- a/gyp/skia.gyp
+++ b/gyp/skia.gyp
@@ -1,13 +1,17 @@
 {
   'target_defaults': {
-   'msvs_settings': {
-      #really need to figure out how to generate debug and release
-      'VCLinkerTool': {
-        'GenerateDebugInformation': 'true',
+    'configurations': {
+      'Debug': {
+        'defines': [
+          'SK_DEBUG',
+          'GR_DEBUG=1',
+        ],
       },
-      'VCCLCompilerTool': {
-          'DebugInformationFormat': '4',
-          'Optimization': '0',
+      'Release': {
+        'defines': [
+          'SK_RELEASE',
+          'GR_RELEASE=1',
+        ],
       },
     },
     'conditions': [
@@ -1121,7 +1125,7 @@
         '../src/animator/SkBoundable.h',
         '../src/animator/SkBuildCondensedInfo.cpp',
         #'../src/animator/SkCondensedDebug.cpp', fails on windows
-        '../src/animator/SkCondensedRelease.cpp',
+        #'../src/animator/SkCondensedRelease.cpp',
         '../src/animator/SkDisplayable.cpp',
         '../src/animator/SkDisplayable.h',
         '../src/animator/SkDisplayAdd.cpp',