Skip to content

Commit

Permalink
major engine cleanup. dependency on baselib removed. engine is now C …
Browse files Browse the repository at this point in the history
…code (not ansi tho). some other cruft removed aswell
  • Loading branch information
Magnus Auvinen committed Aug 22, 2007
1 parent 9899666 commit 8b3c16e
Show file tree
Hide file tree
Showing 188 changed files with 57,073 additions and 2,785 deletions.
81 changes: 64 additions & 17 deletions default.bam
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ if family == "windows" then
client_link_other = {ResCompile("other/icons/teewars.rc")}
end


function build(settings)
settings.objdir = Path("objs")

Expand All @@ -107,22 +106,70 @@ function build(settings)

server_settings = settings:copy()

basepath = Path("objs/baselib")
baselib_options = {}
baselib_options.settings = settings:copy()
baselib_options.settings.objdir = Path("objs/baselib")
baselib_options.settings.libdir = Path("objs/baselib")
baselib = Import("../baselib/baselib.bam", baselib_options)

baselib.apply(settings, "all")
baselib.apply(server_settings, "network")

-- set some platform specific settings
settings.cc.includes:add("src")
settings.cc.includes:add("../baselib/src/external/zlib")
settings.cc.includes:add("src/external/zlib")
settings.cc.includes:add("src/external/glfw/include")

if family == "unix" then
if platform == "macosx" then
glfw_platform = "macosx"
settings.linker.frameworks:add("OpenGL")
settings.linker.frameworks:add("AGL")
settings.linker.frameworks:add("Carbon")
settings.linker.frameworks:add("CoreAudio")
settings.linker.frameworks:add("AudioToolbox")
settings.linker.frameworks:add("AudioUnit")
else
glfw_platform = "x11"
settings.linker.libs:add("pthread")
settings.linker.libs:add("asound")
settings.linker.libs:add("X11")
settings.linker.libs:add("GL")
settings.linker.libs:add("GLU")
end
elseif family == "windows" then
glfw_platform = "win32"
settings.linker.libs:add("gdi32.lib")
settings.linker.libs:add("user32.lib")
settings.linker.libs:add("opengl32.lib")
settings.linker.libs:add("glu32.lib")
settings.linker.libs:add("ws2_32.lib")
settings.linker.libs:add("dsound.lib")
settings.linker.libs:add("ole32.lib")
end

-- build glfw
glfw_settings = settings:copy()
glfw_settings.cc.includes:add("src/engine/external/glfw/lib")
glfw_settings.cc.includes:add("src/engine/external/glfw/lib/" .. glfw_platform)

glfw = Compile(glfw_settings, Collect(
"src/engine/external/glfw/lib/*.c",
"src/engine/external/glfw/lib/" .. glfw_platform .. "/*.c"))

engine = Compile(settings, Collect("src/engine/*.cpp"))
client = Compile(settings, Collect("src/engine/client/*.cpp", "src/engine/client/pnglite/*.c", "src/wavpack/*.c"))
server = Compile(settings, Collect("src/engine/server/*.cpp"))
-- build teewars components
engine_settings = settings:copy()

if family == "windows" then
engine_settings.cc.flags = "/wd4244 /TP"
else
engine_settings.cc.flags = "-Wall"
engine_settings.linker.flags = ""
end

engine = Compile(engine_settings, Collect(
"src/engine/*.c",
"src/engine/external/zlib/*.c"))

client = Compile(engine_settings, Collect(
"src/engine/client/*.c",
"src/engine/external/pnglite/*.c",
"src/engine/external/pa.c",
"src/engine/external/wavpack/*.c"))

server = Compile(engine_settings, Collect("src/engine/server/*.c"))

masterserver = Compile(settings, Collect("src/mastersrv/*.cpp"))
game_shared = Compile(settings, Collect("src/game/*.cpp"))
game_client = Compile(settings, Collect("src/game/client/*.cpp"), clientdata.source, clientdata.cdata)
Expand All @@ -136,11 +183,11 @@ function build(settings)
tools = {}
for i,v in objs do
toolname = PathFilename(file_base(v))
tools[i] = Link(settings, toolname, v)
tools[i] = Link(settings, toolname, v, engine)
end

