Mercurial > mxe-octave
view src/of-ltfat-1-mingw-fixes.patch @ 3804:7e15ef9bf1e5
Update build-gcc, nsis to compile when in w64 mode.
* src/build-binutils.mk: add windows 64 conditionals to binutils to compile multilib
* src/build-gcc.mk:add windows 64 conditionals to gcc to compile multilib
* src/nsis.mk: add PKG_BUILD target for windows 64
* src/win64-nsis.patch: new file.
* dist-files.mk: add reference to win64-nsis.patch.
author | John D |
---|---|
date | Tue, 17 Feb 2015 14:48:23 -0500 |
parents | 6dc67bfb5958 |
children |
line wrap: on
line source
diff -ur ltfat.orig/src/Makefile.in ltfat/src/Makefile.in --- ltfat.orig/src/Makefile.in 2014-11-13 07:55:44 -0500 +++ ltfat/src/Makefile.in 2014-11-13 15:31:03 -0500 @@ -1,5 +1,11 @@ targets = oct playrec +CC=@CC@ +CXX=@CXX@ + +export CC +export CXX + ifeq (@have_libportaudio@,1) export HAVE_PORTAUDIO=1 endif diff -ur ltfat.orig/src/Makefile_unix ltfat/src/Makefile_unix --- ltfat.orig/src/Makefile_unix 2014-11-13 07:55:44 -0500 +++ ltfat/src/Makefile_unix 2014-11-21 08:31:02 -0500 @@ -21,8 +21,11 @@ SFFTW=-lfftw3f endif - -CFLAGS=-O3 -fPIC -std=c99 -Ithirdparty +ifeq ($(OS),Windows_NT) + CFLAGS=-O3 -std=c99 -Ithirdparty +else + CFLAGS=-O3 -fPIC -std=c99 -Ithirdparty +endif SHARED_FLAGS=-shared -Wl,--no-undefined -lc -lm -L"$(MATLABROOT)/bin/$(ARCH)" \ -lmwblas -lmwlapack $(DFFTW) $(SFFTW) diff -ur ltfat.orig/src/ostools.mk ltfat/src/ostools.mk --- ltfat.orig/src/ostools.mk 2014-11-13 07:55:44 -0500 +++ ltfat/src/ostools.mk 2014-11-13 15:28:55 -0500 @@ -9,12 +9,14 @@ CP = copy /Y PS2 = \\ PS = $(strip $(PS2)) +ifndef SHELL ifdef ComSpec SHELL := $(ComSpec) endif ifdef COMSPEC SHELL := $(COMSPEC) endif +endif CC = gcc else #If not on Windows