File glew-mingw.diff of Package mingw64-glew

Overview Repositories Revisions Requests Users Attributes Meta

File glew-mingw.diff of Package mingw64-glew (Revision 49db95775601bcfeac39cefe220d7b5a)

Currently displaying revision 49db95775601bcfeac39cefe220d7b5a , Show latest

* With MinGW32's glu.h we need WINAPI, too.
* Don't strip glewinfo.exe
* Just let glewinfo and visualinfo print to stdout

--- include/GL/glew.h
+++ include/GL/glew.h
@@ -103,6 +103,8 @@
  * GL needs GLAPI and GLAPIENTRY, GLU needs APIENTRY, CALLBACK, and wchar_t
  * defined properly.
  */
+/* The MinGW version of GLU needs WINAPI.
+ */
 /* <windef.h> */
 #ifndef APIENTRY
 #define GLEW_APIENTRY_DEFINED
@@ -119,6 +119,16 @@
 #    define APIENTRY
 #  endif
 #endif
+#ifndef WINAPI
+#define GLEW_WINAPI_DEFINED
+#  if defined(__MINGW32__)
+#    define WINAPI __stdcall
+#  elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
+#    define WINAPI __stdcall
+#  else
+#    define WINAPI
+#  endif
+#endif
 #ifndef GLAPI
 #  if defined(__MINGW32__)
 #    define GLAPI extern
@@ -150,7 +162,11 @@
 #endif
 #if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_)
 #  ifdef _WIN64
+#    ifdef __MINGW32__
+typedef long long ptrdiff_t;
+#    else
 typedef __int64 ptrdiff_t;
+#    endif
 #  else
 typedef _W64 int ptrdiff_t;
 #  endif

--- Makefile
+++ Makefile
@@ -132,7 +132,7 @@
 	$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
 endif
 # utilities
-	$(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
+	$(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
 
 uninstall:
 	$(RM) $(INCDIR)/wglew.h

--- src/glewinfo.c
+++ src/glewinfo.c
@@ -6958,12 +6958,7 @@
     glewDestroyContext();
     return 1;
   }
-#if defined(_WIN32)
-  f = fopen("glewinfo.txt", "w");
-  if (f == NULL) f = stdout;
-#else
   f = stdout;
-#endif
   fprintf(f, "---------------------------\n");
   fprintf(f, "    GLEW Extension Info\n");
   fprintf(f, "---------------------------\n\n");
--- src/visualinfo.c
+++ src/visualinfo.c
@@ -100,7 +100,6 @@
 #if defined(_WIN32)
     fprintf(stderr, "Usage: visualinfo [-a] [-s] [-h] [-pf <id>]\n");
     fprintf(stderr, "        -a: show all visuals\n");
-    fprintf(stderr, "        -s: display to stdout instead of visualinfo.txt\n");
     fprintf(stderr, "        -pf <id>: use given pixelformat\n");
     fprintf(stderr, "        -h: this screen\n");
 #else
@@ -144,14 +144,7 @@
 
   /* ---------------------------------------------------------------------- */
   /* open file */
-#if defined(_WIN32)
-  if (!displaystdout) 
-    file = fopen("visualinfo.txt", "w");
-  if (file == NULL)
-    file = stdout;
-#else
   file = stdout;
-#endif
 
   /* ---------------------------------------------------------------------- */
   /* output header information */

Places

File glew-mingw.diff of Package mingw64-glew (Revision 49db95775601bcfeac39cefe220d7b5a)

Places