remove libz requirement from sconstruct as its compiled staticly

This commit is contained in:
punkrockguy318 2010-02-26 05:18:55 +00:00
parent baf8099ceb
commit 88300c898e
2 changed files with 4 additions and 7 deletions

View File

@ -1,7 +1,7 @@
To compile and install FCE Ultra, follow these steps: To compile and install FCE Ultra, follow these steps:
1. Ensure that SCons, SDL, and libz are installed on your system. 1. Ensure that SCons and SDL are installed on your system.
On an ubuntu/debian system, run: On an ubuntu/debian system, run:
sudo apt-get install scons libsdl1.2-dev libsdl1.2debian-esd zlib1g-dev sudo apt-get install scons libsdl1.2-dev libsdl1.2debian-esd
2. Enable options you would like to enable in SConstruct file (GUI and AVI creation disabled by default) 2. Enable options you would like to enable in SConstruct file (GUI and AVI creation disabled by default)
3. Run "scons" to build fceux. 3. Run "scons" to build fceux.
4. To install on Linux/BSD run "scons install" as root. 4. To install on Linux/BSD run "scons install" as root.

View File

@ -12,8 +12,8 @@ opts.AddVariables(
BoolVariable('NEWPPU', 'Enable new PPU core', 1), BoolVariable('NEWPPU', 'Enable new PPU core', 1),
BoolVariable('CREATE_AVI', 'Enable avi creation support (SDL only)', 0), BoolVariable('CREATE_AVI', 'Enable avi creation support (SDL only)', 0),
BoolVariable('LOGO', 'Enable a logoscreen when creating avis (SDL only)', '1'), BoolVariable('LOGO', 'Enable a logoscreen when creating avis (SDL only)', '1'),
BoolVariable('GTK', 'Enable GTK2 GUI (SDL only)', 0), BoolVariable('GTK', 'Enable GTK2 GUI (SDL only)', 1),
BoolVariable('GTK_LITE', 'Enable GTK2 for dialogs only', 1) BoolVariable('GTK_LITE', 'Enable GTK2 for dialogs only', 0)
) )
env = Environment(options = opts) env = Environment(options = opts)
@ -56,9 +56,6 @@ else:
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)
if not conf.CheckLib('z', autoadd=1):
print 'Did not find libz or z.lib, exiting!'
Exit(1)
if env['GTK'] or env['GTK_LITE']: if env['GTK'] or env['GTK_LITE']:
# Add compiler and linker flags from pkg-config # Add compiler and linker flags from pkg-config
env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') env.ParseConfig('pkg-config --cflags --libs gtk+-2.0')