[vlc-commits] contribs: projectM: fix win64 build

Rafaël Carré git at videolan.org
Mon Nov 7 02:26:08 CET 2011


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Nov  6 20:25:55 2011 -0500| [31e51ce2a7325c53714efa52af2a625541223550] | committer: Rafaël Carré

contribs: projectM: fix win64 build

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

 contrib/src/projectM/rules.mak   |    3 +++
 contrib/src/projectM/win64.patch |   12 ++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/contrib/src/projectM/rules.mak b/contrib/src/projectM/rules.mak
index a3053cb..8d679ee 100644
--- a/contrib/src/projectM/rules.mak
+++ b/contrib/src/projectM/rules.mak
@@ -17,6 +17,9 @@ $(TARBALLS)/projectM-$(PROJECTM_VERSION)-Source.tar.gz:
 
 projectM: projectM-$(PROJECTM_VERSION)-Source.tar.gz .sum-projectM
 	$(UNPACK)
+ifdef HAVE_WIN64
+	$(APPLY) $(SRC)/projectM/win64.patch
+endif
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/projectM/win32.patch
 endif
diff --git a/contrib/src/projectM/win64.patch b/contrib/src/projectM/win64.patch
new file mode 100644
index 0000000..8c70806
--- /dev/null
+++ b/contrib/src/projectM/win64.patch
@@ -0,0 +1,12 @@
+--- projectM/glew.h.orig	2011-11-06 20:20:42.573445229 -0500
++++ projectM/glew.h	2011-11-06 20:21:25.349657365 -0500
+@@ -150,7 +150,8 @@
+ #endif
+ #if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_)
+ #  ifdef _WIN64
+-typedef __int64 ptrdiff_t;
++#include <inttypes.h>
++typedef int64_t ptrdiff_t;
+ #  else
+ typedef _W64 int ptrdiff_t;
+ #  endif



More information about the vlc-commits mailing list