From d1a33b5ddf55cf814c1c697d47c59451f7121eab Mon Sep 17 00:00:00 2001 From: Arthur O'Dwyer Date: Mon, 19 Oct 2020 12:46:06 -0400 Subject: [PATCH] Use pkg-config in Makefile.simple. Let's see if TravisCI is happy with this. Addresses, but does not fully resolve, #135. --- Makefile.simple | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.simple b/Makefile.simple index dc5b843ce..dc15da1c4 100644 --- a/Makefile.simple +++ b/Makefile.simple @@ -48,7 +48,7 @@ ifeq (${OS},linux) LDFLAGS_GL := -lGL LDFLAGS_GLEW := -lGLEW LDFLAGS_PNG := -lpng - LDFLAGS_SDL := -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz + LDFLAGS_SDL := $(shell pkg-config --libs sdl SDL_gfx SDL_mixer SDL_ttf) -pthread -lz OBJ_EXTENSION := .o hyper_RES := endif @@ -74,7 +74,7 @@ ifeq (${OS},osx) LDFLAGS_GL := -framework AppKit -framework OpenGL LDFLAGS_GLEW := -lGLEW LDFLAGS_PNG := -lpng - LDFLAGS_SDL := -lSDL -lSDLMain -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz + LDFLAGS_SDL := $(shell pkg-config --libs sdl SDL_gfx SDL_mixer SDL_ttf) -pthread -lz OBJ_EXTENSION := .o hyper_RES := endif