diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-02-15 21:27:15 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-02-15 21:27:15 +0000 |
| commit | d19c97dbe178bee6c315933fdf94416fcd4b4d60 (patch) | |
| tree | 68dbaf01b6c499275db81c48070b0df55eaf3faa | |
| parent | 961ac547431ca4abb76cf563f8b8c4cee75ac47d (diff) | |
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
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Src/CDUtils.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct index 923eaaa512..7de79a26b1 100644 --- a/SConstruct +++ b/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']: diff --git a/Source/Core/Common/Src/CDUtils.cpp b/Source/Core/Common/Src/CDUtils.cpp index 7477568e0a..30dc8a27a3 100644 --- a/Source/Core/Common/Src/CDUtils.cpp +++ b/Source/Core/Common/Src/CDUtils.cpp @@ -149,16 +149,16 @@ static struct } checklist[] = { #ifdef __linux__ - { "/dev/cdrom", 0, 0}, - { "/dev/dvd", 0, 0}, - { "/dev/hd%c", 'a', 'z' }, + { "/dev/cdrom", 0, 0 }, + { "/dev/dvd", 0, 0 }, + { "/dev/hd%c", 'a', 'z' }, { "/dev/scd%d", 0, 27 }, - { "/dev/sr%d", 0, 27 }, + { "/dev/sr%d", 0, 27 }, #else { "/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 |