From 06e22c91a80e466db7f3495d501cc7405682ab06 Mon Sep 17 00:00:00 2001
From: punkrockguy318 <punkrockguy318@users.sf.net>
Date: Tue, 14 Apr 2009 17:54:38 +0000
Subject: [PATCH] Fixed the mysterious input issue that was caused by not
 having liblua installed.

---
 SConstruct     | 26 ++++++++++++--------------
 changelog.txt  |  1 +
 src/SConscript |  4 +---
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/SConstruct b/SConstruct
index a9b66884..876f4335 100644
--- a/SConstruct
+++ b/SConstruct
@@ -8,7 +8,6 @@ opts.AddOptions(
   BoolOption('OPENGL',    'Enable OpenGL support', 1),
   BoolOption('LSB_FIRST', 'Least signficant byte first (non-PPC)', 1),
   BoolOption('DEBUG',     'Build with debugging symbols', 0),
-  BoolOption('LUA',       'Enable Lua support', 1),
   BoolOption('NEWPPU',    'Enable new PPU core', 0),
   BoolOption('CREATE_AVI', 'Enable avi creation support (SDL only)', 0),
   BoolOption('LOGO', 'Enable a logoscreen when creating avis (SDL only)', '1')
@@ -57,12 +56,12 @@ else:
   if not conf.CheckLib('z', autoadd=1):
     print 'Did not find libz or z.lib, exiting!'
     Exit(1)
-  if env['LUA']:
-    lua51 = conf.CheckLib('lua5.1', autoadd=1)
-    lua = conf.CheckLib('lua', autoadd=1)
-    if lua == 0 and lua51 == 0:
-      print 'Did not find liblua5.1, liblua, lua.lib or lua5.1.lib, compiling anyway!'
-      env['LUA'] = 0
+  lua51 = conf.CheckLib('lua5.1', autoadd=1)
+  lua = conf.CheckLib('lua', autoadd=1)
+  if lua == 0 and lua51 == 0:
+    print 'Did not find liblua5.1, liblua, lua.lib or lua5.1.lib, exiting!'
+    Exit(1)
+   
     
   ### Search for zenity if we're not in windows
   if env['PLATFORM'] != 'win32' and env['PLATFORM'] != 'cygwin':
@@ -103,13 +102,12 @@ else:
   conf.env.Append(CPPDEFINES = ['PSS_STYLE=1'])
   # parse SDL cflags/libs
   env.ParseConfig('sdl-config --cflags --libs')
-  if env['LUA']:
-    # parse liblua cflags
-    if lua51:
-      env.Append(CPPPATH = ['/usr/local/include/lua5.1', '/usr/include/lua5.1'])
-    if lua:
-      env.Append(CPPPATH = ['/usr/local/include/lua', '/usr/include/lua'])
-    env.Append(CPPDEFINES=["_S9XLUA_H"])
+  # parse liblua cflags
+  if lua51:
+    env.Append(CPPPATH = ['/usr/local/include/lua5.1', '/usr/include/lua5.1'])
+  if lua:
+    env.Append(CPPPATH = ['/usr/local/include/lua', '/usr/include/lua'])
+  env.Append(CPPDEFINES=["_S9XLUA_H"])
   env = conf.Finish()
 
 if sys.byteorder == 'little' or env['PLATFORM'] == 'win32':
diff --git a/changelog.txt b/changelog.txt
index b57b1f72..332cddf4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,4 @@
+14-apr-2009 - punkrockguy - sdl - LUA is NO longer optional, so the SConscripts have been updated to reflect that change.  This fixes the mysterious non-working input issue.
 12-apr-2009 - shinydoofy - sdl - implemented saving/loading a savestate from a specific file on Alt+S/L
 11-apr-2009 - shinydoofy - sdl - implemented starting an FM2 movie on Alt+R
 11-apr-2009 - adelikat - made default save slot 0 instead of 1, Win32 - remember last slot used
diff --git a/src/SConscript b/src/SConscript
index 11de3a73..b387626b 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -12,6 +12,7 @@ file.cpp
 filter.cpp 
 ines.cpp
 input.cpp
+lua-engine.cpp
 netplay.cpp
 nsf.cpp
 oldmovie.cpp
@@ -40,9 +41,6 @@ mappers
 Import('env')
 Export('env')
 
-if env['LUA']:
-  file_list.append('lua-engine.cpp')
-
 if env['CREATE_AVI']:
   subdirs.append('drivers/videolog')