From ce239440f3a2e6615044e578279660e092325b7b Mon Sep 17 00:00:00 2001
From: Matt Penny <matt@mattp.ca>
Date: Mon, 18 Dec 2023 14:06:33 -0500
Subject: [PATCH 1/2] Sort CODEFILES in Makefile

Link order matters when generating codesegment*.o. The old sort
order of CODEFILES was OS/file system dependent. Sort the file
paths to ensure consistent linking across environments.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2a7eb2c..5139cfa 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ ASMFILES    =	$(shell find asm/ -type f -name '*.s')
 
 ASMOBJECTS  =	$(patsubst %.s, build/%.o, $(ASMFILES))
 
-CODEFILES = $(shell find src/ -type f -name '*.c')
+CODEFILES = $(shell find src/ -type f -name '*.c' | sort)
 
 ifeq ($(PORTAL64_WITH_GFX_VALIDATOR),1)
 LCDEFS += -DPORTAL64_WITH_GFX_VALIDATOR

From 66e685ac4b7be9b005826256a8b4d02ea785f537 Mon Sep 17 00:00:00 2001
From: Matt Penny <matt@mattp.ca>
Date: Mon, 18 Dec 2023 14:09:46 -0500
Subject: [PATCH 2/2] Exclude extracted VPK contents from Docker build context

Speeds up Docker image creation if VPKs have already been extracted.
---
 .dockerignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.dockerignore b/.dockerignore
index e98adfa..933a963 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,6 @@
 build
+portal_pak_dir
+portal_pak_modified
 vpk
 skelatool64/build
 skelatool64/cimg