commit e01885bb89694275f9b99d18058abbc9c40e319b
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 21 15:20:43 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 21 15:20:43 2013 +0000
tree 524b036bad6f86bc848918f6ca8f0b9bd0eceb21
parent f445970618f3b8745beca6d37e4d7c999edb4ffb

allow both GDI and DW fontmgrs at the same time

BUG=
R=bungeman@google.com

Committed: https://code.google.com/p/skia/source/detail?r=10718

Committed: https://code.google.com/p/skia/source/detail?r=10788

Review URL: https://codereview.chromium.org/23058002

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

ports.gyp

diff --git a/ports.gyp b/ports.gyp
index 5f63a47..324cacb 100644
--- a/ports.gyp
+++ b/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',
@@ -114,17 +118,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',
@@ -132,11 +125,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/SkFontMgr_default_gdi.cpp',
+            '../src/ports/SkFontMgr_default_dw.cpp',
             '../src/ports/SkOSFile_win.cpp',
             '../src/ports/SkThread_win.cpp',
             '../src/ports/SkTime_win.cpp',