Mercurial > mxe-octave

comparison Makefile.in @ 3439:c9ade6d47f3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Provide new variable to check whether we are doing a Windows build. * Makefile.in (MXE_WINDOWS_BUILD): New variable. * src/libgmop.mk: Use it.
author John W. Eaton <jwe@octave.org>
date Wed, 22 Jan 2014 01:09:48 -0500
parents 9eda8d4b772d
children be097438c96f
comparison
equal deleted inserted replaced
3438:7113585920c9 3439:c9ade6d47f3a
308 HOST_LIBDIR := $(HOST_PREFIX)/lib 308 HOST_LIBDIR := $(HOST_PREFIX)/lib
309 HOST_LIB64DIR := $(HOST_PREFIX)/lib64 309 HOST_LIB64DIR := $(HOST_PREFIX)/lib64
310 HOST_INCDIR := $(HOST_PREFIX)/include 310 HOST_INCDIR := $(HOST_PREFIX)/include
311 311
312 ifeq ($(MXE_SYSTEM),mingw) 312 ifeq ($(MXE_SYSTEM),mingw)
313 MXE_WINDOWS_BUILD := yes
313 ifneq ($(MXE_NATIVE_BUILD),yes) 314 ifneq ($(MXE_NATIVE_BUILD),yes)
314 MSYS_URL := http://sourceforge.net/projects/mingw/files/MSYS 315 MSYS_URL := http://sourceforge.net/projects/mingw/files/MSYS
315 MSYS_BASE_URL := $(MSYS_URL)/Base 316 MSYS_BASE_URL := $(MSYS_URL)/Base
316 MSYS_EXTENSION_URL := $(MSYS_URL)/Extension 317 MSYS_EXTENSION_URL := $(MSYS_URL)/Extension
317 MSYS_BASE_VER := 1.0.13 318 MSYS_BASE_VER := 1.0.13
321 MSYS_BASE_PACKAGES := $(addprefix msys-,bash coreutils diffutils dos2unix file findutils gawk grep gzip less libiconv libintl libmagic make msys-core patch regex sed tar termcap unzip wget) 322 MSYS_BASE_PACKAGES := $(addprefix msys-,bash coreutils diffutils dos2unix file findutils gawk grep gzip less libiconv libintl libmagic make msys-core patch regex sed tar termcap unzip wget)
322 323
323 NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++ 324 NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++
324 endif 325 endif
325 else ifneq ($(MXE_SYSTEM),msvc) 326 else ifneq ($(MXE_SYSTEM),msvc)
327 MXE_WINDOWS_BUILD := yes
326 MXE_CPPFLAGS := '-I$(HOST_INCDIR)' 328 MXE_CPPFLAGS := '-I$(HOST_INCDIR)'
327 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes) 329 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
328 MXE_LDFLAGS := '-L$(HOST_LIBDIR) -L$(HOST_LIB64DIR)' 330 MXE_LDFLAGS := '-L$(HOST_LIBDIR) -L$(HOST_LIB64DIR)'
329 LD_LIBRARY_PATH := $(HOST_LIBDIR):$(HOST_LIB64DIR) 331 LD_LIBRARY_PATH := $(HOST_LIBDIR):$(HOST_LIB64DIR)
330 else 332 else