From df8f792cc30c5226dc9f0356dc2bca771bd58d21 Mon Sep 17 00:00:00 2001 From: Mark Kim Date: Sat, 19 Oct 2024 10:51:24 -0400 Subject: [PATCH] macOS build to link against SDL2_gfx --- Makefile | 4 ++-- docs/CHANGES.txt | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 671282fd0..8a69bbf58 100644 --- a/Makefile +++ b/Makefile @@ -1465,8 +1465,8 @@ MAGIC_SDL_CPPFLAGS:=$(shell $(PKG_CONFIG) $(SDL_PCNAME) --cflags) # FIXME: Expose SDL_rotozoom to Magic API? -bjk 2021.09.06 windows_MAGIC_SDL_LIBS:=-L/usr/local/lib $(LIBMINGW) $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL2_image -lSDL2_ttf $(SDL_MIXER_LIB) -lSDL2_gfx os2_MAGIC_SDL_LIBS:=-L/@unixroot/usr/lib $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL2_image -lSDL2_ttf $(SDL_MIXER_LIB) -macos_MAGIC_SDL_LIBS:=-L/usr/local/lib $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL2_image -lSDL2_ttf $(SDL_MIXER_LIB) -ios_MAGIC_SDL_LIBS:=$(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL2_image -lSDL2_ttf $(SDL_MIXER_LIB) +macos_MAGIC_SDL_LIBS:=-L/usr/local/lib $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL2_image -lSDL2_ttf $(SDL_MIXER_LIB) -lSDL2_gfx +ios_MAGIC_SDL_LIBS:=$(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL2_image -lSDL2_ttf $(SDL_MIXER_LIB) -lSDL2_gfx beos_MAGIC_SDL_LIBS:=-L/usr/local/lib $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL2_image -lSDL2_ttf $(SDL_MIXER_LIB) linux_MAGIC_SDL_LIBS:=-L/usr/local/lib $(shell $(PKG_CONFIG) $(SDL_PCNAME) --libs) -lSDL2_image -lSDL2_ttf $(SDL_MIXER_LIB) MAGIC_SDL_LIBS:=$($(OS)_MAGIC_SDL_LIBS) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 4faf82636..6b4b8a71a 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -6,7 +6,7 @@ Copyright (c) 2002-2024 Various contributors (see below, and AUTHORS.txt) https://tuxpaint.org/ -2024.October.14 (0.9.34) +2024.October.19 (0.9.34) * New Magic Tools: ---------------- * "Comic Dots", draws repeating dots (using a multiply blend) @@ -213,6 +213,14 @@ https://tuxpaint.org/ transparent areas (e.g., soft edges would be black halos). Mended. Bill Kendrick + * Other Improvements: + ------------------- + * The macOS build now links against SDL2_gfx. Previously SDL2_gfx was + required to install SDL2_image but Tux Paint did not require linking + against it. The transaparent rotation feature added to 0.9.34 requires + linking against SDL2_gfx. + Mark Kim + 2024.July.17 (0.9.33) * New Magic Tools: ----------------