From b73fb9dcdb57014b36a6b9f4e2f0405b6e7fe348 Mon Sep 17 00:00:00 2001 From: Mark Kim Date: Sun, 21 Mar 2021 23:09:32 -0400 Subject: [PATCH] Lazy resolution of iphone*_ARCH_LINKS Early resolution of iphone*_ARCH_LINKS calls pkg-config even when compiling for non-ios platforms, slowing down compilation unnecessarily and possibly raise errors about nonexisting libraries that are not used. This change modifies the iphone*_ARCH_LINKS to resolve lazily upon use so pkg-config is not called unless the variables are used. --- Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Makefile b/Makefile index 6566f17d4..96d103c57 100644 --- a/Makefile +++ b/Makefile @@ -1354,6 +1354,7 @@ obj: ###### MAGIC_SDL_CPPFLAGS:=$(shell $(PKG_CONFIG) $(SDL_PCNAME) --cflags) +<<<<<<< HEAD MAGIC_SDL_LIBS:=$(LIBMINGW) $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL_image -lSDL_ttf $(SDL_MIXER_LIB) windows_MAGIC_ARCH_LINKS=-lintl $(PNG) macos_MAGIC_ARCH_LINKS=-lintl $(PNG) @@ -1362,6 +1363,17 @@ iphonesimulator_MAGIC_ARCH_LINKS=-lintl -ljpeg $(PNG) $(shell $(PKG_CONFIG) --li beos_MAGIC_ARCH_LINKS=-lintl $(PNG) linux_MAGIC_ARCH_LINKS=-lintl $(PNG) MAGIC_ARCH_LINKS=$($(OS)_MAGIC_ARCH_LINKS) +======= +MAGIC_SDL_LIBS:=$(LIBMINGW) $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL2_image -lSDL2_ttf $(SDL_MIXER_LIB) +windows_MAGIC_ARCH_LINKS:=-lintl $(PNG) +macos_MAGIC_ARCH_LINKS:=-lintl $(PNG) +iphoneos_MAGIC_ARCH_LINKS=-lintl -ljpeg $(PNG) $(shell $(PKG_CONFIG) --libs libtiff-4 libwebp libmpg123 ogg vorbisenc vorbisidec) +iphonesimulator_MAGIC_ARCH_LINKS=-lintl -ljpeg $(PNG) $(shell $(PKG_CONFIG) --libs libtiff-4 libwebp libmpg123 ogg vorbisenc vorbisidec) +beos_MAGIC_ARCH_LINKS:=-lintl $(PNG) +linux_MAGIC_ARCH_LINKS:=-lintl $(PNG) +MAGIC_ARCH_LINKS:=$($(OS)_MAGIC_ARCH_LINKS) + +>>>>>>> b05f75f1 (Lazy resolution of iphone*_ARCH_LINKS) windows_PLUGIN_LIBS:=$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS) macos_PLUGIN_LIBS:=$(MAGIC_SDL_LIBS) $(MAGIC_ARCH_LINKS)