diff options
author | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-26 18:29:26 +0000 |
---|---|---|
committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-26 18:29:26 +0000 |
commit | a8ce59041d437924bf143763759a63f6063c2eaf (patch) | |
tree | e8f08a1c9a5ea5bf55674e3c0860f9924b620eaa /libjpeg.gyp | |
parent | 697df83475d51338c4f74fdebdce236888600e42 (diff) | |
download | gyp-a8ce59041d437924bf143763759a63f6063c2eaf.tar.gz |
Copy libjpeg.gyp from third_party/externals/libjpeg/ to gyp/
This should get our use of libjpeg-from-source unblocked; see http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp from Chrome's libjpeg port, rather than making our own copy') for a better long-term solution.
Review URL: https://codereview.appspot.com/5908058
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3496 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'libjpeg.gyp')
-rw-r--r-- | libjpeg.gyp | 115 |
1 files changed, 105 insertions, 10 deletions
diff --git a/libjpeg.gyp b/libjpeg.gyp index 4826f48..4480d51 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -1,19 +1,114 @@ -# Copyright 2012 The Android Open Source Project -# +# Copyright 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# Depend on this wrapper to pick up libjpeg from third_party +# This is a copy of ../third_party/externals/libjpeg/libjpeg.gyp , modified +# such that all source paths point into that directory. +# See http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp +# from Chrome's libjpeg port, rather than making our own copy') for a better +# long-term solution. { - 'targets': [ - { - 'target_name': 'libjpeg', - 'type': 'none', - 'dependencies': [ - '../third_party/externals/libjpeg/libjpeg.gyp:libjpeg', + 'variables': { + 'conditions': [ + [ 'os_posix == 1 and OS != "mac"', { + # Link to system .so since we already use it due to GTK. + 'use_system_libjpeg%': 1, + }, { # os_posix != 1 or OS == "mac" + 'use_system_libjpeg%': 0, + }], + ], + }, + 'conditions': [ + ['use_system_libjpeg==0', { + 'targets': [ + { + 'target_name': 'libjpeg', + 'type': 'static_library', + 'sources': [ + '../third_party/externals/libjpeg/jcapimin.c', + '../third_party/externals/libjpeg/jcapistd.c', + '../third_party/externals/libjpeg/jccoefct.c', + '../third_party/externals/libjpeg/jccolor.c', + '../third_party/externals/libjpeg/jcdctmgr.c', + '../third_party/externals/libjpeg/jchuff.c', + '../third_party/externals/libjpeg/jchuff.h', + '../third_party/externals/libjpeg/jcinit.c', + '../third_party/externals/libjpeg/jcmainct.c', + '../third_party/externals/libjpeg/jcmarker.c', + '../third_party/externals/libjpeg/jcmaster.c', + '../third_party/externals/libjpeg/jcomapi.c', + '../third_party/externals/libjpeg/jconfig.h', + '../third_party/externals/libjpeg/jcparam.c', + '../third_party/externals/libjpeg/jcphuff.c', + '../third_party/externals/libjpeg/jcprepct.c', + '../third_party/externals/libjpeg/jcsample.c', + '../third_party/externals/libjpeg/jdapimin.c', + '../third_party/externals/libjpeg/jdapistd.c', + '../third_party/externals/libjpeg/jdatadst.c', + '../third_party/externals/libjpeg/jdatasrc.c', + '../third_party/externals/libjpeg/jdcoefct.c', + '../third_party/externals/libjpeg/jdcolor.c', + '../third_party/externals/libjpeg/jdct.h', + '../third_party/externals/libjpeg/jddctmgr.c', + '../third_party/externals/libjpeg/jdhuff.c', + '../third_party/externals/libjpeg/jdhuff.h', + '../third_party/externals/libjpeg/jdinput.c', + '../third_party/externals/libjpeg/jdmainct.c', + '../third_party/externals/libjpeg/jdmarker.c', + '../third_party/externals/libjpeg/jdmaster.c', + '../third_party/externals/libjpeg/jdmerge.c', + '../third_party/externals/libjpeg/jdphuff.c', + '../third_party/externals/libjpeg/jdpostct.c', + '../third_party/externals/libjpeg/jdsample.c', + '../third_party/externals/libjpeg/jerror.c', + '../third_party/externals/libjpeg/jerror.h', + '../third_party/externals/libjpeg/jfdctflt.c', + '../third_party/externals/libjpeg/jfdctfst.c', + '../third_party/externals/libjpeg/jfdctint.c', + '../third_party/externals/libjpeg/jidctflt.c', + '../third_party/externals/libjpeg/jidctfst.c', + '../third_party/externals/libjpeg/jidctint.c', + '../third_party/externals/libjpeg/jinclude.h', + '../third_party/externals/libjpeg/jmemmgr.c', + '../third_party/externals/libjpeg/jmemnobs.c', + '../third_party/externals/libjpeg/jmemsys.h', + '../third_party/externals/libjpeg/jmorecfg.h', + '../third_party/externals/libjpeg/jpegint.h', + '../third_party/externals/libjpeg/jpeglib.h', + '../third_party/externals/libjpeg/jquant1.c', + '../third_party/externals/libjpeg/jquant2.c', + '../third_party/externals/libjpeg/jutils.c', + '../third_party/externals/libjpeg/jversion.h', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '.', + ], + }, + 'conditions': [ + ['OS!="win"', {'product_name': 'jpeg'}], + ], + }, ], - }, + }, { + 'targets': [ + { + 'target_name': 'libjpeg', + 'type': 'none', + 'direct_dependent_settings': { + 'defines': [ + 'USE_SYSTEM_LIBJPEG', + ], + }, + 'link_settings': { + 'libraries': [ + '-ljpeg', + ], + }, + } + ], + }], ], } |