# HG changeset patch # User Matti Hamalainen # Date 1574745755 -7200 # Node ID d0cd281934a3a4df167131adf1654ef6730285f2 # Parent c0b85b0615d2e16ee888c062293a6fc822bc2062 Add TOOL_LDFLAGS. diff -r c0b85b0615d2 -r d0cd281934a3 Makefile --- a/Makefile Tue Nov 26 07:17:49 2019 +0200 +++ b/Makefile Tue Nov 26 07:22:35 2019 +0200 @@ -6,4 +6,6 @@ GL_CFLAGS ?= $(shell pkg-config --cflags gl glu) GL_LDFLAGS ?= $(shell pkg-config --libs gl glu) +TOOL_LDFLAGS ?= + include Makefile.gen diff -r c0b85b0615d2 -r d0cd281934a3 Makefile.gen --- a/Makefile.gen Tue Nov 26 07:17:49 2019 +0200 +++ b/Makefile.gen Tue Nov 26 07:22:35 2019 +0200 @@ -17,7 +17,7 @@ $(CXX) -o $@ $+ $(LDFLAGS) $(SDL_LDFLAGS) $(GL_LDFLAGS) ply2bin$(BINEXT): ply2bin.o dmmodel.o dmutil.o - $(CXX) -o $@ $+ $(LDFLAGS) + $(CXX) -o $@ $+ $(LDFLAGS) $(TOOL_LDFLAGS) clean: $(RM) $(TARGETS) *.o diff -r c0b85b0615d2 -r d0cd281934a3 ply2bin.cpp --- a/ply2bin.cpp Tue Nov 26 07:17:49 2019 +0200 +++ b/ply2bin.cpp Tue Nov 26 07:22:35 2019 +0200 @@ -6,6 +6,11 @@ // See file "COPYING" for license information. // #include + +// Get rid of the SDL_main mess for some commandline tools +#define _SDL_main_h +#define SDL_main main + #include "dmutil.h" #include "dmmodel.h"