Fix compilation with bam on Windows

2 files changed, 7 insertions, 5 deletions

diff --git a/bam.lua b/bam.lua
index 214b9fccf..e9146c3a5 100644
--- a/bam.lua
+++ b/bam.lua
@@ -120,11 +120,11 @@ server_link_other = {}
 
 if family == "windows" then
 	if platform == "win32" then
-		table.insert(client_depends, CopyToDirectory(".", "other\\freetype\\lib32\\freetype.dll"))
-		table.insert(client_depends, CopyToDirectory(".", "other\\sdl\\lib32\\SDL.dll"))
+		table.insert(client_depends, CopyToDirectory(".", "other\\freetype\\windows\\lib32\\freetype.dll"))
+		table.insert(client_depends, CopyToDirectory(".", "other\\sdl\\windows\\lib32\\SDL.dll"))
 	else
-		table.insert(client_depends, CopyToDirectory(".", "other\\freetype\\lib64\\freetype.dll"))
-		table.insert(client_depends, CopyToDirectory(".", "other\\sdl\\lib64\\SDL.dll"))
+		table.insert(client_depends, CopyToDirectory(".", "other\\freetype\\windows\\lib64\\freetype.dll"))
+		table.insert(client_depends, CopyToDirectory(".", "other\\sdl\\windows\\lib64\\SDL.dll"))
 	end
 
 	if config.compiler.driver == "cl" then
diff --git a/configure.lua b/configure.lua
index 19cd6ab29..20cf7c099 100644
--- a/configure.lua
+++ b/configure.lua
@@ -3,7 +3,9 @@ function loadfile_(filename, env)
 	local file
 	if _VERSION == "Lua 5.1" then
 		file = loadfile(filename)
-		setfenv(file, env)
+		if file then
+			setfenv(file, env)
+		end
 	else
 		file = loadfile(filename, nil, env)
 	end