3739
|
1 diff -ur ltfat.orig/src/Makefile.in ltfat/src/Makefile.in |
|
2 --- ltfat.orig/src/Makefile.in 2014-11-13 07:55:44 -0500 |
|
3 +++ ltfat/src/Makefile.in 2014-11-13 15:31:03 -0500 |
|
4 @@ -1,5 +1,11 @@ |
|
5 targets = oct playrec |
|
6 |
|
7 +CC=@CC@ |
|
8 +CXX=@CXX@ |
|
9 + |
|
10 +export CC |
|
11 +export CXX |
|
12 + |
|
13 ifeq (@have_libportaudio@,1) |
|
14 export HAVE_PORTAUDIO=1 |
|
15 endif |
|
16 diff -ur ltfat.orig/src/Makefile_unix ltfat/src/Makefile_unix |
|
17 --- ltfat.orig/src/Makefile_unix 2014-11-13 07:55:44 -0500 |
|
18 +++ ltfat/src/Makefile_unix 2014-11-21 08:31:02 -0500 |
|
19 @@ -21,8 +21,11 @@ |
|
20 SFFTW=-lfftw3f |
|
21 endif |
|
22 |
|
23 - |
|
24 -CFLAGS=-O3 -fPIC -std=c99 -Ithirdparty |
|
25 +ifeq ($(OS),Windows_NT) |
|
26 + CFLAGS=-O3 -std=c99 -Ithirdparty |
|
27 +else |
|
28 + CFLAGS=-O3 -fPIC -std=c99 -Ithirdparty |
|
29 +endif |
|
30 SHARED_FLAGS=-shared -Wl,--no-undefined -lc -lm -L"$(MATLABROOT)/bin/$(ARCH)" \ |
|
31 -lmwblas -lmwlapack $(DFFTW) $(SFFTW) |
|
32 |
|
33 diff -ur ltfat.orig/src/ostools.mk ltfat/src/ostools.mk |
|
34 --- ltfat.orig/src/ostools.mk 2014-11-13 07:55:44 -0500 |
|
35 +++ ltfat/src/ostools.mk 2014-11-13 15:28:55 -0500 |
|
36 @@ -9,12 +9,14 @@ |
|
37 CP = copy /Y |
|
38 PS2 = \\ |
|
39 PS = $(strip $(PS2)) |
|
40 +ifndef SHELL |
|
41 ifdef ComSpec |
|
42 SHELL := $(ComSpec) |
|
43 endif |
|
44 ifdef COMSPEC |
|
45 SHELL := $(COMSPEC) |
|
46 endif |
|
47 +endif |
|
48 CC = gcc |
|
49 else |
|
50 #If not on Windows |