github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 22:33:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove some platform specific libs

Browse source
This commit is contained in:
David Chavez 2022-05-30 17:00:53 +02:00
commit 686e5b3824
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ZAPDTR/Makefile
View file

@ -45,13 +45,13 @@ ifneq ($(DEPRECATION_ON),0)
endif endif
# CXXFLAGS += -DTEXTURE_DEBUG # CXXFLAGS += -DTEXTURE_DEBUG
LDFLAGS := -lm -ldl -lpng \ LDFLAGS := -lm -ldl \
-L../external -L../libultraship -lz -lbz2 -pthread -lpulse -lultraship -lstorm -lSDL2 -lGLEW -lX11 -L../external -L../libultraship -lbz2 -pthread -lpulse -lultraship -lstorm
ifeq ($(UNAME), Darwin) ifeq ($(UNAME), Darwin)
LDFLAGS += $(shell pkg-config --libs glew x11 libpng) $(shell sdl2-config --libs) -framework OpenGL LDFLAGS += $(shell pkg-config --libs glew x11 libpng) $(shell sdl2-config --libs) -framework OpenGL
else else
LDFLAGS += -lGL LDFLAGS += -lpng -lGL -lGLEW -lX11 -lz -lSDL2
endif endif
# Use LLD if available. Set LLD=0 to not use it # Use LLD if available. Set LLD=0 to not use it

2
soh/Makefile
View file

@ -106,7 +106,6 @@ endif
LDLIBS := \ LDLIBS := \
$(ZAPDUTILS) \ $(ZAPDUTILS) \
$(addprefix -l, \ $(addprefix -l, \
X11 \
dl \ dl \
bz2 \ bz2 \
z \ z \
@ -119,6 +118,7 @@ LDLIBS := \
ifeq ($(UNAME), Linux) #LINUX ifeq ($(UNAME), Linux) #LINUX
LDLIBS += \ LDLIBS += \
$(addprefix -l, \ $(addprefix -l, \
X11 \
GL \ GL \
pulse \ pulse \
) )