From 84406bc5fca2a0ade8657b1fc7548f742ad9209a Mon Sep 17 00:00:00 2001 From: Gregory Marco Date: Mon, 25 Mar 2024 18:53:40 -0500 Subject: [PATCH] Split out nukage engine build into separate project for if/when we want to actually use it. --- .drone.yml | 11 +++++++++++ .gitmodules | 6 ++++++ Makefile | 30 ++++++++++++++++++++++++++++++ ZMusic | 1 + engine | 1 + 5 files changed, 49 insertions(+) create mode 100644 .drone.yml create mode 100644 .gitmodules create mode 100644 Makefile create mode 160000 ZMusic create mode 160000 engine diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..1947524 --- /dev/null +++ b/.drone.yml @@ -0,0 +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 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..5bf4360 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "engine"] + path = engine + url = https://github.com/coelckers/gzdoom +[submodule "ZMusic"] + path = ZMusic + url = https://github.com/coelckers/ZMusic diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c39a39e --- /dev/null +++ b/Makefile @@ -0,0 +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 diff --git a/ZMusic b/ZMusic new file mode 160000 index 0000000..7476a18 --- /dev/null +++ b/ZMusic @@ -0,0 +1 @@ +Subproject commit 7476a189755d2665b24a58182640752b82b3a66d diff --git a/engine b/engine new file mode 160000 index 0000000..682dd1b --- /dev/null +++ b/engine @@ -0,0 +1 @@ +Subproject commit 682dd1b22dc9af32496119615eed09f0ee9a3518