From ee1121ce969248d701fea7ffe79bc6f686610ce7 Mon Sep 17 00:00:00 2001 From: Fabio Maciel Date: Sat, 30 May 2020 22:05:06 +0200 Subject: Create simple red rect controlled by arrow keys Signed-off-by: Fabio Maciel Co-authored-by: Johnny Richard --- Makefile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Makefile (limited to 'Makefile') diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..5d398f2 --- /dev/null +++ b/Makefile @@ -0,0 +1,20 @@ +.PHONY: build clean run + +CFLAGS := -Wall + +ifeq ($(OS),Windows_NT) + CC := gcc + CFLAGS += -lmingw32 -lSDL2main -lSDL2 \ + -IG:\dev\mingw\include\SDL2 +else + CFLAGS += -Wall $(shell pkg-config sdl2 --cflags --libs) +endif + +build: + $(CC) src/main.c -o main $(CFLAGS) + +clean: + rm ./game; + +run: + ./game; -- cgit v1.2.3 From 9a285cc3bdb8d5870fea5f07235a3e44786a0317 Mon Sep 17 00:00:00 2001 From: Johnny Richard Date: Tue, 13 Apr 2021 02:23:22 +0200 Subject: Add controller to its own header file Signed-off-by: Johnny Richard --- Makefile | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5d398f2..68d2425 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ -.PHONY: build clean run +TARGET ?= blast_attack +SOURCE_DIR ?= ./src +BUILD_DIR ?= ./build CFLAGS := -Wall +OBJS := $(BUILD_DIR)/main.o ifeq ($(OS),Windows_NT) CC := gcc @@ -10,11 +13,22 @@ else CFLAGS += -Wall $(shell pkg-config sdl2 --cflags --libs) endif -build: - $(CC) src/main.c -o main $(CFLAGS) +.PHONY: build clean run $(TARGET) + +all: $(TARGET) + +$(TARGET): $(BUILD_DIR) $(OBJS) + $(CC) $(OBJS) -o $(TARGET) $(CFLAGS) + +$(BUILD_DIR): + @mkdir -p $@ + +$(BUILD_DIR)/%.o: $(SOURCE_DIR)/%.c + $(CC) $(CFLAGS) -c $< -o $@ clean: - rm ./game; + @rm -rf $(OBJS) + @rm $(TARGET) run: - ./game; + ./$(TARGET) -- cgit v1.2.3 From d8336885a4c053544fe3491335da0f76afffdfb9 Mon Sep 17 00:00:00 2001 From: Johnny Richard Date: Tue, 13 Apr 2021 02:53:13 +0200 Subject: Move controller update to a new update function Signed-off-by: Johnny Richard --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 68d2425..6c615f3 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ SOURCE_DIR ?= ./src BUILD_DIR ?= ./build CFLAGS := -Wall -OBJS := $(BUILD_DIR)/main.o +OBJS := $(BUILD_DIR)/main.o \ + $(BUILD_DIR)/controller.o ifeq ($(OS),Windows_NT) CC := gcc -- cgit v1.2.3 From 1f9826faefa2b1a1bddac3f3413a6d6055ee49bf Mon Sep 17 00:00:00 2001 From: Johnny Richard Date: Sat, 17 Apr 2021 01:27:27 +0200 Subject: Add microunit test framework Signed-off-by: Johnny Richard --- Makefile | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6c615f3..2433900 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,25 @@ -TARGET ?= blast_attack -SOURCE_DIR ?= ./src -BUILD_DIR ?= ./build - -CFLAGS := -Wall -OBJS := $(BUILD_DIR)/main.o \ - $(BUILD_DIR)/controller.o +TARGET ?= blast_attack +SOURCE_DIR ?= ./src +TEST_DIR ?= ./test +LIB_DIR ?= ./lib +BUILD_DIR ?= ./build + +CFLAGS := -Wall +CFLAGS_TEST := -Isrc -Ithird_party -Llib -lmunit +SRCS := $(wildcard $(SOURCE_DIR)/*.c) +SRCS_TEST := $(wildcard $(TEST_DIR)/*.c) +OBJS := $(patsubst $(SOURCE_DIR)/%.c, $(BUILD_DIR)/%.o, $(SRCS)) +TESTS := $(patsubst $(TEST_DIR)/%-test.c, $(TEST_DIR)/%, $(SRCS_TEST)) ifeq ($(OS),Windows_NT) CC := gcc CFLAGS += -lmingw32 -lSDL2main -lSDL2 \ -IG:\dev\mingw\include\SDL2 else - CFLAGS += -Wall $(shell pkg-config sdl2 --cflags --libs) + CFLAGS += $(shell pkg-config sdl2 --cflags --libs) endif -.PHONY: build clean run $(TARGET) +.PHONY: build clean run test $(TARGET) all: $(TARGET) @@ -24,12 +29,27 @@ $(TARGET): $(BUILD_DIR) $(OBJS) $(BUILD_DIR): @mkdir -p $@ +$(LIB_DIR): + @mkdir -p $@ + $(BUILD_DIR)/%.o: $(SOURCE_DIR)/%.c $(CC) $(CFLAGS) -c $< -o $@ +$(TEST_DIR)/%-test: $(BUILD_DIR)/%.o $(TEST_DIR)/%-test.c + $(CC) $(CFLAGS) $(CFLAGS_TEST) $? -o $@ + +$(TEST_DIR)/%: $(TEST_DIR)/%-test + ./$@-test + +test: lib/libmunit.so $(BUILD_DIR) $(TESTS) + +lib/libmunit.so: $(LIB_DIR) third_party/munit/munit.c + $(CC) -Wall -Werror -fpic -c third_party/munit/munit.c -shared -o lib/libmunit.so + clean: - @rm -rf $(OBJS) + @rm -rf $(BUILD_DIR) + @rm -rf $(LIB_DIR) @rm $(TARGET) -run: +run: all ./$(TARGET) -- cgit v1.2.3 From e415b62a2e85f44e6ff285e08b16525605d2fc0f Mon Sep 17 00:00:00 2001 From: Johnny Richard Date: Sun, 14 Nov 2021 01:27:15 +0100 Subject: controller_t: Reduce memory usage using bitwise --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2433900..2a46725 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ $(TEST_DIR)/%: $(TEST_DIR)/%-test test: lib/libmunit.so $(BUILD_DIR) $(TESTS) lib/libmunit.so: $(LIB_DIR) third_party/munit/munit.c - $(CC) -Wall -Werror -fpic -c third_party/munit/munit.c -shared -o lib/libmunit.so + $(CC) -Wall -fpic -c third_party/munit/munit.c -shared -o lib/libmunit.so clean: @rm -rf $(BUILD_DIR) -- cgit v1.2.3 From 4c8eb3e8ce0616c377f8e31eeb658fb01807e4b5 Mon Sep 17 00:00:00 2001 From: Johnny Richard Date: Wed, 20 Apr 2022 01:59:30 +0200 Subject: main: Start using renderer and set 60 fps --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2a46725..208cc9f 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,8 @@ TEST_DIR ?= ./test LIB_DIR ?= ./lib BUILD_DIR ?= ./build -CFLAGS := -Wall -CFLAGS_TEST := -Isrc -Ithird_party -Llib -lmunit +CFLAGS := -Wall -lm +CFLAGS_TEST := -Isrc -Ithird_party -Llib -lmunit SRCS := $(wildcard $(SOURCE_DIR)/*.c) SRCS_TEST := $(wildcard $(TEST_DIR)/*.c) OBJS := $(patsubst $(SOURCE_DIR)/%.c, $(BUILD_DIR)/%.o, $(SRCS)) -- cgit v1.2.3