projects/aports·blob master · refs

92 lines · 1.7 KiB

1Remove bundled zlib.
2--- a/Makefile
3+++ b/Makefile
4@@ -6,9 +6,6 @@
5 endif
6 FIXUP:=true
7
8-BUNDLED_LIBZ:=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o\
9- zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
10-
11 ifeq ($(OS),Windows)
12
13 GLEW_PREFIX:=glew
14@@ -74,7 +71,7 @@
15 endif #Darwin
16
17 ifdef HOST_ZLIB
18-LIBS+= zlib
19+LIBS+= -lz
20 LIBZOBJS=
21 else
22 LIBZOBJS=$(BUNDLED_LIBZ)
23--- a/blastem.c
24+++ b/blastem.c
25@@ -65,7 +65,7 @@
26 #define romgetc fgetc
27 #define romclose fclose
28 #else
29-#include "zlib/zlib.h"
30+#include <zlib.h>
31 #define ROMFILE gzFile
32 #define romopen gzopen
33 #define romread gzfread
34--- a/event_log.c
35+++ b/event_log.c
36@@ -13,11 +13,13 @@
37 #include <stdlib.h>
38 #include <string.h>
39 #include <errno.h>
40+
41+#include <zlib.h>
42+
43 #include "event_log.h"
44 #include "util.h"
45 #include "blastem.h"
46 #include "saves.h"
47-#include "zlib/zlib.h"
48
49 enum {
50 CMD_GAMEPAD_DOWN,
51--- a/event_log.h
52+++ b/event_log.h
53@@ -1,6 +1,8 @@
54 #ifndef EVENT_LOG_H_
55 #define EVENT_LOG_H_
56
57+#include <zlib.h>
58+
59 enum {
60 EVENT_FLUSH = 0,
61 EVENT_ADJUST = 1,
62@@ -20,7 +22,6 @@
63 };
64
65 #include "serialize.h"
66-#include "zlib/zlib.h"
67 typedef struct {
68 size_t storage;
69 uint8_t *socket_buffer;
70--- a/png.c
71+++ b/png.c
72@@ -2,7 +2,8 @@
73 #include <stdlib.h>
74 #include <stdio.h>
75 #include <string.h>
76-#include "zlib/zlib.h"
77+
78+#include <zlib.h>
79
80 static const char png_magic[] = {0x89, 'P', 'N', 'G', '\r', '\n', 0x1A, '\n'};
81 static const char ihdr[] = {'I', 'H', 'D', 'R'};
82--- a/zip.c
83+++ b/zip.c
84@@ -5,7 +5,7 @@
85 #include "util.h"
86 #include "zip.h"
87 #ifndef DISABLE_ZLIB
88-#include "zlib/zlib.h"
89+#include <zlib.h>
90 #endif
91
92 static const char cdfd_magic[4] = {'P', 'K', 1, 2};