1 files changed, 54 insertions, 19 deletions
diff --git a/third_party/libpng/libpng.scons b/third_party/libpng/libpng.scons
index 8b14dcf..8716157 100644
--- a/third_party/libpng/libpng.scons
+++ b/third_party/libpng/libpng.scons
@@ -39,27 +39,62 @@ env.Append(
     ],
 )
 
-input_files = [
+input_files = ChromeFileList([
     'png.c',
-    'pngwutil.c',
-    'pngwtran.c',
-    'pngwrite.c',
-    'pngwio.c',
-    'pngvcrd.c',
-    'pngtrans.c',
-    'pngset.c',
-    'pngrutil.c',
-    'pngrtran.c',
-    'pngrio.c',
-    'pngread.c',
-    'pngpread.c',
-    'pngmem.c',
-    'pngget.c',
-    'pnggccrd.c',
+    'png.h',
+    'pngconf.h',
     'pngerror.c',
-]
+    'pnggccrd.c',
+    'pngget.c',
+    'pngmem.c',
+    'pngpread.c',
+    'pngread.c',
+    'pngrio.c',
+    'pngrtran.c',
+    'pngrutil.c',
+    'pngset.c',
+    'pngtrans.c',
+    'pngusr.h',
+    'pngvcrd.c',
+    'pngwio.c',
+    'pngwrite.c',
+    'pngwtran.c',
+    'pngwutil.c',
+])
 
 env.ChromeStaticLibrary('libpng', input_files)
 
-env.ChromeMSVSProject('$LIBPNG_DIR/libpng.vcproj',
-                guid='{C564F145-9172-42C3-BFCB-6014CA97DBCD}')
+p = env.ChromeMSVSProject('libpng.vcproj',
+                          guid='{C564F145-9172-42C3-BFCB-6014CA97DBCD}',
+                          files=input_files,
+                          relative_path_prefix='./',
+                          tools = [
+                              'VCLibrarianTool',
+                              'VCCLCompilerTool',
+                          ])
+
+p.AddConfig('Debug|Win32',
+            ConfigurationType = '4',
+            InheritedPropertySheets = [
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/debug.vsprops',
+                '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
+                '$(SolutionDir)../build/external_code.vsprops',
+                '$(SolutionDir)../third_party/libpng/using_libpng.vsprops',
+            ])
+
+p.AddConfig('Release|Win32',
+            ConfigurationType = '4',
+            InheritedPropertySheets = [
+                '$(SolutionDir)../build/common.vsprops',
+                '$(SolutionDir)../build/release.vsprops',
+                '$(SolutionDir)../third_party/zlib/using_zlib.vsprops',
+                '$(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)