move ports into its own gyp file

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

diff --git a/gyp/FileReaderApp.gyp b/gyp/FileReaderApp.gyp
index 0e2c48f8023d9f9a308803ac42322e3aff863dce..c5651c7c109a08ed1cb3614d71494ea76f52cdd0 100644 (file)
--- a/gyp/FileReaderApp.gyp
+++ b/gyp/FileReaderApp.gyp
@@ -24,6 +24,7 @@
         'core.gyp:core',
         'effects.gyp:effects',
         'opts.gyp:opts',
+        'ports.gyp:ports',
         'utils.gyp:utils',
         'views.gyp:views',
         'xml.gyp:xml',

diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 3f468f8ec9484e2e32a815f4e8d44c5ae357dbc8..fed4bf459e2292e47875f5d30ad3683d755da827 100644 (file)
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -148,6 +148,7 @@
         'core.gyp:core',
         'effects.gyp:effects',
         'images.gyp:images',
+        'ports.gyp:ports',
         'views.gyp:views',
         'utils.gyp:utils',
         'animator.gyp:animator',

diff --git a/gyp/bench.gyp b/gyp/bench.gyp
index 636158670c709c41ff248ceb92b13a3b014b24be..0c5e2ea94bd96352ebebb9594a3ce8c67d5ac223 100644 (file)
--- a/gyp/bench.gyp
+++ b/gyp/bench.gyp
@@ -22,6 +22,7 @@
         'gpu.gyp:gr',
         'gpu.gyp:skgr',
         'images.gyp:images',
+        'ports.gyp:ports',
         'utils.gyp:utils',
       ],
     },

diff --git a/gyp/core.gyp b/gyp/core.gyp
index 0ee608e29d64e00e96861fdda2eae0cb4723a806..488caa3b1c973e3a80c59e4aa7ff85776b64956f 100644 (file)
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -149,20 +149,6 @@
 
         '../src/opts/opts_check_SSE2.cpp',
 
-        '../src/ports/SkDebug_stdio.cpp',
-        '../src/ports/SkDebug_win.cpp',
-        '../src/ports/SkFontHost_sandbox_none.cpp',
-        '../src/ports/SkFontHost_win.cpp',
-        '../src/ports/SkThread_win.cpp',
-
-        '../src/ports/SkFontHost_tables.cpp',
-        '../src/ports/SkMemory_malloc.cpp',
-        '../src/ports/SkOSFile_stdio.cpp',
-        '../src/ports/SkTime_Unix.cpp',
-        '../src/ports/SkTime_win.cpp',
-        '../src/ports/SkXMLParser_empty.cpp',
-        '../src/ports/sk_predefined_gamma.h',
-
         '../include/core/Sk64.h',
         '../include/core/SkAdvancedTypefaceMetrics.h',
         '../include/core/SkAutoKern.h',
