forked from notspiff/game.libretro.scummvm
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update libdeps.a patch to remove ranlib command
- Loading branch information
Showing
1 changed file
with
7 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,18 @@ | ||
From 76c6ee9c2218c3566f0840c39c81504666421018 Mon Sep 17 00:00:00 2001 | ||
From 9bd8c11ad95aa326f6ef1a1dc0abaad172b058be Mon Sep 17 00:00:00 2001 | ||
From: Garrett Brown <[email protected]> | ||
Date: Thu, 18 Jul 2024 13:21:31 -0700 | ||
Subject: [PATCH 3/3] Split libdeps.a into separate archives per dependency | ||
|
||
--- | ||
backends/platform/libretro/Makefile | 124 +++++++++++++++++++-- | ||
backends/platform/libretro/dependencies.mk | 50 ++++++--- | ||
2 files changed, 147 insertions(+), 27 deletions(-) | ||
backends/platform/libretro/Makefile | 111 +++++++++++++++++++-- | ||
backends/platform/libretro/dependencies.mk | 50 ++++++---- | ||
2 files changed, 134 insertions(+), 27 deletions(-) | ||
|
||
diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile | ||
index bb3b8ca94f9..13b2225f625 100644 | ||
index bb3b8ca94f9..121621240a2 100644 | ||
--- a/backends/platform/libretro/Makefile | ||
+++ b/backends/platform/libretro/Makefile | ||
@@ -585,32 +585,138 @@ else | ||
@@ -585,32 +585,125 @@ else | ||
endif | ||
endif | ||
|
||
|
@@ -23,102 +23,89 @@ index bb3b8ca94f9..13b2225f625 100644 | |
+libdeps_libretro_common.a: $(OBJS_DEPS_LIBRETRO_COMMON) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES = libdeps_libretro_common.a | ||
+ | ||
+ifeq ($(USE_FLUIDSYNTH), 1) | ||
+libdeps_fluidsynth.a: $(OBJS_DEPS_FLUIDSYNTH) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES += libdeps_fluidsynth.a | ||
+endif | ||
+ | ||
+ifeq ($(USE_FLAC), 1) | ||
+libdeps_libflac.a: $(OBJS_DEPS_LIBFLAC) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES += libdeps_libflac.a | ||
+endif | ||
+ | ||
+ifeq ($(USE_VORBIS), 1) | ||
+libdeps_libvorbis.a: $(OBJS_DEPS_LIBVORBIS) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES += libdeps_libvorbis.a | ||
+endif | ||
+ | ||
+ifeq ($(USE_TREMOR), 1) | ||
+libdeps_tremor.a: $(OBJS_DEPS_TREMOR) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES += libdeps_tremor.a | ||
+endif | ||
+ | ||
+ifeq ($(USE_ZLIB), 1) | ||
+libdeps_libz.a: $(OBJS_DEPS_LIBZ) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES += libdeps_libz.a | ||
+endif | ||
+ | ||
+ifeq ($(USE_MAD), 1) | ||
+libdeps_libmad.a: $(OBJS_DEPS_LIBMAD) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES += libdeps_libmad.a | ||
+endif | ||
+ | ||
+ifeq ($(USE_FAAD), 1) | ||
+libdeps_faad.a: $(OBJS_DEPS_FAAD) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES += libdeps_faad.a | ||
+endif | ||
+ | ||
+ifeq ($(USE_PNG), 1) | ||
+libdeps_png.a: $(OBJS_DEPS_PNG) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES += libdeps_png.a | ||
+endif | ||
+ | ||
+ifeq ($(USE_JPEG), 1) | ||
+libdeps_jpeg.a: $(OBJS_DEPS_JPEG) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES += libdeps_jpeg.a | ||
+endif | ||
+ | ||
+ifeq ($(USE_THEORADEC), 1) | ||
+libdeps_theora.a: $(OBJS_DEPS_THEORA) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES += libdeps_theora.a | ||
+endif | ||
+ | ||
+ifeq ($(USE_FREETYPE2), 1) | ||
+libdeps_freetype.a: $(OBJS_DEPS_FREETYPE) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES += libdeps_freetype.a | ||
+endif | ||
+ | ||
+ifeq ($(USE_FRIBIDI), 1) | ||
+libdeps_fribidi.a: $(OBJS_DEPS_FRIBIDI) | ||
+ @echo Linking $@... | ||
+ $(AR) $@ $^ | ||
+ $(RANLIB) $@ | ||
+LIBDEPS_SUBARCHIVES += libdeps_fribidi.a | ||
+endif | ||
+ | ||
|
@@ -159,7 +146,7 @@ index bb3b8ca94f9..13b2225f625 100644 | |
libdetect.a: $(DETECT_OBJS) | ||
@echo Linking $@... | ||
$(HIDE)$(AR) $@ $^ | ||
@@ -635,7 +741,7 @@ libdetect.a: $(DETECT_OBJS) | ||
@@ -635,7 +728,7 @@ libdetect.a: $(DETECT_OBJS) | ||
clean: | ||
@echo Cleaning project... | ||
$(HIDE)$(RM_REC) $(DEPDIRS) $(DEPS_PATH) | ||
|