diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libpng/libpng.scons | 7 | ||||
| -rw-r--r-- | third_party/sqlite/SConscript | 3 | ||||
| -rw-r--r-- | third_party/zlib/zlib.scons | 28 |
3 files changed, 19 insertions, 19 deletions
diff --git a/third_party/libpng/libpng.scons b/third_party/libpng/libpng.scons index 9c366a9..059a066 100644 --- a/third_party/libpng/libpng.scons +++ b/third_party/libpng/libpng.scons @@ -65,6 +65,7 @@ input_files = ChromeFileList([ env.ChromeLibrary('libpng', input_files) p = env.ChromeMSVSProject('libpng.vcproj', + dest='$CHROME_SRC_DIR/third_party/libpng/libpng.vcproj', guid='{C564F145-9172-42C3-BFCB-6014CA97DBCD}', files=input_files, relative_path_prefix='./', @@ -92,9 +93,3 @@ p.AddConfig('Release|Win32', '$(SolutionDir)../build/external_code.vsprops', '$(SolutionDir)../third_party/libpng/using_libpng.vsprops', ]) - -env.AlwaysBuild(p) - -i = env.Command('$CHROME_SRC_DIR/third_party/libpng/libpng.vcproj', p, - Copy('$TARGET', '$SOURCE')) -Alias('msvs', i) diff --git a/third_party/sqlite/SConscript b/third_party/sqlite/SConscript index b58885f..b6ddffb 100644 --- a/third_party/sqlite/SConscript +++ b/third_party/sqlite/SConscript @@ -138,6 +138,9 @@ if env.Bit('windows'): env.ChromeLibrary('sqlite', input_files) env.ChromeMSVSProject('$SQLITE_DIR/sqlite.vcproj', + dependencies = [ + '$ICU38_DIR/build/icu.vcproj', + ], guid='{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}') # TODO(tc): There should be a target to build the stand alone sqlite shell. diff --git a/third_party/zlib/zlib.scons b/third_party/zlib/zlib.scons index c62aeb4..74eed17 100644 --- a/third_party/zlib/zlib.scons +++ b/third_party/zlib/zlib.scons @@ -27,7 +27,18 @@ if env.Bit('windows'): ], ) +minizip_filter = MSVSFilter('minizip', [ + 'contrib/minizip/ioapi.c', + 'contrib/minizip/ioapi.h', + 'contrib/minizip/iowin32.c', + 'contrib/minizip/iowin32.h', + 'contrib/minizip/unzip.c', + 'contrib/minizip/unzip.h' +]) + input_files = ChromeFileList([ + minizip_filter, + 'adler32.c', 'compress.c', 'crc32.c', @@ -51,17 +62,13 @@ input_files = ChromeFileList([ 'zlib.h', 'zutil.c', 'zutil.h', - 'contrib/minizip/ioapi.c', - 'contrib/minizip/ioapi.h', - 'contrib/minizip/unzip.c', - 'contrib/minizip/unzip.h' ]) -if env.Bit('windows'): - input_files.extend([ +if not env.Bit('windows'): + input_files.Remove( 'contrib/minizip/iowin32.c', 'contrib/minizip/iowin32.h', - ]) + ) if env.Bit('posix'): env.Append( @@ -74,6 +81,7 @@ if env.Bit('posix'): env.ChromeLibrary('zlib', input_files) p = env.ChromeMSVSProject('zlib.vcproj', + dest='$CHROME_SRC_DIR/third_party/zlib/zlib.vcproj', guid='{8423AF0D-4B88-4EBF-94E1-E4D00D00E21C}', files=input_files, relative_path_prefix=r'./', @@ -99,9 +107,3 @@ p.AddConfig('Release|Win32', '$(SolutionDir)../build/external_code.vsprops', './zlib.vsprops' ]) - -env.AlwaysBuild(p) - -i = env.Command('$CHROME_SRC_DIR/third_party/zlib/zlib.vcproj', p, - Copy('$TARGET', '$SOURCE')) -Alias('msvs', i) |