diff options
| -rw-r--r-- | Makefile.nix | 10 | ||||
| -rw-r--r-- | Makefile.win | 9 | ||||
| -rw-r--r-- | spec/test1_spec.lua | 2 | ||||
| -rw-r--r-- | src/client/main.cpp | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/Makefile.nix b/Makefile.nix index cc3a35f..a2bb3d7 100644 --- a/Makefile.nix +++ b/Makefile.nix @@ -1,4 +1,9 @@ - +CP=cp +CXX?=g++ +MKDIR?=mkdir +RM?=rm -f +ECHO?=echo +LD=g++ MDOC=mdoc include Makefile.shared @@ -46,6 +51,9 @@ doc: documentation documentation: $(MDOC) -p src -o doc -t "Brok[en]gine" -i README.md -d reference -m "markdown" +test: + busted + bin/client/bin/brokengine_client : $(client_objs) $(shared_objs) $(CXX) $(LDFLAGS) -o $@ $^ $(CLIENT_LIB_DIRS) $(CLIENT_LIBS) diff --git a/Makefile.win b/Makefile.win index d6e2c34..57a6b69 100644 --- a/Makefile.win +++ b/Makefile.win @@ -36,13 +36,15 @@ CLIENT_LIBS=\ -llinearmath\ -lIrrlicht\ -lopengl32\ + -lglu32\ -lnng\ -lluajit-5.1.dll\ -lws2_32\ -lmswsock\ -ladvapi32\ -lwinmm\ - -lm + -lm\ + -static-libstdc++ -static-libgcc #-lstdc++-6 CFLAGS+= -g @@ -55,10 +57,7 @@ all : $(bins) echo "Done" clean: - $(RM) $(client_objs) - $(RM) $(server_objs) - $(RM) $(shared_objs) - $(RM) $(bins) + $(RM) $(client_objs) $(server_objs) $(shared_objs) $(bins) $(RM) -r doc/* nuke: clean diff --git a/spec/test1_spec.lua b/spec/test1_spec.lua index 01d6b0d..d811d4e 100644 --- a/spec/test1_spec.lua +++ b/spec/test1_spec.lua @@ -6,7 +6,7 @@ end _G.assert = assert local common = require("common") --[[Create the headless client init file]] -local f = io.open("spec/headless/deviceinit.lua","w") +local f = assert(io.open("spec/headless/deviceinit.lua","w")) f:write([=[ return { ["Anti Alias"] = 16, diff --git a/src/client/main.cpp b/src/client/main.cpp index 784929a..5f94c2b 100644 --- a/src/client/main.cpp +++ b/src/client/main.cpp @@ -292,7 +292,7 @@ int main(int argc, char *argv[]){ } assert(lua_gettop(L) == 0); //printf("GAME.drawPostGui completed\n"); - driver->endScene(); + assert(driver->endScene() == true); }else{ assert(lua_gettop(L) == 0); device->yield(); |