--- a/rltiles/Makefile 2021-08-02 14:03:40.106930544 -0500 +++ b/rltiles/Makefile 2021-08-02 14:03:51.145931133 -0500 @@ -1,7 +1,7 @@ uname_S := $(shell uname -s) ifneq (,$(findstring MINGW,$(uname_S))) -LDFLAGS += -lmingw32 +LIBS += -lmingw32 endif # Note: since generation of tiles is done on the host, we don't care about @@ -29,7 +29,7 @@ endif CFLAGS += $(PNG_INCLUDE) - LDFLAGS += $(PNG_LIB) + LIBS += $(PNG_LIB) CFLAGS += -DUSE_TILE endif @@ -39,26 +39,15 @@ endif ifneq (,$(findstring MINGW,$(uname_S))) -LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid +LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid endif ifeq ($(uname_S),Darwin) -LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL +LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL endif ifeq ($(uname_S),Linux) -LDFLAGS += -ldl -lpthread +LIBS += -ldl -lpthread endif -# Attempt to use a full compiler name, to make -# distcc builds work nicely. -LMACH := $(shell gcc -dumpmachine)- -ifeq ($(LMACH),-) -LMACH := -endif -ifeq ($(shell which $(LMACH)gcc > /dev/null 2> /dev/null && echo "Yes"),) -LMACH := -endif -HOSTCXX ?= $(LMACH)g++ - DELETE = rm -f TOOLDIR := tool @@ -134,6 +123,6 @@ $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@ $(TILEGEN): $(OBJECTS) - $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) + $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS) .PHONY: all clean distclean