Mercurial > mxe-octave

comparison Makefile.in @ 3441:be097438c96f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make native gnu-linux builds work for pkg-config and libgomp
author John W. Eaton <jwe@octave.org>
date Wed, 22 Jan 2014 05:05:01 -0500
parents c9ade6d47f3a
children f0a1b0872dbb
comparison
equal deleted inserted replaced
3440:e24ccde182f2 3441:be097438c96f
321 MSYS_EXTENSION_DIR := $(TOP_DIR)/msys-extension 321 MSYS_EXTENSION_DIR := $(TOP_DIR)/msys-extension
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 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)
323 323
324 NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++ 324 NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++
325 endif 325 endif
326 else ifneq ($(MXE_SYSTEM),msvc) 326 else ifeq ($(MXE_SYSTEM),msvc)
327 MXE_WINDOWS_BUILD := yes 327 MXE_WINDOWS_BUILD := yes
328 else
329 MXE_WINDOWS_BUILD := no
328 MXE_CPPFLAGS := '-I$(HOST_INCDIR)' 330 MXE_CPPFLAGS := '-I$(HOST_INCDIR)'
329 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes) 331 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
330 MXE_LDFLAGS := '-L$(HOST_LIBDIR) -L$(HOST_LIB64DIR)' 332 MXE_LDFLAGS := '-L$(HOST_LIBDIR) -L$(HOST_LIB64DIR)'
331 LD_LIBRARY_PATH := $(HOST_LIBDIR):$(HOST_LIB64DIR) 333 LD_LIBRARY_PATH := $(HOST_LIBDIR):$(HOST_LIB64DIR)
332 else 334 else