commit 8846cb22cea7842d8dafe25a557215e31e9deeec
author epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jul 01 20:20:07 2011 +0000
committer epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jul 01 20:20:07 2011 +0000
tree c71133dcf9565943237ff68ab687ed4d0160161b
parent 5351b373b3c68e12aecf4f16378bfebc4a5586a2

Create new 'skia_os' variable to replace use of 'OS' in most places.
http://codereview.appspot.com/4627085



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

gyp/gpu.gyp

diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 787e0fc..04231c1 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -28,17 +28,17 @@
         '../src/gpu/SkGrTexturePixelRef.cpp',
       ],
       'conditions': [
-          [ 'OS == "linux"', {
+          [ 'skia_os == "linux"', {
           'defines': [
               'GR_LINUX_BUILD=1',
           ],
           }],
-          [ 'OS == "mac"', {
+          [ 'skia_os == "mac"', {
           'defines': [
               'GR_MAC_BUILD=1',
           ],
           }],
-          [ 'OS == "win"', {
+          [ 'skia_os == "win"', {
           'defines': [
               'GR_WIN32_BUILD=1',
           ],
@@ -46,17 +46,17 @@
       ],
       'direct_dependent_settings': {
         'conditions': [
-          [ 'OS == "linux"', {
+          [ 'skia_os == "linux"', {
             'defines': [
               'GR_LINUX_BUILD=1',
             ],
           }],
-          [ 'OS == "mac"', {
+          [ 'skia_os == "mac"', {
             'defines': [
               'GR_MAC_BUILD=1',
             ],
           }],
-          [ 'OS == "win"', {
+          [ 'skia_os == "win"', {
             'defines': [
               'GR_WIN32_BUILD=1',
             ],
@@ -197,7 +197,7 @@
         'GR_IMPLEMENTATION=1',
       ],
       'conditions': [
-        [ 'OS == "linux"', {
+        [ 'skia_os == "linux"', {
           'defines': [
               'GR_LINUX_BUILD=1',
           ],
@@ -211,7 +211,7 @@
             ],
           },
         }],
-        [ 'OS == "mac"', {
+        [ 'skia_os == "mac"', {
           'defines': [
               'GR_MAC_BUILD=1',
           ],
@@ -224,7 +224,7 @@
             '../gpu/src/GrGLDefaultInterface_none.cpp',
           ],
           }],
-        [ 'OS == "win"', {
+        [ 'skia_os == "win"', {
           'defines': [
             'GR_WIN32_BUILD=1',
             'GR_GL_FUNCTION_TYPE=__stdcall',
@@ -233,17 +233,17 @@
             '../gpu/src/GrGLDefaultInterface_none.cpp',
           ],
         }],
-        [ 'OS != "win"', {
+        [ 'skia_os != "win"', {
           'sources!': [
             '../gpu/src/win/GrGLDefaultInterface_win.cpp',
           ],
         }],
-        [ 'OS != "mac"', {
+        [ 'skia_os != "mac"', {
           'sources!': [
             '../gpu/src/mac/GrGLDefaultInterface_mac.cpp',
           ],
         }],
-        [ 'OS != "linux"', {
+        [ 'skia_os != "linux"', {
           'sources!': [
             '../gpu/src/unix/GrGLDefaultInterface_unix.cpp',
           ],
@@ -251,17 +251,17 @@
       ],
       'direct_dependent_settings': {
         'conditions': [
-          [ 'OS == "linux"', {
+          [ 'skia_os == "linux"', {
             'defines': [
               'GR_LINUX_BUILD=1',
             ],
           }],
-          [ 'OS == "mac"', {
+          [ 'skia_os == "mac"', {
             'defines': [
               'GR_MAC_BUILD=1',
             ],
           }],
-          [ 'OS == "win"', {
+          [ 'skia_os == "win"', {
             'defines': [
               'GR_WIN32_BUILD=1',
               'GR_GL_FUNCTION_TYPE=__stdcall',