From 1693bdb541d5f8c3987b0b843d8f3182e2b535e3 Mon Sep 17 00:00:00 2001
From: Tung Nguyen <tunginobi@gmail.com>
Date: Mon, 7 Feb 2011 16:14:14 +1100
Subject: [PATCH] Stop linking to lua5.1.dll on Windows

 * tl;dr: Keeping lua5.1.dll and lua51.dll improves library compat.
 * lua5.1.dll has the Lua functions. lua51.dll is a proxy to
   lua5.1.dll. They both come from the LuaBinaries project. Most
   library-to-Lua bindings seek lua51.dll, but some look for
   lua5.1.dll. Presumably, LuaBinaries does this to maximize ABI
   compatibility.
---
 contrib/tolua++/tolua++.cbp           | 1 -
 contrib/tolua++/tolua++_bootstrap.cbp | 1 -
 game.cbp                              | 1 -
 lib/gl/luagl/LuaGL.cbp                | 1 -
 lib/gl/luagl/LuaGLU.cbp               | 1 -
 lib/sdl/LuaSDL_new/LuaSDL.cbp         | 1 -
 lib/sdlgl/sdlgl.cbp                   | 1 -
 7 files changed, 7 deletions(-)

diff --git a/contrib/tolua++/tolua++.cbp b/contrib/tolua++/tolua++.cbp
index dabee9e..b14b60a 100644
--- a/contrib/tolua++/tolua++.cbp
+++ b/contrib/tolua++/tolua++.cbp
@@ -46,7 +46,6 @@
 			<Add library="src\bin\toluabind.o" />
 			<Add library="tolua++" />
 			<Add library="..\lua\lua51.lib" />
-			<Add library="..\lua\lua5.1.lib" />
 			<Add directory="..\lua" />
 		</Linker>
 		<ExtraCommands>
diff --git a/contrib/tolua++/tolua++_bootstrap.cbp b/contrib/tolua++/tolua++_bootstrap.cbp
index 3a2dd38..3ec50a0 100644
--- a/contrib/tolua++/tolua++_bootstrap.cbp
+++ b/contrib/tolua++/tolua++_bootstrap.cbp
@@ -45,7 +45,6 @@
 		<Linker>
 			<Add library="tolua++" />
 			<Add library="..\lua\lua51.lib" />
-			<Add library="..\lua\lua5.1.lib" />
 			<Add directory="..\lua" />
 		</Linker>
 		<Unit filename="include\tolua++.h" />
diff --git a/game.cbp b/game.cbp
index 5835b3e..8aa30fa 100644
--- a/game.cbp
+++ b/game.cbp
@@ -38,7 +38,6 @@
 		</Compiler>
 		<Linker>
 			<Add library="contrib\lua\lua51.lib" />
-			<Add library="contrib\lua\lua5.1.lib" />
 			<Add library="shlwapi" />
 			<Add directory="contrib\lua" />
 		</Linker>
diff --git a/lib/gl/luagl/LuaGL.cbp b/lib/gl/luagl/LuaGL.cbp
index 8d5ed45..ff2888e 100644
--- a/lib/gl/luagl/LuaGL.cbp
+++ b/lib/gl/luagl/LuaGL.cbp
@@ -39,7 +39,6 @@
 		<Linker>
 			<Add library="opengl32" />
 			<Add library="..\..\..\contrib\lua\lua51.lib" />
-			<Add library="..\..\..\contrib\lua\lua5.1.lib" />
 			<Add directory="..\..\..\contrib\lua" />
 		</Linker>
 		<ExtraCommands>
diff --git a/lib/gl/luagl/LuaGLU.cbp b/lib/gl/luagl/LuaGLU.cbp
index c7ea2d9..3e1cf87 100644
--- a/lib/gl/luagl/LuaGLU.cbp
+++ b/lib/gl/luagl/LuaGLU.cbp
@@ -40,7 +40,6 @@
 			<Add library="opengl32" />
 			<Add library="glu32" />
 			<Add library="..\..\..\contrib\lua\lua51.lib" />
-			<Add library="..\..\..\contrib\lua\lua5.1.lib" />
 			<Add directory="..\..\..\contrib\lua" />
 		</Linker>
 		<ExtraCommands>
diff --git a/lib/sdl/LuaSDL_new/LuaSDL.cbp b/lib/sdl/LuaSDL_new/LuaSDL.cbp
index badb3fc..df6cb8e 100644
--- a/lib/sdl/LuaSDL_new/LuaSDL.cbp
+++ b/lib/sdl/LuaSDL_new/LuaSDL.cbp
@@ -45,7 +45,6 @@
 			<Add library=".\SDL_bind.o" />
 			<Add library="tolua++" />
 			<Add library="..\..\..\contrib\lua\lua51.lib" />
-			<Add library="..\..\..\contrib\lua\lua5.1.lib" />
 			<Add library="SDL" />
 			<Add library="..\..\..\contrib\sdl\lib\SDL_ttf.lib" />
 			<Add library="..\..\..\contrib\sdl\lib\SDL_image.lib" />
diff --git a/lib/sdlgl/sdlgl.cbp b/lib/sdlgl/sdlgl.cbp
index 1ceab66..e3d95f4 100644
--- a/lib/sdlgl/sdlgl.cbp
+++ b/lib/sdlgl/sdlgl.cbp
@@ -40,7 +40,6 @@
 			<Add library="opengl32" />
 			<Add library="glu32" />
 			<Add library="..\..\contrib\lua\lua51.lib" />
-			<Add library="..\..\contrib\lua\lua5.1.lib" />
 			<Add library="..\..\contrib\sdl\lib\libSDL.dll.a" />
 			<Add directory="..\..\contrib\lua" />
 			<Add directory="..\..\contrib\sdl\lib" />