aboutsummaryrefslogtreecommitdiffstats
path: root/testing/libretro-dinothawr/patch-unbundle.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/libretro-dinothawr/patch-unbundle.patch')
-rw-r--r--testing/libretro-dinothawr/patch-unbundle.patch101
1 files changed, 50 insertions, 51 deletions
diff --git a/testing/libretro-dinothawr/patch-unbundle.patch b/testing/libretro-dinothawr/patch-unbundle.patch
index 372c73b72ab..05db4b89af0 100644
--- a/testing/libretro-dinothawr/patch-unbundle.patch
+++ b/testing/libretro-dinothawr/patch-unbundle.patch
@@ -11,57 +11,6 @@ Remove bundled zlib, libvorbis and libogg
using namespace pugi;
---- a/Makefile.common
-+++ b/Makefile.common
-@@ -1,6 +1,5 @@
- LIBRETRO_COMM_DIR := $(CORE_DIR)/libretro-common
--DEPS_DIR := $(CORE_DIR)/deps
--INCFLAGS := -I$(DEPS_DIR) -I$(CORE_DIR)/audio -I$(DEPS_DIR)/pugixml -I$(DEPS_DIR)/vorbis -I$(DEPS_DIR)/ogg -I$(DEPS_DIR)/libz -I$(LIBRETRO_COMM_DIR)/include
-+INCFLAGS := -I$(CORE_DIR)/audio -I$(LIBRETRO_COMM_DIR)/include
-
- SOURCES_ASM :=
-
-@@ -15,40 +14,7 @@
- $(CORE_DIR)/surface_cache.cpp \
- $(CORE_DIR)/surface_cluster.cpp \
- $(CORE_DIR)/tilemap.cpp \
-- $(DEPS_DIR)/pugixml/pugixml.cpp \
- $(CORE_DIR)/audio/mixer.cpp
--
--SOURCES_C := \
-- $(DEPS_DIR)/ogg/bitwise.c \
-- $(DEPS_DIR)/ogg/framing.c \
-- $(DEPS_DIR)/vorbis/bitrate.c \
-- $(DEPS_DIR)/vorbis/block.c \
-- $(DEPS_DIR)/vorbis/codebook.c \
-- $(DEPS_DIR)/vorbis/envelope.c \
-- $(DEPS_DIR)/vorbis/floor0.c \
-- $(DEPS_DIR)/vorbis/floor1.c \
-- $(DEPS_DIR)/vorbis/info.c \
-- $(DEPS_DIR)/vorbis/lpc.c \
-- $(DEPS_DIR)/vorbis/lsp.c \
-- $(DEPS_DIR)/vorbis/mapping0.c \
-- $(DEPS_DIR)/vorbis/mdct.c \
-- $(DEPS_DIR)/vorbis/psy.c \
-- $(DEPS_DIR)/vorbis/registry.c \
-- $(DEPS_DIR)/vorbis/res0.c \
-- $(DEPS_DIR)/vorbis/sharedbook.c \
-- $(DEPS_DIR)/vorbis/smallft.c \
-- $(DEPS_DIR)/vorbis/synthesis.c \
-- $(DEPS_DIR)/vorbis/vorbisfile.c \
-- $(DEPS_DIR)/vorbis/window.c \
-- $(DEPS_DIR)/libz/adler32.c \
-- $(DEPS_DIR)/libz/crc32.c \
-- $(DEPS_DIR)/libz/deflate.c \
-- $(DEPS_DIR)/libz/infback.c \
-- $(DEPS_DIR)/libz/inffast.c \
-- $(DEPS_DIR)/libz/inflate.c \
-- $(DEPS_DIR)/libz/inftrees.c \
-- $(DEPS_DIR)/libz/trees.c \
-- $(DEPS_DIR)/libz/zutil.c
-
- SOURCES_C += $(CORE_DIR)/rpng_front.c
-
--- a/Makefile
+++ b/Makefile
@@ -392,6 +392,8 @@
@@ -127,3 +76,53 @@ Remove bundled zlib, libvorbis and libogg
#include <string>
#include <set>
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -1,6 +1,6 @@
+ LIBRETRO_COMM_DIR := $(CORE_DIR)/libretro-common
+ DEPS_DIR := $(CORE_DIR)/deps
+-INCFLAGS := -I$(DEPS_DIR) -I$(CORE_DIR)/audio -I$(DEPS_DIR)/pugixml -I$(DEPS_DIR)/vorbis -I$(DEPS_DIR)/ogg -I$(DEPS_DIR)/libz -I$(LIBRETRO_COMM_DIR)/include
++INCFLAGS := -I$(CORE_DIR)/audio -I$(LIBRETRO_COMM_DIR)/include
+
+ SOURCES_ASM :=
+
+@@ -15,39 +15,7 @@
+ $(CORE_DIR)/surface_cache.cpp \
+ $(CORE_DIR)/surface_cluster.cpp \
+ $(CORE_DIR)/tilemap.cpp \
+- $(DEPS_DIR)/pugixml/pugixml.cpp \
+ $(CORE_DIR)/audio/mixer.cpp
+-
+-SOURCES_C := \
+- $(DEPS_DIR)/ogg/bitwise.c \
+- $(DEPS_DIR)/ogg/framing.c \
+- $(DEPS_DIR)/vorbis/bitrate.c \
+- $(DEPS_DIR)/vorbis/block.c \
+- $(DEPS_DIR)/vorbis/codebook.c \
+- $(DEPS_DIR)/vorbis/envelope.c \
+- $(DEPS_DIR)/vorbis/floor0.c \
+- $(DEPS_DIR)/vorbis/floor1.c \
+- $(DEPS_DIR)/vorbis/info.c \
+- $(DEPS_DIR)/vorbis/lpc.c \
+- $(DEPS_DIR)/vorbis/lsp.c \
+- $(DEPS_DIR)/vorbis/mapping0.c \
+- $(DEPS_DIR)/vorbis/mdct.c \
+- $(DEPS_DIR)/vorbis/psy.c \
+- $(DEPS_DIR)/vorbis/registry.c \
+- $(DEPS_DIR)/vorbis/res0.c \
+- $(DEPS_DIR)/vorbis/sharedbook.c \
+- $(DEPS_DIR)/vorbis/smallft.c \
+- $(DEPS_DIR)/vorbis/synthesis.c \
+- $(DEPS_DIR)/vorbis/vorbisfile.c \
+- $(DEPS_DIR)/vorbis/window.c \
+- $(DEPS_DIR)/libz/adler32.c \
+- $(DEPS_DIR)/libz/crc32.c \
+- $(DEPS_DIR)/libz/deflate.c \
+- $(DEPS_DIR)/libz/inffast.c \
+- $(DEPS_DIR)/libz/inflate.c \
+- $(DEPS_DIR)/libz/inftrees.c \
+- $(DEPS_DIR)/libz/trees.c \
+- $(DEPS_DIR)/libz/zutil.c
+
+ SOURCES_C += $(CORE_DIR)/rpng_front.c
+