blob: 10435b85fbd653a46f849747bf95590c6186971f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
--- zlib-1.2.3/configure
+++ zlib-1.2.3/configure
@@ -23,7 +23,7 @@
VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
-AR=${AR-"ar rc"}
+AR=${AR-"ar"}
RANLIB=${RANLIB-"ranlib"}
prefix=${prefix-/usr/local}
exec_prefix=${exec_prefix-'${prefix}'}
--- zlib-1.2.3/Makefile.in
+++ zlib-1.2.3/Makefile.in
@@ -70,7 +70,7 @@
fi
libz.a: $(OBJS) $(OBJA)
- $(AR) $@ $(OBJS) $(OBJA)
+ $(AR) rc $@ $(OBJS) $(OBJA)
-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
match.o: match.S
--- zlib-1.2.3/win32/Makefile.gcc
+++ zlib-1.2.3/win32/Makefile.gcc
@@ -30,21 +30,23 @@
#LOC = -DASMV
#LOC = -DDEBUG -g
-CC = gcc
-CFLAGS = $(LOC) -O3 -Wall
+CC ?= gcc
+CFLAGS ?= $(LOC) -O3 -Wall
-AS = $(CC)
-ASFLAGS = $(LOC) -Wall
+AS ?= $(CC)
+ASFLAGS ?= $(LOC) -Wall
LD = $(CC)
-LDFLAGS = $(LOC) -s
+LDFLAGS ?= $(LOC) -s
-AR = ar
+AR ?= ar
ARFLAGS = rcs
-RC = windres
+RC ?= windres
RCFLAGS = --define GCC_WINDRES
+DLLWRAP ?= dllwrap
+
CP = cp -fp
# If GNU install is available, replace $(CP) with install.
INSTALL = $(CP)
@@ -79,9 +81,8 @@
$(IMPLIB): $(SHAREDLIB)
$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
- dllwrap --driver-name $(CC) --def win32/zlib.def \
+ $(DLLWRAP) --driver-name $(CC) --def win32/zlib.def \
--implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o
- strip $@
example: example.o $(STATICLIB)
$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
|
GitWeb
