The pkg-config name of libpng is "libpng", not just "png".

Things break if both a shared and static libpng are linked
in, presumably because it has some global state. Several of
the gtk-ish libraries often, but not always, link in libpng
transitively, so it is important that we find it ourselves
first, even if it is not in the linker's search path.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7178 8ced0084-cf51-0410-be5f-012b33b47a6e

SConstruct

@@ -209,7 +209,7 @@ else:
     if env['shared_glew']:
         env['shared_glew'] = conf.CheckPKG('GLEW')
     if env['shared_png']:
-        env['shared_png'] = conf.CheckPKG('png')
+        env['shared_png'] = conf.CheckPKG('libpng')
     if env['shared_sdl']:
         env['shared_sdl'] = conf.CheckPKG('SDL')
     if env['shared_zlib']:

Source/Core/Common/Src/CDUtils.cpp

@@ -149,8 +149,8 @@ static struct
 } checklist[] =
 	{
 #ifdef __linux__
-		{ "/dev/cdrom", 0, 0},
-		{ "/dev/dvd", 0, 0},
+		{ "/dev/cdrom", 0, 0 },
+		{ "/dev/dvd", 0, 0 },
 		{ "/dev/hd%c", 'a', 'z' },
 		{ "/dev/scd%d", 0, 27 },
 		{ "/dev/sr%d", 0, 27 },
@@ -158,7 +158,7 @@ static struct
 		{ "/dev/acd%d", 0, 27 },
 		{ "/dev/cd%d", 0, 27 },
 #endif
-		{ NULL }
+		{ NULL, 0, 0 }
 	};
 
 // Returns true if a device is a block or char device and not a symbolic link