notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git subrepo pull (merge) --force deps/libchdr
[pcsx_rearmed.git]
/
deps
/
libchdr
/
deps
/
zlib-1.3.1
/
Makefile.in
diff --git
a/deps/libchdr/deps/zlib-1.2.13/Makefile.in
b/deps/libchdr/deps/zlib-1.3.1/Makefile.in
similarity index 96%
rename from
deps/libchdr/deps/zlib-1.2.13/Makefile.in
rename to
deps/libchdr/deps/zlib-1.3.1/Makefile.in
index
7d2713f
..
cb8b00a
100644
(file)
--- a/
deps/libchdr/deps/zlib-1.2.13/Makefile.in
+++ b/
deps/libchdr/deps/zlib-1.3.1/Makefile.in
@@
-1,5
+1,5
@@
# Makefile for zlib
# Makefile for zlib
-# Copyright (C) 1995-20
17
Jean-loup Gailly, Mark Adler
+# Copyright (C) 1995-20
24
Jean-loup Gailly, Mark Adler
# For conditions of distribution and use, see copyright notice in zlib.h
# To compile and test, type:
# For conditions of distribution and use, see copyright notice in zlib.h
# To compile and test, type:
@@
-22,13
+22,13
@@
CFLAGS=-O
SFLAGS=-O
LDFLAGS=
SFLAGS=-O
LDFLAGS=
-TEST_L
DFLAGS=$(LDFLAGS)
-L. libz.a
+TEST_L
IBS=
-L. libz.a
LDSHARED=$(CC)
CPP=$(CC) -E
STATICLIB=libz.a
SHAREDLIB=libz.so
LDSHARED=$(CC)
CPP=$(CC) -E
STATICLIB=libz.a
SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.
2.13
+SHAREDLIBV=libz.so.1.
3.1
SHAREDLIBM=libz.so.1
LIBS=$(STATICLIB) $(SHAREDLIBV)
SHAREDLIBM=libz.so.1
LIBS=$(STATICLIB) $(SHAREDLIBV)
@@
-282,10
+282,10
@@
placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
-@rmdir objs
example$(EXE): example.o $(STATICLIB)
-@rmdir objs
example$(EXE): example.o $(STATICLIB)
- $(CC) $(CFLAGS)
-o $@ example.o $(TEST_LDFLAG
S)
+ $(CC) $(CFLAGS)
$(LDFLAGS) -o $@ example.o $(TEST_LIB
S)
minigzip$(EXE): minigzip.o $(STATICLIB)
minigzip$(EXE): minigzip.o $(STATICLIB)
- $(CC) $(CFLAGS)
-o $@ minigzip.o $(TEST_LDFLAG
S)
+ $(CC) $(CFLAGS)
$(LDFLAGS) -o $@ minigzip.o $(TEST_LIB
S)
examplesh$(EXE): example.o $(SHAREDLIBV)
$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
examplesh$(EXE): example.o $(SHAREDLIBV)
$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
@@
-294,10
+294,10
@@
minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
example64$(EXE): example64.o $(STATICLIB)
$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
example64$(EXE): example64.o $(STATICLIB)
- $(CC) $(CFLAGS)
-o $@ example64.o $(TEST_LDFLAG
S)
+ $(CC) $(CFLAGS)
$(LDFLAGS) -o $@ example64.o $(TEST_LIB
S)
minigzip64$(EXE): minigzip64.o $(STATICLIB)
minigzip64$(EXE): minigzip64.o $(STATICLIB)
- $(CC) $(CFLAGS)
-o $@ minigzip64.o $(TEST_LDFLAG
S)
+ $(CC) $(CFLAGS)
$(LDFLAGS) -o $@ minigzip64.o $(TEST_LIB
S)
install-libs: $(LIBS)
-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
install-libs: $(LIBS)
-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
@@
-359,8
+359,14
@@
zconf.h.cmakein: $(SRCDIR)zconf.h.in
zconf: $(SRCDIR)zconf.h.in
cp -p $(SRCDIR)zconf.h.in zconf.h
zconf: $(SRCDIR)zconf.h.in
cp -p $(SRCDIR)zconf.h.in zconf.h
+minizip-test: static
+ cd contrib/minizip && { CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; }
+
+minizip-clean:
+ cd contrib/minizip && { $(MAKE) clean ; cd ../.. ; }
+
mostlyclean: clean
mostlyclean: clean
-clean:
+clean:
minizip-clean
rm -f *.o *.lo *~ \
example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
example64$(EXE) minigzip64$(EXE) \
rm -f *.o *.lo *~ \
example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
example64$(EXE) minigzip64$(EXE) \