[vlc-commits] contribs: fix glew build on win64

Rafaël Carré git at videolan.org
Fri Sep 23 07:47:42 CEST 2011


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Sep 23 01:47:21 2011 -0400| [5399208ef5f2a3a4ad1155982fd734f1d05491ec] | committer: Rafaël Carré

contribs: fix glew build on win64

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5399208ef5f2a3a4ad1155982fd734f1d05491ec
---

 contrib/src/glew/win32.patch                |   12 ++++++++++++
 extras/contrib/src/Patches/glew-win32.patch |   12 ++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/contrib/src/glew/win32.patch b/contrib/src/glew/win32.patch
index 86409c1..4f3e75b 100644
--- a/contrib/src/glew/win32.patch
+++ b/contrib/src/glew/win32.patch
@@ -75,3 +75,15 @@
  LDFLAGS.GL = -lglu32 -lopengl32 -lgdi32 -luser32 -lkernel32
  LDFLAGS.EXTRA = -L/mingw/lib
  WARN = -Wall -W
+diff -ur glew.orig//include/GL/glew.h glew/include/GL/glew.h
+--- glew.orig//include/GL/glew.h	2011-09-23 01:38:28.524786958 -0400
++++ glew/include/GL/glew.h	2011-09-23 01:45:16.405385194 -0400
+@@ -150,7 +150,7 @@
+ #endif
+ #if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_)
+ #  ifdef _WIN64
+-typedef __int64 ptrdiff_t;
++#include <stdint.h>
+ #  else
+ typedef _W64 int ptrdiff_t;
+ #  endif
diff --git a/extras/contrib/src/Patches/glew-win32.patch b/extras/contrib/src/Patches/glew-win32.patch
index 86409c1..4f3e75b 100644
--- a/extras/contrib/src/Patches/glew-win32.patch
+++ b/extras/contrib/src/Patches/glew-win32.patch
@@ -75,3 +75,15 @@
  LDFLAGS.GL = -lglu32 -lopengl32 -lgdi32 -luser32 -lkernel32
  LDFLAGS.EXTRA = -L/mingw/lib
  WARN = -Wall -W
+diff -ur glew.orig//include/GL/glew.h glew/include/GL/glew.h
+--- glew.orig//include/GL/glew.h	2011-09-23 01:38:28.524786958 -0400
++++ glew/include/GL/glew.h	2011-09-23 01:45:16.405385194 -0400
+@@ -150,7 +150,7 @@
+ #endif
+ #if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_)
+ #  ifdef _WIN64
+-typedef __int64 ptrdiff_t;
++#include <stdint.h>
+ #  else
+ typedef _W64 int ptrdiff_t;
+ #  endif



More information about the vlc-commits mailing list