allow both GDI and DW fontmgrs at the same time

gyp/ports.gyp

 # Port-specific Skia library code.
 {
   'targets': [
     {
       'target_name': 'ports',
       'product_name': 'skia_ports',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
       ],
       'include_dirs': [
         '../include/effects',
         '../include/images',
         '../include/ports',
         '../include/utils',
         '../include/utils/win',
         '../include/xml',
         '../src/core',
         '../src/lazy',
         '../src/ports',
         '../src/sfnt',
         '../src/utils',
       ],
       'sources': [
         '../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',
         '../src/ports/SkOSFile_stdio.cpp',
         '../src/ports/SkOSFile_win.cpp',
         '../src/ports/SkPurgeableMemoryBlock_none.cpp',
        #'../src/ports/SkThread_none.cpp',
         '../src/ports/SkThread_pthread.cpp',
         '../src/ports/SkThread_win.cpp',
         '../src/ports/SkTime_Unix.cpp',
@@ skipping 65 matching lines @@
           'sources!': [
             '../src/ports/SkPurgeableMemoryBlock_none.cpp',
             '../src/ports/SkFontHost_tables.cpp',
           ],
         }],
         [ 'skia_os == "win"', {
           'include_dirs': [
             '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',
             '../src/ports/SkThread_pthread.cpp',
             '../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',
             '../src/ports/SkTLS_win.cpp',
           ],
         }],
         [ 'skia_os == "android"', {
           'sources!': [
             '../src/ports/SkDebug_stdio.cpp',
             '../src/ports/SkPurgeableMemoryBlock_none.cpp',
@@ skipping 17 matching lines @@
       },
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: