contribs: projectM: fix win64 build

31e51ce2 · Rafaël Carré · 74f9c957 · 31e51ce2 · 31e51ce2
Commit 31e51ce2 authored Nov 06, 2011 by Rafaël Carré
Show whitespace changes
Inline Side-by-side

Showing with 15 additions and 0 deletions

contrib/src/projectM/rules.mak contrib/src/projectM/rules.mak +3 -0

contrib/src/projectM/win64.patch contrib/src/projectM/win64.patch +12 -0

No files found.
--- 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

--- a/contrib/src/projectM/win64.patch
+++ b/contrib/src/projectM/win64.patch
+--- 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