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

Unified Diff: flac.gyp

Issue 1961133002: Update FLAC to 1.3.1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/flac.git@master
Patch Set: build config tweaks for Windows Created 4 years, 7 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 | « README.chromium ('k') | include/FLAC/all.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: flac.gyp
diff --git a/flac.gyp b/flac.gyp
index 95935cea8afd23278c02d326704617e81fc0a8db..cea6e98b42be4cc4d168786f4dee87c71ab6a90d 100644
--- a/flac.gyp
+++ b/flac.gyp
@@ -19,6 +19,9 @@
'include/FLAC/stream_decoder.h',
'include/FLAC/stream_encoder.h',
'include/share/alloc.h',
+ 'include/share/compat.h',
+ 'include/share/endswap.h',
+ 'include/share/private.h',
'src/libFLAC/alloc.c',
'src/libFLAC/bitmath.c',
'src/libFLAC/bitreader.c',
@@ -45,9 +48,11 @@
'src/libFLAC/include/private/float.h',
'src/libFLAC/include/private/format.h',
'src/libFLAC/include/private/lpc.h',
+ 'src/libFLAC/include/private/macros.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.h',
'src/libFLAC/include/private/stream_encoder_framing.h',
'src/libFLAC/include/private/window.h',
'src/libFLAC/include/protected/all.h',
@@ -57,7 +62,31 @@
'defines': [
'FLAC__NO_DLL',
'FLAC__OVERFLOW_DETECT',
- 'VERSION="1.2.1"',
+ 'VERSION="1.3.1"',
+ 'HAVE_LROUND',
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+ 'sources': [
+ 'include/share/win_utf8_io.h',
+ 'src/share/win_utf8_io/win_utf8_io.c',
+ ],
+ 'defines!': [
+ 'WIN32_LEAN_AND_MEAN', # win_utf8_io.c defines this itself.
+ ],
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'AdditionalOptions': [
+ '/wd4334', # 32-bit shift converted to 64 bits.
+ '/wd4267', # Converting from size_t to unsigned on 64-bit.
+ ],
+ },
+ },
+ }, {
+ 'defines': [
+ 'HAVE_INTTYPES_H',
+ ],
+ }],
],
'include_dirs': [
'include',
« no previous file with comments | « README.chromium ('k') | include/FLAC/all.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698