[Gnash-commit] gnash/gui NullGui.cpp gnash.cpp sdl.cpp

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/08/08 14:16:07

Modified files:
        gui            : NullGui.cpp gnash.cpp sdl.cpp 

Log message:
        porting to win32

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/NullGui.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: NullGui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/NullGui.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NullGui.cpp 31 Jul 2006 03:13:43 -0000      1.1
+++ NullGui.cpp 8 Aug 2006 14:16:07 -0000       1.2
@@ -42,7 +42,12 @@
 
 #include "NullGui.h"
 
-#include <unistd.h> // for usleep
+#if defined(_WIN32) || defined(WIN32)
+#      include <windows.h>
+# define usleep(x) Sleep(x/1000)
+#else
+# include <unistd.h> // for usleep
+#endif
 
 namespace gnash
 {

Index: gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- gnash.cpp   8 Aug 2006 11:11:07 -0000       1.26
+++ gnash.cpp   8 Aug 2006 14:16:07 -0000       1.27
@@ -58,6 +58,11 @@
 # endif
 #endif
 
+
+#if defined(_WIN32) || defined(WIN32)
+# include "getopt.c"
+#endif
+
 #include "NullGui.h"
 
 #include "gnash.h"

Index: sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- sdl.cpp     31 Jul 2006 23:26:33 -0000      1.11
+++ sdl.cpp     8 Aug 2006 14:16:07 -0000       1.12
@@ -46,6 +46,29 @@
 #include "sdlsup.h"
 
 #ifdef RENDERER_OPENGL
+
+#if defined(_WIN32) || defined(WIN32)
+#      define basename(x) x
+#      ifndef _INC_WINDOWS
+
+#              define WINAPI   __stdcall
+#              define APIENTRY WINAPI
+#              define CALLBACK __stdcall
+#              define DECLSPEC_IMPORT __declspec(dllimport)
+
+#              if !defined(_GDI32_)
+#                      define WINGDIAPI DECLSPEC_IMPORT
+#              else
+#                      define WINGDIAPI
+#              endif
+
+#      else
+#              define WIN32_LEAN_AND_MEAN
+#              include <windows.h>
+#      endif
+#endif
+
+
 #include <GL/gl.h>
 #include <GL/glu.h>
 #endif // RENDERER_OPENGL