@@ -267,10 +253,6 @@
           'sources': [
             '../include/core/SkMMapStream.h',
             '../src/core/SkMMapStream.cpp',
-            '../src/ports/SkThread_pthread.cpp',
-            '../src/ports/SkFontHost_FreeType.cpp',
-            '../src/ports/SkFontHost_gamma_none.cpp',
-            '../src/ports/SkFontHost_linux.cpp',
           ],
           'link_settings': {
             'libraries': [
@@ -289,11 +271,6 @@
             '../include/utils/mac/SkCGUtils.h',
 
             '../src/core/SkMMapStream.cpp',
-            '../src/ports/SkFontHost_mac_coretext.cpp',
-#            '../src/ports/SkFontHost_FreeType.cpp',
-#            '../src/ports/SkFontHost_freetype_mac.cpp',
-#            '../src/ports/SkFontHost_gamma_none.cpp',
-            '../src/ports/SkThread_pthread.cpp',
           ],
           'link_settings': {
             'libraries': [
@@ -310,9 +287,6 @@
             '../include/utils/mac/SkCGUtils.h',
 
             '../src/core/SkMMapStream.cpp',
-            '../src/ports/SkFontHost_mac_coretext.cpp',
-
-            '../src/ports/SkThread_pthread.cpp',
           ],
           'link_settings': {
             'libraries': [
@@ -330,32 +304,14 @@
           'include_dirs': [
             'config/win',
           ],
-          'sources!': [ # these are used everywhere but windows
-            '../src/ports/SkDebug_stdio.cpp',
-            '../src/ports/SkTime_Unix.cpp',
-          ],
-        }, { # else !win
-          'sources!': [
-            '../src/ports/SkDebug_win.cpp',
-            '../src/ports/SkFontHost_win.cpp',
-            '../src/ports/SkThread_win.cpp',
-            '../src/ports/SkTime_win.cpp',
-          ],
         }],
         [ 'skia_os == "android"', {
           'sources!': [
             '../src/opts/opts_check_SSE2.cpp',
-            '../src/ports/SkDebug_stdio.cpp',
           ],
           'sources': [
             '../include/core/SkMMapStream.h',
             '../src/core/SkMMapStream.cpp',
-            '../src/ports/SkDebug_android.cpp',
-            '../src/ports/SkThread_pthread.cpp',
-            '../src/ports/SkFontHost_android.cpp',
-            '../src/ports/SkFontHost_gamma.cpp',
-            '../src/ports/SkFontHost_FreeType.cpp',
-            '../src/ports/FontHostConfiguration_android.cpp',
           ],
           'dependencies': [
              'android_system.gyp:ft2',

diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index 16577e98cb6412606d14abad1536bb2b8da49040..43075dc1440b7cf9ffe3e6c290ed2d748a5817ef 100644 (file)
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -21,6 +21,7 @@
         'gpu.gyp:gr',
         'gpu.gyp:skgr',
         'images.gyp:images',
+        'ports.gyp:ports',
         'pdf.gyp:pdf',
         'utils.gyp:utils',        
       ],

diff --git a/gyp/iOSSampleApp.gyp b/gyp/iOSSampleApp.gyp
index 4fe7fe23db9650c4cb5a56139bc93e185a1c2904..84708bbedd6d1ada14ce7459b26cf566763a78fc 100644 (file)
--- a/gyp/iOSSampleApp.gyp
+++ b/gyp/iOSSampleApp.gyp
@@ -149,6 +149,7 @@
         'core.gyp:core',
         'effects.gyp:effects',
         'images.gyp:images',
+        'ports.gyp:ports',
         'views.gyp:views',
         'utils.gyp:utils',
         'animator.gyp:animator',

diff --git a/gyp/ports.gyp b/gyp/ports.gyp
new file mode 100644 (file)
index 0000000..dd9c981
--- /dev/null
+++ b/gyp/ports.gyp
@@ -0,0 +1,106 @@
+# Port-specific Skia library code.
+{
+  'includes': [
+    'common.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'ports',
+      'type': 'static_library',
+      'include_dirs': [
+        '../include/config',
+        '../include/core',
+        '../include/ports',
+        '../include/xml',
+        '../src/core',
+      ],
+      'sources': [
+        '../src/ports/SkDebug_stdio.cpp',
+        '../src/ports/SkDebug_win.cpp',
+        '../src/ports/SkFontHost_sandbox_none.cpp',
+        '../src/ports/SkFontHost_win.cpp',
+        '../src/ports/SkThread_win.cpp',
+
+        '../src/ports/SkFontHost_tables.cpp',
+        '../src/ports/SkMemory_malloc.cpp',
+        '../src/ports/SkOSFile_stdio.cpp',
+        '../src/ports/SkTime_Unix.cpp',
+        '../src/ports/SkTime_win.cpp',
+        '../src/ports/SkXMLParser_empty.cpp',
+        '../src/ports/sk_predefined_gamma.h',
+      ],
+      'conditions': [
+        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
+          'sources': [
+            '../src/ports/SkThread_pthread.cpp',
+            '../src/ports/SkFontHost_FreeType.cpp',
+            '../src/ports/SkFontHost_gamma_none.cpp',
+            '../src/ports/SkFontHost_linux.cpp',
+          ],
+        }],
+        [ 'skia_os == "mac"', {
+          'include_dirs': [
+            '../include/utils/mac',
+            '../third_party/freetype/include/**',
+          ],
+          'sources': [
+            '../src/ports/SkFontHost_mac_coretext.cpp',
+#            '../src/ports/SkFontHost_FreeType.cpp',
+#            '../src/ports/SkFontHost_freetype_mac.cpp',
+#            '../src/ports/SkFontHost_gamma_none.cpp',
+            '../src/ports/SkThread_pthread.cpp',
+          ],
+        }],
+        [ 'skia_os == "ios"', {
+          'include_dirs': [
+            '../include/utils/ios',
+          ],
+          'sources': [
+            '../src/ports/SkFontHost_mac_coretext.cpp',
+            '../src/ports/SkThread_pthread.cpp',
+          ],
+        }],
+        [ 'skia_os == "win"', {
+          'include_dirs': [
+            'config/win',
+          ],
+          'sources!': [ # these are used everywhere but windows
+            '../src/ports/SkDebug_stdio.cpp',
+            '../src/ports/SkTime_Unix.cpp',
+          ],
+        }, { # else !win
+          'sources!': [
+            '../src/ports/SkDebug_win.cpp',
+            '../src/ports/SkFontHost_win.cpp',
+            '../src/ports/SkThread_win.cpp',
+            '../src/ports/SkTime_win.cpp',
+          ],
+        }],
+        [ 'skia_os == "android"', {
+          'sources!': [
+            '../src/ports/SkDebug_stdio.cpp',
+          ],
+          'sources': [
+            '../src/ports/SkDebug_android.cpp',
+            '../src/ports/SkThread_pthread.cpp',
+            '../src/ports/SkFontHost_android.cpp',
+            '../src/ports/SkFontHost_gamma.cpp',
+            '../src/ports/SkFontHost_FreeType.cpp',
+            '../src/ports/FontHostConfiguration_android.cpp',
+          ],
+        }],        
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../include/ports',
+        ],
+      },
+    },
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:

diff --git a/gyp/tests.gyp b/gyp/tests.gyp
index a9c152d6ae48d99e5a3f039bb4a507342f85a04b..acec8231ecd2f40724926359e917684fb868e236 100644 (file)
--- a/gyp/tests.gyp
+++ b/gyp/tests.gyp
@@ -77,6 +77,7 @@
         'gpu.gyp:gr',
         'gpu.gyp:skgr',
         'images.gyp:images',
+        'ports.gyp:ports',
         'pdf.gyp:pdf',
         'utils.gyp:utils',
       ],

diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index e0c04b490040bf8af9178bffe7ceb9da272d7889..3bc28145d2cb41bf3a48c2eefc73dd79af7e490d 100644 (file)
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -30,6 +30,7 @@
       'dependencies': [
         'core.gyp:core',
         'images.gyp:images',
+        'ports.gyp:ports',
         'utils.gyp:utils',
       ],
     },
@@ -42,6 +43,7 @@
       'dependencies': [
         'core.gyp:core',
         'images.gyp:images',
+        'ports.gyp:ports',
         'utils.gyp:utils',
       ],
     },
@@ -54,6 +56,7 @@
       'dependencies': [
         'core.gyp:core',
         'images.gyp:images',
+        'ports.gyp:ports',
         'utils.gyp:utils',
       ],
     },