allow both GDI and DW fontmgrs at the same time

gyp/ports.gyp

Index: gyp/ports.gyp
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index fff368df6a5b209b8a6b5839c03bc467672f5de7..cabd21731c54e1fb626827ba6de37a13f6d75d5f 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -26,8 +26,12 @@
         '../src/ports/SkDebug_nacl.cpp',
         '../src/ports/SkDebug_stdio.cpp',
         '../src/ports/SkDebug_win.cpp',
+
         '../src/ports/SkFontHost_win.cpp',
         '../src/ports/SkFontHost_win_dw.cpp',
+        '../src/ports/SkFontMgr_default_gdi.cpp',
+        '../src/ports/SkFontMgr_default_dw.cpp',
+
         '../src/ports/SkGlobalInitialization_default.cpp',
         '../src/ports/SkMemory_malloc.cpp',
         '../src/ports/SkOSFile_posix.cpp',
@@ -113,17 +117,6 @@
             'config/win',
             '../src/utils/win',
           ],
-          'conditions': [
-            [ 'skia_directwrite', {
-                'sources!': [
-                  '../src/ports/SkFontHost_win.cpp',
-                ],
-              }, { # else !skia_directwrite
-                'sources!': [
-                  '../src/ports/SkFontHost_win_dw.cpp',
-                ],
-              }],
-          ],
           'sources!': [ # these are used everywhere but windows
             '../src/ports/SkDebug_stdio.cpp',
             '../src/ports/SkOSFile_posix.cpp',
@@ -131,11 +124,25 @@
             '../src/ports/SkTime_Unix.cpp',
             '../src/ports/SkTLS_pthread.cpp',
           ],
+		  'conditions': [
+            #    when we build for win, we only want one of these default files
+            [ 'skia_directwrite', {
+              'sources!': [
+                '../src/ports/SkFontMgr_default_gdi.cpp',
+              ],
+            }, { # else gdi
+              'sources!': [
+                '../src/ports/SkFontMgr_default_dw.cpp',
+              ],
+            }],
+          ],
         }, { # else !win
           'sources!': [
             '../src/ports/SkDebug_win.cpp',
             '../src/ports/SkFontHost_win.cpp',
             '../src/ports/SkFontHost_win_dw.cpp',
+            '../src/ports/SkFontHost_win_defgdi.cpp',
+            '../src/ports/SkFontHost_win_defdw.cpp',

[bungeman-skia, 2013/08/14 15:24:11]

These need the right names.

[reed1, 2013/08/14 15:27:47]

Done.

             '../src/ports/SkOSFile_win.cpp',
             '../src/ports/SkThread_win.cpp',
             '../src/ports/SkTime_win.cpp',