From 063bfbc71caa91742d7f25162cc87a2e2d13ae0c Mon Sep 17 00:00:00 2001 From: Clownacy Date: Wed, 20 Feb 2019 16:13:00 +0000 Subject: [PATCH] Fixed some static-related stupidity in the Makefile --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bc694929..fd8d7d21 100644 --- a/Makefile +++ b/Makefile @@ -35,14 +35,16 @@ ifeq ($(WINDOWS), 1) endif CXXFLAGS += -std=c++98 `sdl2-config --cflags` `pkg-config freetype2 --cflags` -MMD -MP -MF $@.d -LIBS += `sdl2-config --static-libs` `pkg-config freetype2 --libs` +LIBS += `pkg-config freetype2 --libs` ifeq ($(STATIC), 1) - CXXFLAGS += -static + CXXFLAGS += `sdl2-config --static-libs` -static LIBS += -lharfbuzz -lfreetype -lbz2 -lpng -lz -lgraphite2 ifeq ($(WINDOWS), 1) LIBS += -lRpcrt4 -lDwrite -lusp10 endif +else + CXXFLAGS += `sdl2-config --libs` endif # For an accurate result to the original's code, compile in alphabetical order