summaryrefslogtreecommitdiffstats
path: root/third_party/libjpeg
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-27 00:35:08 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-27 00:35:08 +0000
commita08682513accd76f09e46283ca9850e47eb04516 (patch)
treef66c620a986bc88c96b8ce1098bb3763ac4fe5de /third_party/libjpeg
parenta2eb164258e813b983663b21167d4a57b8b54da0 (diff)
downloadchromium_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/libjpeg')
-rw-r--r--third_party/libjpeg/libjpeg.scons46
-rw-r--r--third_party/libjpeg/libjpeg.vcproj6
2 files changed, 48 insertions, 4 deletions
diff --git a/third_party/libjpeg/libjpeg.scons b/third_party/libjpeg/libjpeg.scons
index fb1e295e..dd9badf 100644
--- a/third_party/libjpeg/libjpeg.scons
+++ b/third_party/libjpeg/libjpeg.scons
@@ -53,18 +53,20 @@ elif env.Bit('linux'):
# We're not responsible for bad warning hygiene in this third party code.
env['CCFLAGS'].remove('-Wall')
-input_files = [
+input_files = ChromeFileList([
'jcapimin.c',
'jcapistd.c',
'jccoefct.c',
'jccolor.c',
'jcdctmgr.c',
'jchuff.c',
+ 'jchuff.h',
'jcinit.c',
'jcmainct.c',
'jcmarker.c',
'jcmaster.c',
'jcomapi.c',
+ 'jconfig.h',
'jcparam.c',
'jcphuff.c',
'jcprepct.c',
@@ -75,8 +77,10 @@ input_files = [
'jdatasrc.c',
'jdcoefct.c',
'jdcolor.c',
+ 'jdct.h',
'jddctmgr.c',
'jdhuff.c',
+ 'jdhuff.h',
'jdinput.c',
'jdmainct.c',
'jdmarker.c',
@@ -86,20 +90,54 @@ input_files = [
'jdpostct.c',
'jdsample.c',
'jerror.c',
+ 'jerror.h',
'jfdctflt.c',
'jfdctfst.c',
'jfdctint.c',
'jidctflt.c',
'jidctfst.c',
'jidctint.c',
+ 'jinclude.h',
'jmemmgr.c',
'jmemnobs.c',
+ 'jmemsys.h',
+ 'jmorecfg.h',
+ 'jpegint.h',
+ 'jpeglib.h',
'jquant1.c',
'jquant2.c',
'jutils.c',
-]
+ 'jversion.h',
+])
env.ChromeLibrary('libjpeg', input_files)
-env.ChromeMSVSProject('$LIBJPEG_DIR/libjpeg.vcproj',
- guid='{238CE175-76CE-4A25-A676-69D115885601}')
+p = env.ChromeMSVSProject('libjpeg.vcproj',
+ dest=('$CHROME_SRC_DIR/third_party/' +
+ 'libjpeg/libjpeg.vcproj'),
+ guid='{238CE175-76CE-4A25-A676-69D115885601}',
+ keyword='Win32Proj',
+ # TODO(sgk): when we can intuit the hierarchy
+ # from the built targets.
+ #buildtargets=TODO,
+ files=input_files,
+ relative_path_prefix='./',
+ tools=[
+ 'VCLibrarianTool',
+ 'VCCLCompilerTool',
+ ],
+ ConfigurationType='4')
+
+p.AddConfig('Debug|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/common.vsprops',
+ '$(SolutionDir)../build/debug.vsprops',
+ '$(SolutionDir)../build/external_code.vsprops',
+ ])
+
+p.AddConfig('Release|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/common.vsprops',
+ '$(SolutionDir)../build/release.vsprops',
+ '$(SolutionDir)../build/external_code.vsprops',
+ ])
diff --git a/third_party/libjpeg/libjpeg.vcproj b/third_party/libjpeg/libjpeg.vcproj
index c32858f..8a6359f 100644
--- a/third_party/libjpeg/libjpeg.vcproj
+++ b/third_party/libjpeg/libjpeg.vcproj
@@ -12,6 +12,8 @@
Name="Win32"
/>
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
@@ -38,6 +40,8 @@
/>
</Configuration>
</Configurations>
+ <References>
+ </References>
<Files>
<File
RelativePath=".\jcapimin.c"
@@ -256,4 +260,6 @@
>
</File>
</Files>
+ <Globals>
+ </Globals>
</VisualStudioProject>