changeset 35:d0cd281934a3

Add TOOL_LDFLAGS.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 26 Nov 2019 07:22:35 +0200
parents c0b85b0615d2
children d640f2a34031
files Makefile Makefile.gen ply2bin.cpp
diffstat 3 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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 <SDL.h>
+
+// 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"