[Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp ...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/06/02 09:54:21

Modified files:
        .              : ChangeLog 
        backend        : render_handler_ogl.cpp 
        libbase        : log.cpp 
        macros         : opengl.m4 
        server/asobj   : Date.cpp 

Log message:
                * backend/render_handler_ogl.cpp,libbase/log.cpp, 
macros/opengl.m4,
                  server/asobj/Date.cpp: Fixes for builing on win32/MSYS/mingw.
                  Linking is still broken.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3440&r2=1.3441
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3440
retrieving revision 1.3441
diff -u -b -r1.3440 -r1.3441
--- ChangeLog   2 Jun 2007 06:50:06 -0000       1.3440
+++ ChangeLog   2 Jun 2007 09:54:18 -0000       1.3441
@@ -1,3 +1,9 @@
+2007-06-02 Tomas Groth Christensen <address@hidden>
+
+       * backend/render_handler_ogl.cpp,libbase/log.cpp, macros/opengl.m4,
+         server/asobj/Date.cpp: Fixes for builing on win32/MSYS/mingw.
+         Linking is still broken.
+
 2007-06-02 Sandro Santilli <address@hidden>
 
        * server/vm/ASHandlers.cpp (CommonGetUrl): log about _level#

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- backend/render_handler_ogl.cpp      3 May 2007 23:47:21 -0000       1.73
+++ backend/render_handler_ogl.cpp      2 Jun 2007 09:54:20 -0000       1.74
@@ -5,7 +5,7 @@
 
 // A render_handler that uses SDL & OpenGL
 
-/* $Id: render_handler_ogl.cpp,v 1.73 2007/05/03 23:47:21 nihilus Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.74 2007/06/02 09:54:20 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,7 +32,11 @@
 #include <OpenGL/glext.h>
 #else
 # include <GL/gl.h>
+# ifdef WIN32
+#  define GL_CLAMP_TO_EDGE 0x812F
+# else
 # include <GL/glx.h>
+# endif
 # include <GL/glu.h>
 # ifndef APIENTRY
 #  define APIENTRY

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- libbase/log.cpp     31 May 2007 12:34:45 -0000      1.52
+++ libbase/log.cpp     2 Jun 2007 09:54:20 -0000       1.53
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: log.cpp,v 1.52 2007/05/31 12:34:45 strk Exp $ */
+/* $Id: log.cpp,v 1.53 2007/06/02 09:54:20 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -33,6 +33,8 @@
 #if defined(_WIN32) && defined(WIN32)
 // Required for SYSTEMTIME definitions
 # include <windows.h>
+# include <sys/types.h>
+# include <unistd.h> 
 #else
 # include <unistd.h>
 #endif

Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- macros/opengl.m4    12 May 2007 09:59:44 -0000      1.32
+++ macros/opengl.m4    2 Jun 2007 09:54:20 -0000       1.33
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: opengl.m4,v 1.32 2007/05/12 09:59:44 tgc Exp $
+dnl $Id: opengl.m4,v 1.33 2007/06/02 09:54:20 tgc Exp $
 
 AC_DEFUN([GNASH_PATH_OPENGL],
 [
@@ -80,7 +80,7 @@
           ac_cv_path_opengl_lib="-L`(cd ${with_opengl_lib}; pwd)` -lGL -lGLU"
         else
           if test -f ${with_opengl_lib}/libopengl32.a; then
-            ac_cv_path_opengl_lib="-L`(cd ${with_opengl_lib}; pwd) -lopengl32 
-lglu32`"
+            ac_cv_path_opengl_lib="-L`(cd ${with_opengl_lib}; pwd)` -lopengl32 
-lglu32"
           else
             AC_MSG_ERROR([${with_opengl_lib} directory doesn't contain libGL.])
           fi

Index: server/asobj/Date.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Date.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/asobj/Date.cpp       17 May 2007 22:55:58 -0000      1.45
+++ server/asobj/Date.cpp       2 Jun 2007 09:54:21 -0000       1.46
@@ -89,6 +89,7 @@
 
 #if defined(_WIN32) || defined(WIN32)
 # define snprintf _snprintf
+# include <sys/time.h>
 #else
 # include <sys/time.h>
 #endif