# HG changeset patch
# User John D
# Date 1424217338 18000
# Node ID f2776007d295b7af58a0bbddd6913243d3a4252f
# Parent  6f9360caaf59649c8ed0c41ee833d3b3d2914016
osmesa: update for win64

* src/osmesa.mk: use machi value of x86_64 is compiling for win64

diff -r 6f9360caaf59 -r f2776007d295 src/osmesa.mk
--- a/src/osmesa.mk	Mon Feb 16 21:19:29 2015 -0500
+++ b/src/osmesa.mk	Tue Feb 17 18:55:38 2015 -0500
@@ -15,9 +15,13 @@
 endef
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
+  ifeq ($(ENABLE_WINDOWS_64),yes)
+    $(PKG)_MACHINE := x86_64
+  else
+    $(PKG)_MACHINE := x86
+  endif
   define $(PKG)_BUILD
-    ## FIXME: is machine=x86 the correct thing for 64-bit Windows builds?
-    cd '$(1)' && scons platform=windows toolchain=crossmingw machine=x86 verbose=1 osmesa
+    cd '$(1)' && scons platform=windows toolchain=crossmingw machine=$($(PKG)_MACHINE) verbose=1 osmesa
 
     ## Do the scons config files have useful install targets?
     $(INSTALL) -d '$(3)$(HOST_INCDIR)/GL';
@@ -25,9 +29,9 @@
       $(INSTALL) -m 644 $$f '$(3)$(HOST_INCDIR)/GL'; \
     done
     $(INSTALL) -d '$(3)$(HOST_BINDIR)';
-    $(INSTALL) -m 755 '$(1)/build/windows-x86-debug/mesa/drivers/osmesa/osmesa.dll' '$(3)$(HOST_BINDIR)/osmesa.dll';
+    $(INSTALL) -m 755 '$(1)/build/windows-$($(PKG)_MACHINE)-debug/mesa/drivers/osmesa/osmesa.dll' '$(3)$(HOST_BINDIR)/osmesa.dll';
     $(INSTALL) -d '$(3)$(HOST_LIBDIR)';
-    $(INSTALL) -m 644 '$(1)/build/windows-x86-debug/mesa/drivers/osmesa/libosmesa.a' '$(3)$(HOST_LIBDIR)/libOSMesa.a';
+    $(INSTALL) -m 644 '$(1)/build/windows-$($(PKG)_MACHINE)-debug/mesa/drivers/osmesa/libosmesa.a' '$(3)$(HOST_LIBDIR)/libOSMesa.a';
   endef
 else
   define $(PKG)_BUILD