From 301a0e0ce753d65289e1698695d0f211f495b8fc Mon Sep 17 00:00:00 2001
From: Kevin Trocolli <pitok236@gmail.com>
Date: Sun, 19 Mar 2023 13:29:08 -0400
Subject: [PATCH] update build system

---
 Makefile         | 15 ---------------
 docker-build.bat |  1 -
 meson.build      |  1 +
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index c9b1b14..a05bb64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-SHELL = /bin/bash
-
 V               ?= @
 
 .DEFAULT_GOAL := help
@@ -7,16 +5,12 @@ V               ?= @
 BUILD_DIR := build
 BUILD_DIR_32 := $(BUILD_DIR)/build32
 BUILD_DIR_64 := $(BUILD_DIR)/build64
-BUILD_DIR_DOCKER := $(BUILD_DIR)/docker
 BUILD_DIR_ZIP := $(BUILD_DIR)/zip
 
 DOC_DIR := doc
 
 DIST_DIR := dist
 
-DOCKER_CONTAINER_NAME := "segatools-build"
-DOCKER_IMAGE_NAME     := "segatools:build"
-
 # -----------------------------------------------------------------------------
 # Targets
 # -----------------------------------------------------------------------------
@@ -44,15 +38,6 @@ zip: $(BUILD_DIR_ZIP)/segatools.zip
 clean:
 	$(V)rm -rf $(BUILD_DIR) subprojects/capnhook
 
-.PHONY: build-docker # Build the project in a docker container
-build-docker:
-	$(V)docker rm -f $(DOCKER_CONTAINER_NAME) 2> /dev/null || true
-	$(V)docker build -t $(DOCKER_IMAGE_NAME) -f Dockerfile .
-	$(V)docker create --name $(DOCKER_CONTAINER_NAME) $(DOCKER_IMAGE_NAME)
-	$(V)rm -rf $(BUILD_DIR_DOCKER)
-	$(V)mkdir -p $(BUILD_DIR_DOCKER)
-	$(V)docker cp $(DOCKER_CONTAINER_NAME):/segatools/$(BUILD_DIR_ZIP) $(BUILD_DIR_DOCKER)
-
 # -----------------------------------------------------------------------------
 # Utility, combo and alias targets
 # -----------------------------------------------------------------------------
diff --git a/docker-build.bat b/docker-build.bat
index 1b0ce12..969e032 100644
--- a/docker-build.bat
+++ b/docker-build.bat
@@ -2,7 +2,6 @@
 setlocal enabledelayedexpansion
 
 :: Static Environment Variables
-set BUILD_OUTPUT_PATH=build\docker
 set IMAGE_NAME=djhackers/segatools-build:latest
 set CONTAINER_NAME=segatools-build
 
diff --git a/meson.build b/meson.build
index 2c6b673..b5a3d5f 100644
--- a/meson.build
+++ b/meson.build
@@ -13,6 +13,7 @@ add_project_arguments(
     '-DWIN32_LEAN_AND_MEAN',
     '-D_WIN32_WINNT=_WIN32_WINNT_WIN7',
     '-DMINGW_HAS_SECURE_API=1',
+    '-Wno-unused',
     language: 'c',
 )