Mercurial > mxe-octave

comparison src/osmesa.mk @ 3803:f2776007d295

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
osmesa: update for win64 * src/osmesa.mk: use machi value of x86_64 is compiling for win64
author John D
date Tue, 17 Feb 2015 18:55:38 -0500
parents a169ad26bac2
children b6f31861c73e
comparison
equal deleted inserted replaced
3802:6f9360caaf59 3803:f2776007d295
13 echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; 13 echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
14 echo $($(PKG)_VERSION) 14 echo $($(PKG)_VERSION)
15 endef 15 endef
16 16
17 ifeq ($(MXE_WINDOWS_BUILD),yes) 17 ifeq ($(MXE_WINDOWS_BUILD),yes)
18 ifeq ($(ENABLE_WINDOWS_64),yes)
19 $(PKG)_MACHINE := x86_64
20 else
21 $(PKG)_MACHINE := x86
22 endif
18 define $(PKG)_BUILD 23 define $(PKG)_BUILD
19 ## FIXME: is machine=x86 the correct thing for 64-bit Windows builds? 24 cd '$(1)' && scons platform=windows toolchain=crossmingw machine=$($(PKG)_MACHINE) verbose=1 osmesa
20 cd '$(1)' && scons platform=windows toolchain=crossmingw machine=x86 verbose=1 osmesa
21 25
22 ## Do the scons config files have useful install targets? 26 ## Do the scons config files have useful install targets?
23 $(INSTALL) -d '$(3)$(HOST_INCDIR)/GL'; 27 $(INSTALL) -d '$(3)$(HOST_INCDIR)/GL';
24 for f in '$(1)/include/GL/*.h' ; do \ 28 for f in '$(1)/include/GL/*.h' ; do \
25 $(INSTALL) -m 644 $$f '$(3)$(HOST_INCDIR)/GL'; \ 29 $(INSTALL) -m 644 $$f '$(3)$(HOST_INCDIR)/GL'; \
26 done 30 done
27 $(INSTALL) -d '$(3)$(HOST_BINDIR)'; 31 $(INSTALL) -d '$(3)$(HOST_BINDIR)';
28 $(INSTALL) -m 755 '$(1)/build/windows-x86-debug/mesa/drivers/osmesa/osmesa.dll' '$(3)$(HOST_BINDIR)/osmesa.dll'; 32 $(INSTALL) -m 755 '$(1)/build/windows-$($(PKG)_MACHINE)-debug/mesa/drivers/osmesa/osmesa.dll' '$(3)$(HOST_BINDIR)/osmesa.dll';
29 $(INSTALL) -d '$(3)$(HOST_LIBDIR)'; 33 $(INSTALL) -d '$(3)$(HOST_LIBDIR)';
30 $(INSTALL) -m 644 '$(1)/build/windows-x86-debug/mesa/drivers/osmesa/libosmesa.a' '$(3)$(HOST_LIBDIR)/libOSMesa.a'; 34 $(INSTALL) -m 644 '$(1)/build/windows-$($(PKG)_MACHINE)-debug/mesa/drivers/osmesa/libosmesa.a' '$(3)$(HOST_LIBDIR)/libOSMesa.a';
31 endef 35 endef
32 else 36 else
33 define $(PKG)_BUILD 37 define $(PKG)_BUILD
34 mkdir '$(1)/.build' 38 mkdir '$(1)/.build'
35 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ 39 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \