[Scummvm-cvs-logs] CVS: residual Makefile,1.5,1.6 Makefile.cross,1.5,1.6 Makefile.mingw,1.10,1.11 screen.cpp,1.1,1.2 screen.h,1.1,1.2
James Brown
ender at users.sourceforge.net
Sat Aug 30 11:07:02 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.13,1.14 d_sound.h,1.5,1.6 driver96.h,1.27,1.28 rdwin.cpp,1.17,1.18
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.109,1.110 mixer.h,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1:/tmp/cvs-serv19804
Modified Files:
Makefile Makefile.cross Makefile.mingw screen.cpp screen.h
Log Message:
Update makefiles, fix screenblock compilation (memcpy include and file newlines)
Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 28 Aug 2003 02:01:48 -0000 1.5
+++ Makefile 30 Aug 2003 18:05:48 -0000 1.6
@@ -6,7 +6,7 @@
OBJS = main.o lab.o bitmap.o model.o resource.o material.o debug.o \
textsplit.o lua.o registry.o localize.o scene.o engine.o actor.o \
sound.o mixer.o keyframe.o costume.o walkplane.o textobject.o \
- matrix3.o matrix4.o
+ matrix3.o matrix4.o screen.o
DEPS = $(OBJS:.o=.d)
Index: Makefile.cross
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.cross,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.cross 21 Aug 2003 16:48:03 -0000 1.5
+++ Makefile.cross 30 Aug 2003 18:05:48 -0000 1.6
@@ -7,8 +7,9 @@
LIBS = -Llua/lib -llua -llualib -lmingw32 -lopengl32 -lglu32 $(SDL_LIBS)
OBJS = main.o lab.o bitmap.o model.o resource.o material.o debug.o \
- textsplit.o lua.o registry.o localize.o scene.o engine.o actor.o \
- sound.o mixer.o keyframe.o costume.o walkplane.o textobject.o
+ textsplit.o lua.o registry.o localize.o scene.o engine.o actor.o \
+ sound.o mixer.o keyframe.o costume.o walkplane.o textobject.o \
+ matrix3.o matrix4.o screen.o
DEPS = $(OBJS:.o=.d)
residual: $(OBJS) lua/lib/liblua.a lua/lib/liblualib.a
Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.mingw,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.mingw 29 Aug 2003 12:12:39 -0000 1.10
+++ Makefile.mingw 30 Aug 2003 18:05:48 -0000 1.11
@@ -13,7 +13,7 @@
OBJS = main.o lab.o bitmap.o model.o resource.o material.o debug.o \
textsplit.o lua.o registry.o localize.o scene.o engine.o actor.o \
sound.o mixer.o keyframe.o costume.o walkplane.o textobject.o \
- matrix3.o matrix4.o
+ matrix3.o matrix4.o screen.o
DEPS = $(OBJS:.o=.d)
EXEEXT =.exe
Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/screen.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- screen.cpp 30 Aug 2003 17:58:33 -0000 1.1
+++ screen.cpp 30 Aug 2003 18:05:48 -0000 1.2
@@ -1,4 +1,5 @@
#include "screen.h"
+#include <string.h>
unsigned short int dataTemp[640*480];
@@ -251,4 +252,5 @@
}
}
}
-}
\ No newline at end of file
+}
+
Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/residual/screen.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- screen.h 30 Aug 2003 17:58:33 -0000 1.1
+++ screen.h 30 Aug 2003 18:05:48 -0000 1.2
@@ -31,4 +31,5 @@
void screenBlocksDrawDebug();
void screenBlocksBlitDirtyBlocks();
-#endif // _SCREEN_H_
\ No newline at end of file
+#endif // _SCREEN_H_
+
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.13,1.14 d_sound.h,1.5,1.6 driver96.h,1.27,1.28 rdwin.cpp,1.17,1.18
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.109,1.110 mixer.h,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list