Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Unified Diff: gyp/fontconfig.gyp

Issue 23190020: Revert "The CL adds libpoppler to DEPS and adds a libpoppler-cpp gyp target for Linux, Windows, and… (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gyp/freetype.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/fontconfig.gyp
diff --git a/gyp/fontconfig.gyp b/gyp/fontconfig.gyp
deleted file mode 100644
index 94f6e4e0092e304864fb018111d8c3e6fb606df2..0000000000000000000000000000000000000000
--- a/gyp/fontconfig.gyp
+++ /dev/null
@@ -1,101 +0,0 @@
-# GYP for fontconfig (
-#
-# This has been tested on Windows and Mac.
-# This library is native to Linux, so build from source is not necessary.
-#
-# Additional files for building under Windows are provided here: (LGPL)
-# http://comments.gmane.org/gmane.comp.fonts.fontconfig/4438
-
-{
- 'variables': {
- 'skia_warnings_as_errors': 0,
- },
- 'targets': [
- {
- 'target_name': 'fontconfig',
- 'type': 'static_library',
- 'dependencies': [
- 'freetype.gyp:freetype_poppler',
- ],
- 'include_dirs' : [
- '../third_party/externals/fontconfig',
-
- '../third_party/fontconfig/config',
- '../third_party/fontconfig/config/src',
- ],
- 'sources': [
- '../third_party/externals/fontconfig/src/fcatomic.c',
- '../third_party/externals/fontconfig/src/fcblanks.c',
- '../third_party/externals/fontconfig/src/fccache.c',
- '../third_party/externals/fontconfig/src/fccfg.c',
- '../third_party/externals/fontconfig/src/fccharset.c',
- '../third_party/externals/fontconfig/src/fccompat.c',
- '../third_party/externals/fontconfig/src/fcdbg.c',
- '../third_party/externals/fontconfig/src/fcdefault.c',
- '../third_party/externals/fontconfig/src/fcdir.c',
- '../third_party/externals/fontconfig/src/fcfreetype.c',
- '../third_party/externals/fontconfig/src/fcfs.c',
- '../third_party/externals/fontconfig/src/fchash.c',
- '../third_party/externals/fontconfig/src/fcinit.c',
- '../third_party/externals/fontconfig/src/fclang.c',
- '../third_party/externals/fontconfig/src/fclist.c',
- '../third_party/externals/fontconfig/src/fcmatch.c',
- '../third_party/externals/fontconfig/src/fcmatrix.c',
- '../third_party/externals/fontconfig/src/fcname.c',
- '../third_party/externals/fontconfig/src/fcobjs.c',
- '../third_party/externals/fontconfig/src/fcpat.c',
- '../third_party/externals/fontconfig/src/fcserialize.c',
- '../third_party/externals/fontconfig/src/fcstat.c',
- '../third_party/externals/fontconfig/src/fcstr.c',
- '../third_party/externals/fontconfig/src/fcxml.c',
- '../third_party/externals/fontconfig/src/ftglue.c',
- ],
- 'defines': [
- 'HAVE_CONFIG_H',
- ],
- 'cflags': [
- '-fPIC',
- ],
-
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../third_party/externals/fontconfig',
- ],
- },
-
- 'conditions': [
- ['skia_os == "mac"', {
- 'include_dirs': [
- '../third_party/fontconfig/config/mac',
- '../third_party/fontconfig/config/mac/src',
- ],
- 'defines': [
- 'FC_CACHEDIR',
- 'FONTCONFIG_PATH',
- ],
- 'libraries': [
- '$(SDKROOT)/usr/lib/libexpat.dylib',
- ],
- 'xcode_settings': {
- 'DYLIB_INSTALL_NAME_BASE': '@executable_path',
- },
- }],
- ['skia_os == "win"', {
- 'include_dirs': [
- '../third_party/fontconfig/config/windows',
- '../third_party/fontconfig/config/windows/src',
- ],
- 'sources!': [
- '../third_party/externals/fontconfig/src/fccompat.c',
- '../third_party/externals/fontconfig/src/fcxml.c',
- ],
- 'defines': [
- # inline is not recognized in C and has to be __inline
- 'inline=__inline',
- ],
- }],
- ],
- },
- ],
-}
-
« no previous file with comments | « no previous file | gyp/freetype.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698