little bit of gyp cleanup (fixes windows build of sktime_unix)

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

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

diff --git a/gyp/core.gyp b/gyp/core.gyp
index 55819c4..27b6259 100644 (file)
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -149,6 +149,8 @@
 
         '../src/ports/SkDebug_stdio.cpp',
         '../src/ports/SkDebug_win.cpp',
+        '../src/ports/SkFontHost_win.cpp',
+        '../src/ports/SkThread_win.cpp',
 
         '../src/ports/SkFontHost_tables.cpp',
         '../src/ports/SkGlobals_global.cpp',
@@ -263,7 +265,6 @@
             '../include/core/SkMMapStream.h',
             '../src/core/SkMMapStream.cpp',
             '../src/ports/SkThread_pthread.cpp',
-            '../src/ports/SkTime_Unix.cpp',
             '../src/ports/SkFontHost_FreeType.cpp',
             '../src/ports/SkFontHost_gamma_none.cpp',
             '../src/ports/SkFontHost_linux.cpp',
@@ -287,7 +288,6 @@
             '../src/ports/SkFontHost_mac_coretext.cpp',
 
             '../src/ports/SkThread_pthread.cpp',
-            '../src/ports/SkTime_Unix.cpp',
           ],
           'link_settings': {
             'libraries': [
@@ -308,7 +308,6 @@
             '../src/ports/SkFontHost_mac_coretext.cpp',
 
             '../src/ports/SkThread_pthread.cpp',
-            '../src/ports/SkTime_Unix.cpp',
           ],
           'link_settings': {
             'libraries': [
@@ -326,17 +325,15 @@
           'include_dirs': [
             'config/win',
           ],
-          'sources': [
-            '../src/ports/SkFontHost_win.cpp',
-            '../src/ports/SkThread_win.cpp',
-          ],
-          'sources!': [
+          'sources!': [ # these are used everywhere but windows
             '../src/ports/SkDebug_stdio.cpp',
+            '../src/ports/SkTime_Unix.cpp',
           ],
-        }],
-        [ 'skia_os != "win"', {
+        }, { # else !win
           'sources!': [
             '../src/ports/SkDebug_win.cpp',
+            '../src/ports/SkFontHost_win.cpp',
+            '../src/ports/SkThread_win.cpp',
             '../src/ports/SkTime_win.cpp',
           ],
         }],