From c34d4d99627afeb13860bafdfdd04f977becddab Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Tue, 10 Mar 2026 06:59:29 +0900 Subject: [PATCH] fix makefile --- Jenkinsfile | 2 +- Makefile | 14 ++++++++------ Makefile.watcom | 5 +---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9652c72..4c72ece 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,7 @@ pipeline { steps { sh("git submodule update --init --recursive --force") sh("make clean") - sh("make -j4 -f Makefile.watcom") + sh("make -j4 TARGET=watcom") sh("mv taiga.exe taiga-win32.exe") archiveArtifacts("taiga-win32.exe") } diff --git a/Makefile b/Makefile index 5d6b0f3..1fdc5be 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,12 @@ -CC ?= cc -CFLAGS ?= -I external/xemil/include -I external/md4c/src -I external/stb -I src $(DEFS) -LDFLAGS ?= -LIBS ?= -AFTER ?= +CC = cc +CFLAGS = -I external/xemil/include -I external/md4c/src -I external/stb -I src $(DEFS) +LDFLAGS = +LIBS = +AFTER = -E ?= +E = + +-include Makefile.$(TARGET) .PHONY: all format clean diff --git a/Makefile.watcom b/Makefile.watcom index 8b76ae1..951a56a 100644 --- a/Makefile.watcom +++ b/Makefile.watcom @@ -1,7 +1,4 @@ CC = owcc -bnt -DEFS = -DSTBI_NO_SIMD +DEFS += -DSTBI_NO_SIMD E = .exe AFTER = wrc -q -bt=nt src/taiga.rc taiga.exe -LIBS = - -include Makefile