ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Soren Jorvang 2011-02-15 21:27:15 +00:00
parent 961ac54743
commit d19c97dbe1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

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

10
Source/Core/Common/Src/CDUtils.cpp
View File

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