From cbc64c8fee65665e9fb6ede44f4fe49da086363a Mon Sep 17 00:00:00 2001 From: Gregory Marco Date: Thu, 3 Oct 2024 00:21:47 -0500 Subject: [PATCH] rename drone.yml to woodpecker.yml --- .drone.yml => .woodpecker.yml | 22 ++++++------- Makefile | 60 +++++++++++++++++------------------ 2 files changed, 41 insertions(+), 41 deletions(-) rename .drone.yml => .woodpecker.yml (96%) diff --git a/.drone.yml b/.woodpecker.yml similarity index 96% rename from .drone.yml rename to .woodpecker.yml index 1947524..ebea063 100644 --- a/.drone.yml +++ b/.woodpecker.yml @@ -1,11 +1,11 @@ -pipeline: - build-environment: - image: docker - commands: - - cat Dockerfile | docker build -t nukage-ci - - volumes: - - /var/run/docker.sock:/var/run/docker.sock - build-engine: - image: nukage-ci - commands: - - make engine/build/gzdoom +pipeline: + build-environment: + image: docker + commands: + - cat Dockerfile | docker build -t nukage-ci - + volumes: + - /var/run/docker.sock:/var/run/docker.sock + build-engine: + image: nukage-ci + commands: + - make engine/build/gzdoom diff --git a/Makefile b/Makefile index c39a39e..3e3cb5b 100644 --- a/Makefile +++ b/Makefile @@ -1,30 +1,30 @@ -RUN_ENGINE?=engine/build/gzdoom -BUILD_ENGINE=$(RUN_ENGINE) -RM=rm -rf - -ifeq ($(OS),Windows_NT) - RUN_ENGINE=gzdoom - BUILD_ENGINE="" - RM=del -endif - -all: $(BUILD_ENGINE) - -clean: clean-zmusic clean-engine - -# GZDoom engine build. Only relevant for GNU/Linux -clean-zmusic: - $(MAKE) -C ZMusic/build clean - $(RM) ZMusic/build - -clean-engine: - $(MAKE) -C engine/build clean - $(RM) engine/build - -ZMusic/build: - cd ZMusic && mkdir -p build && cd build && cmake .. - $(MAKE) -C ZMusic/build - -engine/build/gzdoom: ZMusic/build - cd engine && mkdir -p build && cd build && cmake --verbose=1 -DZMUSIC_LIBRARIES=../../ZMusic/build/source/libzmusic.so -DZMUSIC_INCLUDE_DIR=../../ZMusic/include .. - $(MAKE) -C engine/build +RUN_ENGINE?=engine/build/gzdoom +BUILD_ENGINE=$(RUN_ENGINE) +RM=rm -rf + +ifeq ($(OS),Windows_NT) + RUN_ENGINE=gzdoom + BUILD_ENGINE="" + RM=del +endif + +all: $(BUILD_ENGINE) + +clean: clean-zmusic clean-engine + +# GZDoom engine build. Only relevant for GNU/Linux +clean-zmusic: + $(MAKE) -C ZMusic/build clean + $(RM) ZMusic/build + +clean-engine: + $(MAKE) -C engine/build clean + $(RM) engine/build + +ZMusic/build: + cd ZMusic && mkdir -p build && cd build && cmake .. + $(MAKE) -C ZMusic/build + +engine/build/gzdoom: ZMusic/build + cd engine && mkdir -p build && cd build && cmake --verbose=1 -DZMUSIC_LIBRARIES=../../ZMusic/build/source/libzmusic.so -DZMUSIC_INCLUDE_DIR=../../ZMusic/include .. + $(MAKE) -C engine/build