From 5ecd8885556cdfc07d2bccaede45f86e329da637 Mon Sep 17 00:00:00 2001 From: Oxore Date: Thu, 3 Jan 2019 22:45:18 +0300 Subject: Move unicode module to separate library lib8 --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 967c46c..2a21d7d 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ QQ=@ TARGET_TETRIS:=tetris TARGET_TEST:=test MUNIT:=deps/munit +LIBF8:=deps/libf8 ifeq ($(wildcard $(MUNIT)/*),) NOTEST=1 @@ -21,6 +22,7 @@ INCLUDE+=$(PREFIX)/include endif INCLUDE+=include INCLUDE+=$(MUNIT) +INCLUDE+=$(LIBF8) INCLUDE:=$(INCLUDE:%=-I%) #COMMON+=-fsanitize=address @@ -46,6 +48,8 @@ endif LDFLAGS+=$(COMMON) LDFLAGS_TETRIS+=$(LDFLAGS) +LDFLAGS_TETRIS+=-L$(LIBF8) +LDFLAGS_TETRIS+=-l:libf8.a LDFLAGS_TETRIS+=-lcsfml-graphics LDFLAGS_TETRIS+=-lcsfml-window LDFLAGS_TETRIS+=-lcsfml-system @@ -62,11 +66,11 @@ ifndef NOTEST all: $(TARGET_TEST) endif -$(TARGET_TETRIS): $(OBJECTS) $(TARGET)/$(TARGET_TETRIS).c.o +$(TARGET_TETRIS): $(OBJECTS) $(TARGET)/$(TARGET_TETRIS).c.o $(LIBF8)/libf8.a $(QQ) echo " LD $@" $(Q) $(CC) -o $@ $^ $(LDFLAGS_TETRIS) -$(TARGET_TEST): $(TARGET)/$(TARGET_TEST).c.o $(MUNIT)/munit.c.o $(BUILD)/unicode.c.o +$(TARGET_TEST): $(TARGET)/$(TARGET_TEST).c.o $(MUNIT)/munit.c.o $(QQ) echo " LD $@" $(Q) $(CC) -o $@ $^ $(LDFLAGS_TEST) @@ -79,6 +83,9 @@ $(BUILD): $(TARGET): $(Q) mkdir -p $@ +$(LIBF8)/libf8.a: $(LIBF8) + make -C $< + $(MUNIT)/munit.c.o: $(MUNIT)/munit.c $(QQ) echo " CC $@" $(Q) $(CC) -c $(CFLAGS) -o $@ $< -- cgit v1.2.3