[tor-commits] [tor-messenger-build/master] instantbird: fix "mach package" with mingw

[boklm@xxxxxxxxxxxxxx]

commit 50ccd3ce864c510694c2940e2b89b6185abd0492
Author: Nicolas Vigier <boklm@xxxxxxxxxxxxxx>
Date:   Wed Nov 26 14:46:57 2014 +0100

    instantbird: fix "mach package" with mingw
---
 projects/instantbird/fix-mingw-build.patch |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/projects/instantbird/fix-mingw-build.patch b/projects/instantbird/fix-mingw-build.patch
index 7eefc39..683a3fb 100644
--- a/projects/instantbird/fix-mingw-build.patch
+++ b/projects/instantbird/fix-mingw-build.patch
@@ -11,6 +11,24 @@ index 048ef94facc1..71d1a3409c79 100644
  # For Windows build the uninstaller during the application build since the
  # uninstaller is included with the application for mar file generation.
  libs::
+diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in
+index 2a7af7daf20f..6e3855d87f4d 100644
+--- a/im/installer/Makefile.in
++++ b/im/installer/Makefile.in
+@@ -50,9 +50,13 @@ DEFINES += -DJAREXT=
+ 
+ ifdef MOZ_ANGLE_RENDERER
+ DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
++ifdef MOZ_D3DCOMPILER_VISTA_DLL
+ DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
++endif
++ifdef MOZ_D3DCOMPILER_XP_DLL
+ DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL)
+ endif
++endif
+ 
+ ifdef MOZ_UPDATER
+ DEFINES += -DMOZ_UPDATER=1
 diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in
 index 12397ff741fc..27d581f53c97 100644
 --- a/im/installer/package-manifest.in

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits