summaryrefslogtreecommitdiffstats
path: root/media/media_lib.scons
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-26 18:55:01 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-26 18:55:01 +0000
commit403cf73262903bfc643c5ce21b68179a789aa60d (patch)
tree22550c938688f0267896aa112134566222d3e7d3 /media/media_lib.scons
parentdebd60bc6c9830c5c3d221e951b395ff4183bf41 (diff)
downloadchromium_src-403cf73262903bfc643c5ce21b68179a789aa60d.zip
chromium_src-403cf73262903bfc643c5ce21b68179a789aa60d.tar.gz
chromium_src-403cf73262903bfc643c5ce21b68179a789aa60d.tar.bz2
Generate additional .vcproj files in miscellaneous top-level components.
This also updates the .vcproj files themselves to fix minor stylistic incompatibilities with the rest. Affected .vcproj files: * No change (byte-for-byte identical): media\build\media.vcproj media\build\media_player.vcproj media\build\media_unittests.vcproj google_update\ondemand_updates.vcproj * Remove .\ prefix where inconsistent with the rest of a filelist: rlz\rlz.vcproj breakpad\breakpad_handler.vcproj * Add empty <ToolFiles>, <References> and <Globals> sections: breakpad\breakpad_sender.vcproj * Add explicit RootNamespace attribute: sdch\sdch.vcproj * Use Windows-canonical \ separators: sdch\sdch.vcproj * Remove unnecessary Filter and UniqueIdentifier attributes from <Filter> declarations: sdch\sdch.vcproj Additional cleanups along for the ride: * Split breakpad\SConscript logic into separate breakpad_{handler,sender}.scons files. * Add a media\media_player.scons configuration. Review URL: http://codereview.chromium.org/18717 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media_lib.scons')
-rw-r--r--media/media_lib.scons89
1 files changed, 67 insertions, 22 deletions
diff --git a/media/media_lib.scons b/media/media_lib.scons
index e24c619..690f902 100644
--- a/media/media_lib.scons
+++ b/media/media_lib.scons
@@ -8,8 +8,6 @@ Configuration for building media.lib / libmedia.a.
Import('env')
-env_res = env.Clone()
-env_tests = env.Clone()
env = env.Clone()
env.SConscript([
@@ -22,32 +20,79 @@ env.Prepend(
],
)
-# These net files work on *all* platforms; files that don't work
-# cross-platform live below.
-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('base', [
+ 'base/buffers.h',
'base/data_buffer.cc',
+ 'base/data_buffer.h',
+ 'base/factory.h',
+ 'base/filter_host.h',
'base/filter_host_impl.cc',
+ 'base/filter_host_impl.h',
+ 'base/filters.h',
'base/media_format.cc',
+ 'base/media_format.h',
+ 'base/pipeline.h',
'base/pipeline_impl.cc',
-]
+ 'base/pipeline_impl.h',
+ ]),
+ MSVSFilter('audio', [
+ 'audio/win/audio_manager_win.h',
+ 'audio/audio_output.h',
+ 'audio/win/audio_output_win.cc',
+ 'audio/simple_sources.h',
+ 'audio/win/simple_sources_win.cc',
+ 'audio/win/waveout_output_win.cc',
+ 'audio/win/waveout_output_win.h',
+ ]),
+])
-if env.Bit('windows'):
- input_files.extend([
- ])
+if not env.Bit('windows'):
+ # Windows-specific files.
+ input_files.Remove(
+ 'audio/win/audio_output_win.cc',
+ 'audio/win/simple_sources_win.cc',
+ 'audio/win/waveout_output_win.cc',
+ )
-if env.Bit('mac'):
- input_files.extend([
- ])
-
-if env.Bit('linux'):
- input_files.extend([
- ])
+env.ChromeLibrary('media', input_files)
-if env.Bit('posix'):
- input_files.extend([
- ])
+p = env.ChromeMSVSProject('build/media.vcproj',
+ dest='$CHROME_SRC_DIR/media/build/media.vcproj',
+ guid='{6AE76406-B03B-11DD-94B1-80B556D89593}',
+ keyword='Win32Proj',
+ # TODO(sgk): when we can intuit the hierarchy
+ # from the built targets.
+ #buildtargets=TODO,
+ files=input_files,
+ tools=[
+ 'VCPreBuildEventTool',
+ 'VCCustomBuildTool',
+ 'VCXMLDataGeneratorTool',
+ 'VCWebServiceProxyGeneratorTool',
+ 'VCMIDLTool',
+ 'VCCLCompilerTool',
+ 'VCManagedResourceCompilerTool',
+ 'VCResourceCompilerTool',
+ 'VCPreLinkEventTool',
+ 'VCLibrarianTool',
+ 'VCALinkTool',
+ 'VCXDCMakeTool',
+ 'VCBscMakeTool',
+ 'VCFxCopTool',
+ 'VCPostBuildEventTool',
+ ],
+ ConfigurationType='4')
-env.ChromeLibrary('media', input_files)
+p.AddConfig('Debug|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/debug.vsprops',
+ ])
-env.ChromeMSVSProject('$MEDIA_DIR/build/media.vcproj',
- guid='{6AE76406-B03B-11DD-94B1-80B556D89593}')
+p.AddConfig('Release|Win32',
+ InheritedPropertySheets=[
+ '$(SolutionDir)../build/release.vsprops',
+ ])