[Scummvm-cvs-logs] CVS: residual Makefile.mingw,1.8,1.9 main.cpp,1.10,1.11
Travis Howell
kirben at users.sourceforge.net
Fri Aug 29 05:11:18 CEST 2003
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1:/tmp/cvs-serv28237
Modified Files:
Makefile.mingw main.cpp
Log Message:
Udate mingw makefile, restore mingw console output.
Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.mingw,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.mingw 23 Aug 2003 01:44:12 -0000 1.8
+++ Makefile.mingw 29 Aug 2003 12:10:53 -0000 1.9
@@ -3,7 +3,7 @@
### Modify these paths
SDL_CFLAGS=-I$(SRC)sdl/include
-SDL_LIBS=-L$(SRC)sdl/lib -lSDL
+SDL_LIBS=-L$(SRC)sdl/lib -lSDLmain -lSDL
CXX = g++
CXXFLAGS = -g -W -Wall -Ilua/include $(SDL_CFLAGS) # -O2
@@ -12,7 +12,8 @@
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
+ sound.o mixer.o keyframe.o costume.o walkplane.o textobject.o \
+ matrix3.o matrix4.o
DEPS = $(OBJS:.o=.d)
EXEEXT =.exe
@@ -28,7 +29,7 @@
$(MAKE) -C lua
clean: lua-clean
- -rm -f residual *.o *.d *~
+ -rm -f residual.exe *.o *.d *~
lua-clean:
$(MAKE) -C lua clean
@@ -38,7 +39,7 @@
.PHONY: lua-build lua-clean
# Some additional targets
-install: residual$(EXEEXT)
+install: residual
mkdir -p $(RESIDUALPATH)
strip residual$(EXEEXT) -o $(RESIDUALPATH)/residual$(EXEEXT)
Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/main.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- main.cpp 28 Aug 2003 01:55:48 -0000 1.10
+++ main.cpp 29 Aug 2003 12:10:53 -0000 1.11
@@ -34,6 +34,12 @@
Registry::instance()->save();
}
+#ifdef __MINGW32__
+ int PASCAL WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpCmdLine*/, int /*iShowCmd*/) {
+ return main(0, NULL);
+}
+#endif
+
int main(int /* argc */, char ** /* argv */) {
char GLDriver[1024];
if (SDL_Init(SDL_INIT_EVERYTHING) < 0)
More information about the Scummvm-git-logs
mailing list