Merge pull request #15 from besser82/bugfix/ldflags

small improvement
tiehuis · Mar 30, 2016 · dccd115 · dccd115
2 parents 4520781 + 1e1338f
commit dccd115
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,9 @@
-CC      ?= clang
-CFLAGS  += -Wno-visibility -Wno-incompatible-pointer-types -Wall -Wextra -O2 -DINVERT_COLORS -DVT100 -O2
-LFLAGS  +=
+CC             ?= clang
+TTF_FONT_PATH  ?= res/Anonymous Pro.ttf
+CFLAGS         += -DTTF_FONT_PATH="\"$(TTF_FONT_PATH)\""
+CFLAGS         += -Wno-visibility -Wno-incompatible-pointer-types -Wall -Wextra
+CFLAGS         += -DINVERT_COLORS -DVT100 -O2
+LFLAGS         +=
 
 PROGRAM := 2048
 C_FILES := $(wildcard src/*.c)
@@ -10,13 +13,13 @@ FILTERED_C_FILES := $(filter-out src/gfx%.c src/merge%.c, $(C_FILES))
 all: terminal
 
 curses: $(FILTERED_C_FILES) src/gfx_curses.c
-	$(CC) $(CFLAGS) $(FILTERED_C_FILES) $(MERGE_FILE) src/gfx_curses.c -o $(PROGRAM) -lcurses
+	$(CC) $(CFLAGS) $(FILTERED_C_FILES) $(MERGE_FILE) src/gfx_curses.c -o $(PROGRAM) $(LDFLAGS) -lcurses
 
 terminal: $(FILTERED_C_FILES) src/gfx_terminal.c
-	$(CC) $(CFLAGS) $(FILTERED_C_FILES) $(MERGE_FILE) src/gfx_terminal.c -o $(PROGRAM)
+	$(CC) $(CFLAGS) $(FILTERED_C_FILES) $(MERGE_FILE) src/gfx_terminal.c -o $(PROGRAM) $(LDFLAGS)
 
 sdl: $(FILTERED_C_FILES) src/gfx_sdl.c
-	$(CC) $(CFLAGS) $(FILTERED_C_FILES) $(MERGE_FILE) src/gfx_sdl.c -o $(PROGRAM) $(shell pkg-config --cflags sdl2) -lSDL2 -lSDL2_ttf
+	$(CC) $(CFLAGS) $(FILTERED_C_FILES) $(MERGE_FILE) src/gfx_sdl.c -o $(PROGRAM) $(shell pkg-config --cflags sdl2) $(LDFLAGS) -lSDL2 -lSDL2_ttf
 
 remake: clean all
 

diff --git a/src/gfx_sdl.c b/src/gfx_sdl.c
@@ -5,7 +5,6 @@
 #include "gfx.h"
 
 /* Side length of a 'pixel' in pixels */
-#define TTF_FONT_PATH "res/Anonymous Pro.ttf"
 #define TTF_FONT_PT 32
 
 #define iterate(n, expression)\