From 85d5f4f019f4793eec2f5e6b7459c68b22f2e635 Mon Sep 17 00:00:00 2001 From: mid <> Date: Sat, 10 May 2025 19:13:01 +0300 Subject: [PATCH] Makefile changes --- Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 28b56ce..1a5b913 100644 --- a/Makefile +++ b/Makefile @@ -1,24 +1,26 @@ -k4_SRCS := $(wildcard src/*.c) -k4_HDRS := $(wildcard src/*.h) +rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d)) + +k4_SRCS := $(call rwildcard,src,*.c) +k4_HDRS := $(call rwildcard,src,*.h) k4_OBJS := $(patsubst src/%.c, build/%.o, $(k4_SRCS)) k4_DEPS := $(patsubst src/%.c, build/%.d, $(k4_SRCS)) -k3_SRCS = $(wildcard k3/src/*.c) -k3_HDRS = $(wildcard k3/src/*.h) +k3_SRCS := $(call rwildcard,k3/src,*.c) +k3_HDRS := $(call rwildcard,k3/src,*.h) k3_OBJS := $(patsubst k3/src/%.c, build/k3/%.o, $(k3_SRCS)) k3_DEPS := $(patsubst k3/src/%.c, build/k3/%.d, $(k3_SRCS)) -CFLAGS := $(CFLAGS) -Ik3/src +CFLAGS := $(CFLAGS) -Ik3/src -O2 -fopenmp ifneq (,$(findstring mingw,$(CC))) - CFLAGS := -static-libgcc -static-libstdc++ -std=gnu99 -march=pentium4 -D_WIN32_WINNT=0x600 -DENET_FEATURE_ADDRESS_MAPPING -fno-pic -no-pie -fms-extensions -fno-pie -O0 -g -gdwarf-2 -Isrc $(CFLAGS) + CFLAGS := -static-libgcc -static-libstdc++ -std=gnu99 -march=pentium4 -D_WIN32_WINNT=0x600 -DENET_FEATURE_ADDRESS_MAPPING -fno-pic -no-pie -fms-extensions -fno-pie -Isrc $(CFLAGS) LIBS := -l:libglfw3.a -lopengl32 -pthread -lm -l:libode.a -l:libvorbisfile.a -l:libvorbis.a -l:libogg.a -lportaudio -lgdi32 -lws2_32 -lwinmm -lstdc++ -lole32 -lsetupapi -lhid -l:liblua5.3.a $(LIBS) else - CFLAGS := -march=opteron $(SAN) -std=gnu99 -DENET_FEATURE_ADDRESS_MAPPING -fms-extensions -fno-pic -no-pie -fno-pie -O0 -g -Isrc $(CFLAGS) + CFLAGS := -march=opteron $(SAN) -std=gnu99 -DENET_FEATURE_ADDRESS_MAPPING -fms-extensions -fno-pic -no-pie -fno-pie -Isrc $(CFLAGS) LIBS := -lglfw3 -pthread -ldl -lm -lode -lstdc++ -llua5.3 -lvorbis -lvorbisfile -lportaudio $(LIBS) endif -CFLAGS := $(CFLAGS) -DLOCALHOST_ONLY -Dk3_IRREGULAR_SHADOWS +CFLAGS := $(CFLAGS) -DLOCALHOST_ONLY build/k3/%.o: k3/src/%.c $(CC) $(CFLAGS) -MMD -o $@ -c $<