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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: flac.gyp

Issue 14878006: Remove use_system_flac logic from the mainline gyp file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/flac/
Patch Set: Created 7 years, 8 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: flac.gyp
===================================================================
--- flac.gyp (revision 197998)
+++ flac.gyp (working copy)
@@ -3,125 +3,86 @@
# found in the LICENSE file.
{
- 'variables': {
- 'use_system_flac%': 0,
- },
- 'conditions': [
- ['use_system_flac==0', {
- 'targets': [
- {
- 'target_name': 'libflac',
- 'product_name': 'flac',
- 'type': 'static_library',
- 'sources': [
- 'include/FLAC/all.h',
- 'include/FLAC/assert.h',
- 'include/FLAC/callback.h',
- 'include/FLAC/export.h',
- 'include/FLAC/format.h',
- 'include/FLAC/metadata.h',
- 'include/FLAC/ordinals.h',
- 'include/FLAC/stream_decoder.h',
- 'include/FLAC/stream_encoder.h',
- 'include/share/alloc.h',
- 'src/libFLAC/alloc.c',
- 'src/libFLAC/bitmath.c',
- 'src/libFLAC/bitreader.c',
- 'src/libFLAC/bitwriter.c',
- 'src/libFLAC/cpu.c',
- 'src/libFLAC/crc.c',
- 'src/libFLAC/fixed.c',
- 'src/libFLAC/float.c',
- 'src/libFLAC/format.c',
- 'src/libFLAC/lpc.c',
- 'src/libFLAC/md5.c',
- 'src/libFLAC/memory.c',
- 'src/libFLAC/stream_decoder.c',
- 'src/libFLAC/stream_encoder.c',
- 'src/libFLAC/stream_encoder_framing.c',
- 'src/libFLAC/window.c',
- 'src/libFLAC/include/private/all.h',
- 'src/libFLAC/include/private/bitmath.h',
- 'src/libFLAC/include/private/bitreader.h',
- 'src/libFLAC/include/private/bitwriter.h',
- 'src/libFLAC/include/private/cpu.h',
- 'src/libFLAC/include/private/crc.h',
- 'src/libFLAC/include/private/fixed.h',
- 'src/libFLAC/include/private/float.h',
- 'src/libFLAC/include/private/format.h',
- 'src/libFLAC/include/private/lpc.h',
- 'src/libFLAC/include/private/md5.h',
- 'src/libFLAC/include/private/memory.h',
- 'src/libFLAC/include/private/metadata.h',
- 'src/libFLAC/include/private/stream_encoder_framing.h',
- 'src/libFLAC/include/private/window.h',
- 'src/libFLAC/include/protected/all.h',
- 'src/libFLAC/include/protected/stream_decoder.h',
- 'src/libFLAC/include/protected/stream_encoder.h',
- ],
- 'defines': [
- 'FLAC__NO_DLL',
- 'FLAC__OVERFLOW_DETECT',
- 'VERSION="1.2.1"',
- ],
- 'include_dirs': [
- 'include',
- 'src/libFLAC/include',
- ],
- 'direct_dependent_settings': {
- 'defines': [
- 'FLAC__NO_DLL',
- ],
- },
- 'conditions': [
- ['clang == 1', {
- 'xcode_settings': {
- 'WARNING_CFLAGS': [
- # libflac converts between FLAC__StreamDecoderState and
- # FLAC__StreamDecoderInitStatus a lot in stream_decoder.c.
- '-Wno-conversion',
- ],
- },
- 'cflags': [
- '-Wno-conversion',
- ],
- }],
- ],
- },
+ 'targets': [
+ {
+ 'target_name': 'libflac',
+ 'product_name': 'flac',
+ 'type': 'static_library',
+ 'sources': [
+ 'include/FLAC/all.h',
+ 'include/FLAC/assert.h',
+ 'include/FLAC/callback.h',
+ 'include/FLAC/export.h',
+ 'include/FLAC/format.h',
+ 'include/FLAC/metadata.h',
+ 'include/FLAC/ordinals.h',
+ 'include/FLAC/stream_decoder.h',
+ 'include/FLAC/stream_encoder.h',
+ 'include/share/alloc.h',
+ 'src/libFLAC/alloc.c',
+ 'src/libFLAC/bitmath.c',
+ 'src/libFLAC/bitreader.c',
+ 'src/libFLAC/bitwriter.c',
+ 'src/libFLAC/cpu.c',
+ 'src/libFLAC/crc.c',
+ 'src/libFLAC/fixed.c',
+ 'src/libFLAC/float.c',
+ 'src/libFLAC/format.c',
+ 'src/libFLAC/lpc.c',
+ 'src/libFLAC/md5.c',
+ 'src/libFLAC/memory.c',
+ 'src/libFLAC/stream_decoder.c',
+ 'src/libFLAC/stream_encoder.c',
+ 'src/libFLAC/stream_encoder_framing.c',
+ 'src/libFLAC/window.c',
+ 'src/libFLAC/include/private/all.h',
+ 'src/libFLAC/include/private/bitmath.h',
+ 'src/libFLAC/include/private/bitreader.h',
+ 'src/libFLAC/include/private/bitwriter.h',
+ 'src/libFLAC/include/private/cpu.h',
+ 'src/libFLAC/include/private/crc.h',
+ 'src/libFLAC/include/private/fixed.h',
+ 'src/libFLAC/include/private/float.h',
+ 'src/libFLAC/include/private/format.h',
+ 'src/libFLAC/include/private/lpc.h',
+ 'src/libFLAC/include/private/md5.h',
+ 'src/libFLAC/include/private/memory.h',
+ 'src/libFLAC/include/private/metadata.h',
+ 'src/libFLAC/include/private/stream_encoder_framing.h',
+ 'src/libFLAC/include/private/window.h',
+ 'src/libFLAC/include/protected/all.h',
+ 'src/libFLAC/include/protected/stream_decoder.h',
+ 'src/libFLAC/include/protected/stream_encoder.h',
],
- }, { # use_system_speex != 0
- 'targets': [
- {
- 'target_name': 'libflac',
- 'type': 'none',
- 'variables': {
- 'headers_root_path': 'include',
- 'header_filenames': [
- 'FLAC/callback.h',
- 'FLAC/metadata.h',
- 'FLAC/assert.h',
- 'FLAC/export.h',
- 'FLAC/format.h',
- 'FLAC/stream_decoder.h',
- 'FLAC/stream_encoder.h',
- 'FLAC/ordinals.h',
- 'FLAC/all.h',
+ 'defines': [
+ 'FLAC__NO_DLL',
+ 'FLAC__OVERFLOW_DETECT',
+ 'VERSION="1.2.1"',
+ ],
+ 'include_dirs': [
+ 'include',
+ 'src/libFLAC/include',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'FLAC__NO_DLL',
+ ],
+ },
+ 'conditions': [
+ ['clang == 1', {
+ 'xcode_settings': {
+ 'WARNING_CFLAGS': [
+ # libflac converts between FLAC__StreamDecoderState and
+ # FLAC__StreamDecoderInitStatus a lot in stream_decoder.c.
+ '-Wno-conversion',
],
},
- 'includes': [
- '../../build/shim_headers.gypi',
+ 'cflags': [
+ '-Wno-conversion',
],
- 'link_settings': {
- 'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other flac)',
- ],
- 'libraries': [
- '<!@(pkg-config --libs-only-l flac)',
- ],
- },
- },
+ }],
],
- }],
+ },
],
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698