From 686e5b3824bce6b1c3b84af3a76e4b53798a0721 Mon Sep 17 00:00:00 2001 From: David Chavez Date: Mon, 30 May 2022 17:00:53 +0200 Subject: [PATCH] Remove some platform specific libs --- ZAPDTR/Makefile | 6 +++--- soh/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ZAPDTR/Makefile b/ZAPDTR/Makefile index bd3116371..0f0386c5c 100644 --- a/ZAPDTR/Makefile +++ b/ZAPDTR/Makefile @@ -45,13 +45,13 @@ ifneq ($(DEPRECATION_ON),0) endif # CXXFLAGS += -DTEXTURE_DEBUG -LDFLAGS := -lm -ldl -lpng \ - -L../external -L../libultraship -lz -lbz2 -pthread -lpulse -lultraship -lstorm -lSDL2 -lGLEW -lX11 +LDFLAGS := -lm -ldl \ + -L../external -L../libultraship -lbz2 -pthread -lpulse -lultraship -lstorm ifeq ($(UNAME), Darwin) LDFLAGS += $(shell pkg-config --libs glew x11 libpng) $(shell sdl2-config --libs) -framework OpenGL else - LDFLAGS += -lGL + LDFLAGS += -lpng -lGL -lGLEW -lX11 -lz -lSDL2 endif # Use LLD if available. Set LLD=0 to not use it diff --git a/soh/Makefile b/soh/Makefile index 14b799d46..797d2e54d 100644 --- a/soh/Makefile +++ b/soh/Makefile @@ -106,7 +106,6 @@ endif LDLIBS := \ $(ZAPDUTILS) \ $(addprefix -l, \ - X11 \ dl \ bz2 \ z \ @@ -119,6 +118,7 @@ LDLIBS := \ ifeq ($(UNAME), Linux) #LINUX LDLIBS += \ $(addprefix -l, \ + X11 \ GL \ pulse \ )