Mercurial > mxe-octave

comparison Makefile.in @ 3710:1220a9158bc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make building 64-bit Windows binaries independent from enabling 64-bit indexing in Octave
author John W. Eaton <jwe@octave.org>
date Sun, 07 Sep 2014 06:42:40 -0400
parents c8546fe79bc9
children 933b99febcf1
comparison
equal deleted inserted replaced
3709:c8546fe79bc9 3710:1220a9158bc1
39 39
40 # Set to "yes" to use the version of fontconfig already installed 40 # Set to "yes" to use the version of fontconfig already installed
41 # on your system (default is yes if doing native build). 41 # on your system (default is yes if doing native build).
42 USE_SYSTEM_FONTCONFIG := @USE_SYSTEM_FONTCONFIG@ 42 USE_SYSTEM_FONTCONFIG := @USE_SYSTEM_FONTCONFIG@
43 43
44 # Build compiler for 64-bit Windows. Using this option will build
45 # binaries that require a 64-bit Windows system.
46 ENABLE_WINDOWS_64 := @ENABLE_WINDOWS_64@
47
44 # Attempt to build Octave and dependencies with 64-bit indexing 48 # Attempt to build Octave and dependencies with 64-bit indexing
45 # enabled (experimental; requires 64-bit system and compiler). 49 # enabled (experimental; requires 64-bit system and compiler).
50 # Note that 64-bit indexing is NOT required simply because you have
51 # 64-bit operating system. Building Octave with 64-bit indexing is
52 # still experimental, so enabling this option is discouraged unless
53 # you know what you are doing.
46 ENABLE_64 := @ENABLE_64@ 54 ENABLE_64 := @ENABLE_64@
47 55
48 # Should match what config.guess prints for your system. 56 # Should match what config.guess prints for your system.
49 # If cross compiling, you must set it manually. 57 # If cross compiling, you must set it manually.
50 ifeq ($(MXE_NATIVE_BUILD),yes) 58 ifeq ($(MXE_NATIVE_BUILD),yes)
51 TARGET := $(shell tools/config.guess) 59 TARGET := $(shell tools/config.guess)
52 else 60 else
53 ifeq ($(ENABLE_64),yes) 61 ifeq ($(ENABLE_WINDOWS_64),yes)
54 TARGET := x86_64-w64-mingw32 62 TARGET := x86_64-w64-mingw32
55 else 63 else
56 TARGET := i686-w64-mingw32 64 TARGET := i686-w64-mingw32
57 endif 65 endif
58 endif 66 endif