tanner/2048-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15 from besser82/bugfix/ldflags

Browse Source 
small improvement
This commit is contained in:
Marc Tiehuis 2016-03-30 20:46:31 +13:00
commit dccd115ca5
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -1,5 +1,8 @@
CC ?= clang CC ?= clang
CFLAGS += -Wno-visibility -Wno-incompatible-pointer-types -Wall -Wextra -O2 -DINVERT_COLORS -DVT100 -O2 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 += LFLAGS +=
PROGRAM := 2048 PROGRAM := 2048
@ -10,13 +13,13 @@ FILTERED_C_FILES := $(filter-out src/gfx%.c src/merge%.c, $(C_FILES))
all: terminal all: terminal
curses: $(FILTERED_C_FILES) src/gfx_curses.c 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 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 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 remake: clean all

1
src/gfx_sdl.c
View File

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