summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--FileReaderApp.gyp1
-rw-r--r--SampleApp.gyp1
-rw-r--r--bench.gyp1
-rw-r--r--core.gyp44
-rw-r--r--gm.gyp1
-rw-r--r--iOSSampleApp.gyp1
-rw-r--r--ports.gyp106
-rw-r--r--tests.gyp1
-rw-r--r--tools.gyp3
9 files changed, 115 insertions, 44 deletions
diff --git a/FileReaderApp.gyp b/FileReaderApp.gyp
index 0e2c48f..c5651c7 100644
--- a/FileReaderApp.gyp
+++ b/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/SampleApp.gyp b/SampleApp.gyp
index 3f468f8..fed4bf4 100644
--- a/SampleApp.gyp
+++ b/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/bench.gyp b/bench.gyp
index 6361586..0c5e2ea 100644
--- a/bench.gyp
+++ b/bench.gyp
@@ -22,6 +22,7 @@
'gpu.gyp:gr',
'gpu.gyp:skgr',
'images.gyp:images',
+ 'ports.gyp:ports',
'utils.gyp:utils',
],
},
diff --git a/core.gyp b/core.gyp
index 0ee608e..488caa3 100644
--- a/core.gyp
+++ b/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/gm.gyp b/gm.gyp
index 16577e9..43075dc 100644
--- a/gm.gyp
+++ b/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/iOSSampleApp.gyp b/iOSSampleApp.gyp
index 4fe7fe2..84708bb 100644
--- a/iOSSampleApp.gyp
+++ b/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/ports.gyp b/ports.gyp
new file mode 100644
index 0000000..dd9c981
--- /dev/null
+++ b/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/tests.gyp b/tests.gyp
index a9c152d..acec823 100644
--- a/tests.gyp
+++ b/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/tools.gyp b/tools.gyp
index e0c04b4..3bc2814 100644
--- a/tools.gyp
+++ b/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',
],
},
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 05:22:28 +0000