projects/aports·blob master · refs

160 lines · 5.8 KiB

1--- flycast-6f27e7121d2b9f2c084d18219a9e439c403a1b89/core/hw/maple/maple_devs.cpp.orig
2+++ flycast-6f27e7121d2b9f2c084d18219a9e439c403a1b89/core/hw/maple/maple_devs.cpp
3@@ -8,7 +8,7 @@
4 #include <math.h>
5 #include <time.h>
6
7-#include "deps/zlib/zlib.h"
8+#include <zlib.h>
9 #include "deps/xxhash/xxhash.h"
10
11 #define LOGJVS(...) DEBUG_LOG(JVS, __VA_ARGS__)
12--- flycast-6f27e7121d2b9f2c084d18219a9e439c403a1b89/core/archive/ZipArchive.h.orig
13+++ flycast-6f27e7121d2b9f2c084d18219a9e439c403a1b89/core/archive/ZipArchive.h
14@@ -22,7 +22,7 @@
15 #ifndef CORE_ARCHIVE_ZIPARCHIVE_H_
16 #define CORE_ARCHIVE_ZIPARCHIVE_H_
17 #include "archive.h"
18-#include "deps/libzip/zip.h"
19+#include <zip.h>
20
21 class ZipArchive : public Archive
22 {
23--- flycast-6f27e7121d2b9f2c084d18219a9e439c403a1b89/core/network/miniupnp.cpp.orig
24+++ flycast-6f27e7121d2b9f2c084d18219a9e439c403a1b89/core/network/miniupnp.cpp
25@@ -16,8 +16,8 @@
26 You should have received a copy of the GNU General Public License
27 along with Flycast. If not, see <https://www.gnu.org/licenses/>.
28 */
29-#include <miniupnpc.h>
30-#include <upnpcommands.h>
31+#include <miniupnpc/miniupnpc.h>
32+#include <miniupnpc/upnpcommands.h>
33 #include "types.h"
34 #include "miniupnp.h"
35
36--- flycast-6f27e7121d2b9f2c084d18219a9e439c403a1b89/Makefile.common.orig
37+++ flycast-6f27e7121d2b9f2c084d18219a9e439c403a1b89/Makefile.common
38@@ -9,6 +9,7 @@
39 -I$(LIBRETRO_COMM_DIR)/include \
40 -I$(DEPS_DIR)/vixl \
41 -I$(DEPS_DIR)/stb
42+LIBS += -lminiupnpc
43
44 SOURCES_C ?=
45 SOURCES_CXX := \
46@@ -169,62 +170,6 @@
47 $(DEPS_DIR)/libchdr/src/libchdr_flac.c \
48 $(DEPS_DIR)/libchdr/src/libchdr_huffman.c \
49
50-LIBZIP_SOURCES_C = \
51- $(DEPS_DIR)/libzip/mkstemp.c \
52- $(DEPS_DIR)/libzip/zip_add.c \
53- $(DEPS_DIR)/libzip/zip_add_dir.c \
54- $(DEPS_DIR)/libzip/zip_close.c \
55- $(DEPS_DIR)/libzip/zip_delete.c \
56- $(DEPS_DIR)/libzip/zip_dirent.c \
57- $(DEPS_DIR)/libzip/zip_entry_free.c \
58- $(DEPS_DIR)/libzip/zip_entry_new.c \
59- $(DEPS_DIR)/libzip/zip_error.c \
60- $(DEPS_DIR)/libzip/zip_error_clear.c \
61- $(DEPS_DIR)/libzip/zip_error_get.c \
62- $(DEPS_DIR)/libzip/zip_error_get_sys_type.c \
63- $(DEPS_DIR)/libzip/zip_error_strerror.c \
64- $(DEPS_DIR)/libzip/zip_error_to_str.c \
65- $(DEPS_DIR)/libzip/zip_err_str.c \
66- $(DEPS_DIR)/libzip/zip_fclose.c \
67- $(DEPS_DIR)/libzip/zip_file_error_clear.c \
68- $(DEPS_DIR)/libzip/zip_file_error_get.c \
69- $(DEPS_DIR)/libzip/zip_file_get_offset.c \
70- $(DEPS_DIR)/libzip/zip_filerange_crc.c \
71- $(DEPS_DIR)/libzip/zip_file_strerror.c \
72- $(DEPS_DIR)/libzip/zip_fopen.c \
73- $(DEPS_DIR)/libzip/zip_fopen_index.c \
74- $(DEPS_DIR)/libzip/zip_fread.c \
75- $(DEPS_DIR)/libzip/zip_free.c \
76- $(DEPS_DIR)/libzip/zip_get_archive_comment.c \
77- $(DEPS_DIR)/libzip/zip_get_archive_flag.c \
78- $(DEPS_DIR)/libzip/zip_get_file_comment.c \
79- $(DEPS_DIR)/libzip/zip_get_name.c \
80- $(DEPS_DIR)/libzip/zip_get_num_files.c \
81- $(DEPS_DIR)/libzip/zip_memdup.c \
82- $(DEPS_DIR)/libzip/zip_name_locate.c \
83- $(DEPS_DIR)/libzip/zip_new.c \
84- $(DEPS_DIR)/libzip/zip_open.c \
85- $(DEPS_DIR)/libzip/zip_rename.c \
86- $(DEPS_DIR)/libzip/zip_replace.c \
87- $(DEPS_DIR)/libzip/zip_set_archive_comment.c \
88- $(DEPS_DIR)/libzip/zip_set_archive_flag.c \
89- $(DEPS_DIR)/libzip/zip_set_file_comment.c \
90- $(DEPS_DIR)/libzip/zip_set_name.c \
91- $(DEPS_DIR)/libzip/zip_source_buffer.c \
92- $(DEPS_DIR)/libzip/zip_source_file.c \
93- $(DEPS_DIR)/libzip/zip_source_filep.c \
94- $(DEPS_DIR)/libzip/zip_source_free.c \
95- $(DEPS_DIR)/libzip/zip_source_function.c \
96- $(DEPS_DIR)/libzip/zip_source_zip.c \
97- $(DEPS_DIR)/libzip/zip_stat.c \
98- $(DEPS_DIR)/libzip/zip_stat_index.c \
99- $(DEPS_DIR)/libzip/zip_stat_init.c \
100- $(DEPS_DIR)/libzip/zip_strerror.c \
101- $(DEPS_DIR)/libzip/zip_unchange_all.c \
102- $(DEPS_DIR)/libzip/zip_unchange_archive.c \
103- $(DEPS_DIR)/libzip/zip_unchange.c \
104- $(DEPS_DIR)/libzip/zip_unchange_data.c
105-
106 PICOTCP_INCFLAGS = \
107 -I$(DEPS_DIR)/picotcp/include \
108 -I$(DEPS_DIR)/picotcp/modules
109@@ -256,18 +201,6 @@
110
111 XXHASH_SOURCES_C = $(DEPS_DIR)/xxhash/xxhash.c
112
113-ZLIB_SOURCES_C = \
114- $(DEPS_DIR)/zlib/deflate.c \
115- $(DEPS_DIR)/zlib/uncompr.c \
116- $(DEPS_DIR)/zlib/zutil.c \
117- $(DEPS_DIR)/zlib/inffast.c \
118- $(DEPS_DIR)/zlib/crc32.c \
119- $(DEPS_DIR)/zlib/inflate.c \
120- $(DEPS_DIR)/zlib/infback.c \
121- $(DEPS_DIR)/zlib/inftrees.c \
122- $(DEPS_DIR)/zlib/trees.c \
123- $(DEPS_DIR)/zlib/adler32.c
124-
125 SOURCES_ASM :=
126
127 ifeq ($(SYSTEM_LIBZIP), 1)
128@@ -298,7 +231,6 @@
129 endif
130
131 ifeq ($(ENABLE_MODEM), 1)
132- INCFLAGS += -I$(CORE_DIR)/core/deps/miniupnpc
133 SOURCES_CXX += $(CORE_DIR)/core/hw/modem/dns.cpp \
134 $(CORE_DIR)/core/hw/modem/modem.cpp \
135 $(CORE_DIR)/core/hw/bba/bba.cpp \
136@@ -306,23 +238,7 @@
137 $(CORE_DIR)/core/network/picoppp.cpp \
138 $(CORE_DIR)/core/network/miniupnp.cpp
139
140- SOURCES_C += \
141- $(CORE_DIR)/core/deps/miniupnpc/addr_is_reserved.c \
142- $(CORE_DIR)/core/deps/miniupnpc/igd_desc_parse.c \
143- $(CORE_DIR)/core/deps/miniupnpc/upnpreplyparse.c \
144- $(CORE_DIR)/core/deps/miniupnpc/upnpcommands.c \
145- $(CORE_DIR)/core/deps/miniupnpc/upnperrors.c \
146- $(CORE_DIR)/core/deps/miniupnpc/connecthostport.c \
147- $(CORE_DIR)/core/deps/miniupnpc/portlistingparse.c \
148- $(CORE_DIR)/core/deps/miniupnpc/receivedata.c \
149- $(CORE_DIR)/core/deps/miniupnpc/upnpdev.c \
150- $(CORE_DIR)/core/deps/miniupnpc/minissdpc.c \
151- $(CORE_DIR)/core/deps/miniupnpc/miniwget.c \
152- $(CORE_DIR)/core/deps/miniupnpc/miniupnpc.c \
153- $(CORE_DIR)/core/deps/miniupnpc/minixml.c \
154- $(CORE_DIR)/core/deps/miniupnpc/minisoap.c
155-
156- CORE_DEFINES += -DENABLE_MODEM -DMINIUPNP_STATICLIB
157+ CORE_DEFINES += -DENABLE_MODEM
158 endif
159
160 ifeq ($(HAVE_GL), 1)