Mercurial > mxe-octave

comparison src/mingw-of-ltfat-1-fixes.patch @ 4074:44b303c931fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-ltfat: changes to cross compile * mingw-of-ltfat-1-fixes.patch: new file
author John Donoghue
date Wed, 06 Jan 2016 15:59:41 -0500
parents
children
comparison
equal deleted inserted replaced
4073:03ed5810b068 4074:44b303c931fb
1 diff -ur ltfat.org/src/Makefile_unix ltfat/src/Makefile_unix
2 --- ltfat.org/src/Makefile_unix 2016-01-05 17:21:15.961378462 -0500
3 +++ ltfat/src/Makefile_unix 2016-01-05 17:24:30.278398266 -0500
4 @@ -27,9 +27,11 @@
5 include comptarget.mk
6
7 # This is used for Octave mxe
8 -ifneq ($(OS),Windows_NT)
9 - CFLAGS+=-fPIC
10 -endif
11 +#ifneq ($(OS),Windows_NT)
12 +# CFLAGS+=-fPIC
13 +#endif
14 +AR ?= ar
15 +RANLIB ?= ranlib
16
17 # Used only in the shared library build
18 SHARED_FLAGS=-shared -Wl,--no-undefined -L"$(MATLABROOT)/bin/$(ARCH)" \
19 @@ -50,13 +52,13 @@
20 shared: double_shared single_shared
21
22 double_static: $(DFILES) Makefile_unix
23 - ar rvu libltfat.a $(DFILES)
24 - ranlib libltfat.a
25 + $(AR) rvu libltfat.a $(DFILES)
26 + $(RANLIB) libltfat.a
27 cp -f libltfat.a ../lib
28
29 single_static: $(SFILES) Makefile_unix
30 - ar rvu libltfatf.a $(SFILES)
31 - ranlib libltfatf.a
32 + $(AR) rvu libltfatf.a $(SFILES)
33 + $(RANLIB) libltfatf.a
34 cp -f libltfatf.a ../lib
35
36 double_shared: $(DFILES) Makefile_unix