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',
+            ])