thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Udate mingw makefile, restore mingw console output.

Browse source
This commit is contained in:
Travis Howell 2003-08-29 12:10:53 +00:00
parent f415db4f87
commit 98a7c6ec3a
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Makefile.mingw
View file

@ -3,7 +3,7 @@ RESIDUALPATH=C:/residual
### Modify these paths ### Modify these paths
SDL_CFLAGS=-I$(SRC)sdl/include SDL_CFLAGS=-I$(SRC)sdl/include
SDL_LIBS=-L$(SRC)sdl/lib -lSDL SDL_LIBS=-L$(SRC)sdl/lib -lSDLmain -lSDL
CXX = g++ CXX = g++
CXXFLAGS = -g -W -Wall -Ilua/include $(SDL_CFLAGS) # -O2 CXXFLAGS = -g -W -Wall -Ilua/include $(SDL_CFLAGS) # -O2
@ -12,7 +12,8 @@ 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 \ 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 \ 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) DEPS = $(OBJS:.o=.d)
EXEEXT =.exe EXEEXT =.exe
@ -28,7 +29,7 @@ lua-build:
$(MAKE) -C lua $(MAKE) -C lua
clean: lua-clean clean: lua-clean
-rm -f residual *.o *.d *~ -rm -f residual.exe *.o *.d *~
lua-clean: lua-clean:
$(MAKE) -C lua clean $(MAKE) -C lua clean
@ -38,7 +39,7 @@ lua-clean:
.PHONY: lua-build lua-clean .PHONY: lua-build lua-clean
# Some additional targets # Some additional targets
install: residual$(EXEEXT) install: residual
mkdir -p $(RESIDUALPATH) mkdir -p $(RESIDUALPATH)
strip residual$(EXEEXT) -o $(RESIDUALPATH)/residual$(EXEEXT) strip residual$(EXEEXT) -o $(RESIDUALPATH)/residual$(EXEEXT)

6
main.cpp
View file

@ -34,6 +34,12 @@ static void saveRegistry() {
Registry::instance()->save(); 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 */) { int main(int /* argc */, char ** /* argv */) {
char GLDriver[1024]; char GLDriver[1024];
if (SDL_Init(SDL_INIT_EVERYTHING) < 0) if (SDL_Init(SDL_INIT_EVERYTHING) < 0)