From cf3e5e15f83e2278a6482565309184da29ab0f41 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Fri, 29 Mar 2024 14:42:23 -0400 Subject: [PATCH] Update the 'ucity' commit used for testing This reduces our need to patch it for compatibility --- test/fetch-test-deps.sh | 2 +- test/patches/ucity.patch | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/test/fetch-test-deps.sh b/test/fetch-test-deps.sh index fb23d838..801b46f0 100755 --- a/test/fetch-test-deps.sh +++ b/test/fetch-test-deps.sh @@ -99,6 +99,6 @@ if "$nonfree"; then action pret pokered 2024-01-02 fabe2b3fb3fb5a849c5220298acabbdc9ad30f3b action zladx LADX-Disassembly 2024-02-25 583c78d2f2a5258b87bf133f75b7129228255650 fi -action AntonioND ucity 2023-11-02 c781ae20c0b319262b19b51e5067a2c93cf3b362 +action AntonioND ucity 2024-03-28 e9550498415642e06bc5db77fe824c1bd22c8ad9 action pinobatch libbet 2024-03-28 a3e5770f5904fe02a55c6651dd674896f101d6d1 action LIJI32 SameBoy 2024-03-08 e7792c16b24c08f55a370973f0beaecb7bd0ab92 diff --git a/test/patches/ucity.patch b/test/patches/ucity.patch index be49c6df..6696569f 100644 --- a/test/patches/ucity.patch +++ b/test/patches/ucity.patch @@ -1,17 +1,8 @@ diff --git a/Makefile b/Makefile -index 22c65e9..fce4930 100644 +index 244f179..fce4930 100644 --- a/Makefile +++ b/Makefile -@@ -44,14 +44,14 @@ BIN := $(NAME).$(EXT) - COMPAT_BIN := $(NAME)_compat.$(EXT) - - # List of relative paths to all folders and subfolders with code or data. --SOURCE_ALL_DIRS := $(shell find $(SOURCE) -type d -print) -+SOURCE_ALL_DIRS := $(sort $(shell find $(SOURCE) -type d -print)) - - # All files with extension asm are assembled. --ASMFILES := $(foreach dir,$(SOURCE_ALL_DIRS),$(wildcard $(dir)/*.asm)) -+ASMFILES := $(foreach dir,$(SOURCE_ALL_DIRS),$(sort $(wildcard $(dir)/*.asm))) +@@ -51,7 +51,7 @@ ASMFILES := $(foreach dir,$(SOURCE_ALL_DIRS),$(sort $(wildcard $(dir)/*.asm))) # List of include directories: All source and data folders. # A '/' is appended to the path.