From fd680514af05ea1f5b169d1ac51a766668812ab6 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Sat, 4 Oct 2025 23:42:19 +0000 Subject: [PATCH] fix git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@175 b9cfdab3-6d41-4d17-bbe4-086880011989 --- GNUmakefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 54e74db..2b53b91 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -72,16 +72,18 @@ GL = -lGL -lGLU E_LIBS += -lm +LIB = lib SO = .so EXEC = else ifeq ($(WINDOWS),1) L_CFLAGS += -DUSE_GDI -L_LDFLAGS += -Wl,--out-implib,src/libMw.lib -static-libgcc +L_LDFLAGS += -Wl,--out-implib,src/libMw.a -static-libgcc L_OBJS += src/backend/gdi.o L_LIBS += -lgdi32 GL = -lopengl32 -lglu32 +LIB = SO = .dll EXEC = .exe endif @@ -101,20 +103,20 @@ endif .PHONY: all format clean lib examples all: lib examples -lib: src/libMw$(SO) +lib: src/$(LIB)Mw$(SO) examples: $(EXAMPLES) format: clang-format --verbose -i `find src include examples tools "(" -name "*.c" -or -name "*.h" ")" -and -not -name "stb_*.h"` perltidy -b -bext='/' --paren-tightness=2 `find tools -name "*.pl"` -src/libMw$(SO): $(L_OBJS) +src/$(LIB)Mw$(SO): $(L_OBJS) $(CC) $(L_LDFLAGS) -shared -o $@ $^ $(L_LIBS) -examples/gl%$(EXEC): examples/gl%.o src/libMw$(SO) +examples/gl%$(EXEC): examples/gl%.o src/$(LIB)Mw$(SO) $(CC) $(E_LDFLAGS) -o $@ $< $(E_LIBS) $(GL) -examples/%$(EXEC): examples/%.o src/libMw$(SO) +examples/%$(EXEC): examples/%.o src/$(LIB)Mw$(SO) $(CC) $(E_LDFLAGS) -o $@ $< $(E_LIBS) src/%.o: src/%.c @@ -124,4 +126,4 @@ examples/%.o: examples/%.c $(CC) $(E_CFLAGS) -c -o $@ $< clean: - rm -f src/*.dll src/*.so src/*.a src/*.lib */*.o */*/*.o examples/*.exe $(EXAMPLES) examples/opengl examples/vulkan + rm -f src/*.dll src/*.so src/*.a */*.o */*/*.o examples/*.exe $(EXAMPLES) examples/opengl examples/vulkan