box1@box1 ~/Desktop/teeworlds0.6.5 $ bam server_release
configure.lua:6: bad argument #1 to 'setfenv' (number expected, got nil)
bam: script error (-t for more detail)
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
(edited)bam --help
:
-c clean targets
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
[ 1/15] #1 c src/base/system.c
\src\base\system.h(1322) : error C2054: expected '(' to follow 'inline'
src\base\system.h(1323) : error C2085: 'uint32_from_be' : not in formal parameter list
src\base\system.h(1323) : error C2143: syntax error : missing ';' before '{'
src\base\system.h(1337) : error C2054: expected '(' to follow 'inline'
src\base\system.h(1338) : error C2085: 'uint32_to_be' : not in formal parameter list
src\base\system.h(1338) : error C2143: syntax error : missing ';' before '{'
bam: 'objs/base/system.obj' error 2
bam: error: a build step failed
inline
with static
in src/base/system.hdiff --git a/src/base/system.h b/src/base/system.h
index c1178e7b0..28317c0d9 100644
--- a/src/base/system.h
+++ b/src/base/system.h
@@ -1319,7 +1319,7 @@ int str_utf8_check(const char *str);
Returns:
The read integer.
*/
-inline unsigned uint32_from_be(const void *bytes)
+static unsigned uint32_from_be(const void *bytes)
{
const unsigned char *b = (const unsigned char *)bytes;
return (b[0]<<24)|(b[1]<<16)|(b[2]<<8)|b[3];
@@ -1334,7 +1334,7 @@ inline unsigned uint32_from_be(const void *bytes)
bytes - The place to write the integer to.
integer - The integer to write.
*/
-inline void uint32_to_be(void *bytes, unsigned integer)
+static void uint32_to_be(void *bytes, unsigned integer)
{
unsigned char *b = (unsigned char *)bytes;
b[0] = (integer&0xff000000)>>24;