-- build client, server and master server
client_exe = Link(settings, "teewars", engine, client, editor, game_shared, game_client, client_link_other)
client_exe = Link(settings, "teewars", game_shared, game_client, engine, client, editor, glfw, pa, client_link_other)
server_exe = Link(server_settings, "teewars_srv", engine, server, game_shared, game_server)
masterserver_exe = Link(server_settings, "mastersrv", masterserver, engine)

Expand Down
87 changes: 87 additions & 0 deletions scripts/gen_keys.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
import sys, os

# load header
glfw = "src/engine/external/glfw/include/GL/glfw.h"
lines = [line.strip() for line in file(glfw).readlines()]

# genereate keys.h file
f = file("src/engine/keys.h", "w")

keynames = {}
KEY_MOUSE_FIRST = 256+128

print >>f, "#ifndef ENGINE_KEYS_H"
print >>f, "#define ENGINE_KEYS_H"
print >>f, '/* AUTO GENERATED! DO NOT EDIT MANUALLY! */'
print >>f, ""
print >>f, "enum"
print >>f, "{"

# do keys
for line in lines:
if "GLFW_KEY" in line:
l = line.split()
key = l[1].replace("GLFW_", "").strip()
value = l[2].replace("GLFW_","").strip()

# ignore special last key
if key == "KEY_LAST":
continue

# print to file
print >>f, "\t%s = %s," % (key.upper(), value)

# add to keynames
exec("%s = %s" % (key, value))
exec("keynames[%s] = '%s'" % (value, key))

# do mouse buttons
print >>f, "\tKEY_MOUSE_FIRST = %d," % KEY_MOUSE_FIRST
for line in lines:
if "GLFW_MOUSE" in line and not "CURSOR" in line:
l = line.split()
key = l[1].replace("GLFW_", "").strip()
value = l[2].replace("GLFW_","").strip()

if len(key) == len("MOUSE_BUTTON_X"): # only match MOUSE_X
key = "KEY_MOUSE_" + key[-1]
value = "KEY_MOUSE_FIRST+%s"% (int(key[-1])-1)

# print to file
print >>f, "\t%s = %s," % (key, value)

# add to keynames
exec("%s = %s" % (key, value))
exec("keynames[%s] = '%s'" % (value, key))

print >>f, "\tKEY_LAST"
print >>f, "};"
print >>f, ""
print >>f, "#endif"
f.close()


# generate keynames.c file
f = file("src/engine/keynames.c", "w")
print >>f, '/* AUTO GENERATED! DO NOT EDIT MANUALLY! */'
print >>f, ''
print >>f, "#include <string.h>"
print >>f, ""
print >>f, "static const char key_strings[512][16] ="
print >>f, "{"
for i in range(0, 512):
n = "#%d"%i
if i >= 48 and i <= 57 or i >= 65 and i <= 90:
n = chr(i).lower()
elif i in keynames:
n = keynames[i][4:].lower().replace("_", "")
print >>f, "\t\"%s\"," % n

print >>f, "};"
print >>f, ""
print >>f, "const char *inp_key_name(int k) { if (k >= 0 && k < 512) return key_strings[k]; else return key_strings[0]; }"
print >>f, "int inp_key_code(const char *key_name) { int i; if (!strcmp(key_name, \"-?-\")) return -1; else for (i = 0; i < 512; i++) if (!strcmp(key_strings[i], key_name)) return i; return -1; }"
print >>f, ""

f.close()

2 changes: 1 addition & 1 deletion scripts/linecount.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
wc `find . -iname *.cpp` `find . -iname *.h`
wc `find . -iname *.cpp` `find . -iname *.h` `find . -iname *.c`
Loading

0 comments on commit 8b3c16e

Please sign in to comment.