# HG changeset patch # User Matti Hamalainen # Date 1350347087 -10800 # Node ID 57d67886153ee2e02a45c5d9414bb8057b5d8d7c # Parent ea2d19de8932bcef8276f6863ee8b8b237d0cd85 Update to latest engine changes. diff -r ea2d19de8932 -r 57d67886153e config.mak --- a/config.mak Sat Oct 13 16:58:29 2012 +0300 +++ b/config.mak Tue Oct 16 03:24:47 2012 +0300 @@ -1,5 +1,7 @@ # Additional binaries (aka the demo) -BINARIES=krapula +DEMO_BIN=krapula +DEMO_OBJS=dmsimple.o +BINARIES=$(DEMO_BIN) # Build engine tests and tools? (Please notice that what # actually gets built it also affected by other options) diff -r ea2d19de8932 -r 57d67886153e krapula.c --- a/krapula.c Sat Oct 13 16:58:29 2012 +0300 +++ b/krapula.c Tue Oct 16 03:24:47 2012 +0300 @@ -1,4 +1,4 @@ -#include "dmsimple.h" +#include "dmengine.h" #include "dmvecmat.h" #include @@ -342,9 +342,7 @@ engine.optScrHeight = 480; engine.optBitDepth = 32; engine.optVFlags = SDL_SWSURFACE | SDL_HWPALETTE; -#ifdef DM_DEBUG - engine.demoDuration = 150; -#endif + engine.demoInit = demoInit; engine.demoRender = demoRender;