diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 00:35:08 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 00:35:08 +0000 |
| commit | a08682513accd76f09e46283ca9850e47eb04516 (patch) | |
| tree | f66c620a986bc88c96b8ce1098bb3763ac4fe5de /third_party/lzma_sdk | |
| parent | a2eb164258e813b983663b21167d4a57b8b54da0 (diff) | |
| download | chromium_src-a08682513accd76f09e46283ca9850e47eb04516.zip chromium_src-a08682513accd76f09e46283ca9850e47eb04516.tar.gz chromium_src-a08682513accd76f09e46283ca9850e47eb04516.tar.bz2 | |
Generation of .vcproj files for remaining third_party components.
Updates the .vcproj files themselves for stylistic consistency
with the rest. Affected .vcproj files:
* No change (byte-for-byte identical):
third_party\libxml\build\libxml.vcproj
third_party\bsdiff\bsdiff.vcproj
third_party\sqlite\sqlite.vcproj
* Add empty <ToolFiles>, <References> and <Globals> sections:
third_party\libxslt\build\libxslt.vcproj
third_party\bspatch\bspatch.vcproj
third_party\bzip2\bzip2.vcproj
third_party\lzma\7z_C.vcproj
third_party\modp_b64\modp_b64.vcproj
third_party\libjpeg\libjpeg.vcproj
* Add explicit RootNamspace attribute:
third_party\bzip2\bzip2.vcproj
* Reorder DisableSpecificWarnings and PreprocessorDefinitions attributes
in VCCLCompilerTool:
third_party\bzip2\bzip2.vcproj
Review URL: http://codereview.chromium.org/18785
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/lzma_sdk')
| -rw-r--r-- | third_party/lzma_sdk/7z_C.vcproj | 2 | ||||
| -rw-r--r-- | third_party/lzma_sdk/lzma_sdk.scons | 86 |
2 files changed, 80 insertions, 8 deletions
diff --git a/third_party/lzma_sdk/7z_C.vcproj b/third_party/lzma_sdk/7z_C.vcproj index 7d1db41..feb970a 100644 --- a/third_party/lzma_sdk/7z_C.vcproj +++ b/third_party/lzma_sdk/7z_C.vcproj @@ -12,6 +12,8 @@ Name="Win32" /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" diff --git a/third_party/lzma_sdk/lzma_sdk.scons b/third_party/lzma_sdk/lzma_sdk.scons index e50c5ea..51db052 100644 --- a/third_party/lzma_sdk/lzma_sdk.scons +++ b/third_party/lzma_sdk/lzma_sdk.scons @@ -31,23 +31,93 @@ if env.Bit('windows'): ], ) -input_files = [ +input_files = ChromeFileList([ + # TODO(sgk): violate standard indentation so we don't have to + # reindent too much when we remove the explicit MSVSFilter() calls + # in favor of generating the hierarchy to reflect the file system. + MSVSFilter('LZMA', [ + 'Compress/Lzma/LzmaDecode.c', + 'Compress/Lzma/LzmaDecode.h', + 'Compress/Lzma/LzmaTypes.h', + ]), + MSVSFilter('Common', [ '7zCrc.c', + '7zCrc.h', + 'Types.h', + ]), + MSVSFilter('Branch', [ + 'Compress/Branch/BranchTypes.h', + 'Compress/Branch/BranchX86.c', + 'Compress/Branch/BranchX86.h', + 'Compress/Branch/BranchX86_2.c', + 'Compress/Branch/BranchX86_2.h', + ]), + MSVSFilter('7z', [ 'Archive/7z/7zAlloc.c', + 'Archive/7z/7zAlloc.h', 'Archive/7z/7zBuffer.c', + 'Archive/7z/7zBuffer.h', 'Archive/7z/7zDecode.c', + 'Archive/7z/7zDecode.h', 'Archive/7z/7zExtract.c', + 'Archive/7z/7zExtract.h', 'Archive/7z/7zHeader.c', + 'Archive/7z/7zHeader.h', 'Archive/7z/7zIn.c', + 'Archive/7z/7zIn.h', 'Archive/7z/7zItem.c', + 'Archive/7z/7zItem.h', 'Archive/7z/7zMethodID.c', - 'Compress/Branch/BranchX86.c', - 'Compress/Branch/BranchX86_2.c', - 'Compress/Lzma/LzmaDecode.c', -] + 'Archive/7z/7zMethodID.h', + ]), +]) env.ChromeLibrary('lzma_sdk', input_files) -env.ChromeMSVSProject('$LZMA_SDK_DIR/7z_C.vcproj', - name='lzma_sdk', - guid='{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}') +p = env.ChromeMSVSProject('7z_C.vcproj', + dest=('$CHROME_SRC_DIR/third_party/' + + 'lzma_sdk/7z_C.vcproj'), + name='lzma_sdk', + guid='{B84553C8-5676-427B-B3E4-23DDDC4DBC7B}', + keyword='Win32Proj', + # TODO(sgk): when we can intuit the hierarchy + # from the built targets. + #buildtargets=TODO, + files=input_files, + ConfigurationType='4') + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/debug.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops', + ], + tools=[ + MSVSTool('VCCLCompilerTool', + PreprocessorDefinitions=[ + '_DEBUG', + 'WIN32', + '_CONSOLE', + '_LZMA_PROB32' + ]), + 'VCLibrarianTool', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/common.vsprops', + '$(SolutionDir)../build/release.vsprops', + '$(SolutionDir)../build/external_code.vsprops', + '$(SolutionDir)../third_party/lzma_sdk/using_lzma_sdk.vsprops', + ], + tools=[ + MSVSTool('VCCLCompilerTool', + PreprocessorDefinitions=[ + 'NDEBUG', + 'WIN32', + '_CONSOLE', + '_LZMA_PROB32' + ]), + 'VCLibrarianTool', + ]) |