From 6f75a23de7ddad75f235f2925ae3517740a9d32f Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Sun, 15 Mar 2015 18:53:06 +0000 Subject: [PATCH] sdl: add link to libgd project download page in readme sdl: note optional libgd dependency in readme scons: fix logic for LOGO and CREATE_AVI options --- trunk/README-SDL | 1 + trunk/SConstruct | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/trunk/README-SDL b/trunk/README-SDL index 92dbac5b..89798af2 100644 --- a/trunk/README-SDL +++ b/trunk/README-SDL @@ -25,6 +25,7 @@ Table of Contents * libgtk2.0 (optional) - version >= 2.24 recommended * libgtk3.0 (optional) - this compiles as of fceux 2.2.0 * liblua5.1 (optional) +* libgd (optional) - required for LOGO and CREATE_AVI options (https://bitbucket.org/libgd/gd-libgd/downloads) * minizip (optional) - you may chose to use the version of minizip on your system by enabling SYSTEM_MINIZIP in the SConstruct * c++ compiler -- you may use g++ from gcc or clang++ from llvm. diff --git a/trunk/SConstruct b/trunk/SConstruct index abac3ba1..3b55e02b 100644 --- a/trunk/SConstruct +++ b/trunk/SConstruct @@ -159,7 +159,7 @@ else: env.Append(LINKFLAGS=['-Wl,--as-needed']) ### Search for gd if we're not in Windows - if env['PLATFORM'] != 'win32' and env['PLATFORM'] != 'cygwin' and env['CREATE_AVI'] and env['LOGO']: + if (env['PLATFORM'] != 'win32' and env['PLATFORM'] != 'cygwin') and (env['CREATE_AVI'] or env['LOGO']): gd = conf.CheckLib('gd', autoadd=1) if gd == 0: env['LOGO'] = 0