[Scummvm-cvs-logs] CVS: residual main.cpp,1.3,1.4 Makefile.cross,1.2,1.3 Makefile.mingw,1.5,1.6

James Brown ender at users.sourceforge.net
Fri Aug 22 01:17:19 CEST 2003


Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1:/tmp/cvs-serv14038

Modified Files:
	main.cpp Makefile.cross Makefile.mingw 
Log Message:
Get rid of those horrible stderr/stdout files on Win32, so debug keys can work (etc)


Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/main.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- main.cpp	16 Aug 2003 11:17:29 -0000	1.3
+++ main.cpp	21 Aug 2003 07:33:39 -0000	1.4
@@ -26,10 +26,16 @@
 #include "engine.h"
 #include "mixer.h"
 #include <unistd.h>
-
+//#include <windows.h>
 static void saveRegistry() {
   Registry::instance()->save();
 }
+
+#ifdef WIN32
+int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst,  LPSTR lpCmdLine, int iShowCmd) {
+ main(0, NULL);
+}
+#endif
 
 int main(int /* argc */, char ** /* argv */) {
   char 	GLDriver[1024];

Index: Makefile.cross
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.cross,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.cross	20 Aug 2003 14:50:05 -0000	1.2
+++ Makefile.cross	21 Aug 2003 07:33:39 -0000	1.3
@@ -1,6 +1,6 @@
 CXX = i586-mingw32msvc-g++
 SDL_CFLAGS=-I/usr/i586-mingw32msvc/include/SDL
-SDL_LIBS=-L/usr/i586-mingw32msvc/lib -lSDLmain -lSDL
+SDL_LIBS=-L/usr/i586-mingw32msvc/lib -lSDL
 
 CXXFLAGS = -W -Wall -Ilua/include $(SDL_CFLAGS) # -O2 
 LDFLAGS = -W -Wall # -O2 

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile.mingw,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.mingw	20 Aug 2003 14:41:27 -0000	1.5
+++ Makefile.mingw	21 Aug 2003 07:33:39 -0000	1.6
@@ -1,6 +1,6 @@
 ### Modify these paths
 SDL_CFLAGS=-I$(SRC)sdl/include
-SDL_LIBS=-L$(SRC)sdl/lib -lSDLmain -lSDL
+SDL_LIBS=-L$(SRC)sdl/lib -lSDL
 
 CXX = g++
 CXXFLAGS = -g -W -Wall -Ilua/include $(SDL_CFLAGS) # -O2 





More information about the Scummvm-git-logs mailing list