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

sdl: added option to use system minizip

This commit is contained in:
punkrockguy318 2013-03-10 20:10:39 +00:00
parent 87b850f9f7
commit 427c868add
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SConstruct
View File

@ -20,6 +20,7 @@ opts.AddVariables(
BoolVariable('DEBUG', 'Build with debugging symbols', 1), BoolVariable('DEBUG', 'Build with debugging symbols', 1),
BoolVariable('LUA', 'Enable Lua support', 1), BoolVariable('LUA', 'Enable Lua support', 1),
BoolVariable('SYSTEM_LUA','Use system lua instead of static lua provided with fceux', 1), BoolVariable('SYSTEM_LUA','Use system lua instead of static lua provided with fceux', 1),
BoolVariable('SYSTEM_MINIZIP', 'Use system minizip instead of static minizip provided with fceux', 0),
BoolVariable('NEWPPU', 'Enable new PPU core', 1), BoolVariable('NEWPPU', 'Enable new PPU core', 1),
BoolVariable('CREATE_AVI', 'Enable avi creation support (SDL only)', 1), BoolVariable('CREATE_AVI', 'Enable avi creation support (SDL only)', 1),
BoolVariable('LOGO', 'Enable a logoscreen when creating avis (SDL only)', 1), BoolVariable('LOGO', 'Enable a logoscreen when creating avis (SDL only)', 1),
@ -83,7 +84,12 @@ else:
conf = Configure(env) conf = Configure(env)
if conf.CheckFunc('asprintf'): if conf.CheckFunc('asprintf'):
conf.env.Append(CCFLAGS = "-DHAVE_ASPRINTF") conf.env.Append(CCFLAGS = "-DHAVE_ASPRINTF")
assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib" if env['SYSTEM_MINIZIP']:
assert conf.CheckLibWithHeader('minizip', 'minizip/unzip.h', 'C', 'unzOpen;', 1), "please install: libminizip"
assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
env.Append(CPPDEFINES=["_SYSTEM_MINIZIP"])
else:
assert conf.CheckLibWithHeader('z', 'zlib.h', 'c', 'inflate;', 1), "please install: zlib"
if not conf.CheckLib('SDL'): if not conf.CheckLib('SDL'):
print 'Did not find libSDL or SDL.lib, exiting!' print 'Did not find libSDL or SDL.lib, exiting!'
Exit(1) Exit(1)

1
changelog.txt
View File

@ -1,3 +1,4 @@
10-Mar-2013 - prg - SDL: added option to use system minizip
10-Mar-2013 - prg - updated to use minizip v1.2.7 10-Mar-2013 - prg - updated to use minizip v1.2.7
28-Feb-2013 - AnS - PPU/PAL/Input type changing is now disabled when a movie is playing 28-Feb-2013 - AnS - PPU/PAL/Input type changing is now disabled when a movie is playing
28-Feb-2013 - AnS - Cheats: update the window when ROM is changed 28-Feb-2013 - AnS - Cheats: update the window when ROM is changed

4
src/file.cpp
View File

@ -36,7 +36,11 @@
#include "utils/endian.h" #include "utils/endian.h"
#include "utils/memory.h" #include "utils/memory.h"
#include "utils/md5.h" #include "utils/md5.h"
#ifdef _SYSTEM_MINIZIP
#include <minizip/unzip.h>
#else
#include "utils/unzip.h" #include "utils/unzip.h"
#endif
#include "driver.h" #include "driver.h"
#include "types.h" #include "types.h"
#include "fceu.h" #include "fceu.h"