From 69a81ad2f15ad3c9163db0a647f295e41fdb6ab7 Mon Sep 17 00:00:00 2001 From: coco875 Date: Sat, 31 Aug 2024 18:06:00 +0200 Subject: [PATCH] add other collision gfx and prepare reorganise file --- Makefile | 2 +- models/mario_raceway/models.json | 55 +++++++++++++- models/moo_moo_farm/models.json | 79 ++++++++++++++++++- models/rainbow_road/models.json | 17 ++++- models/royal_raceway/models.json | 121 +++++++++++++++++++++++++++++- models/sherbet_land/models.json | 26 ++++++- models/toads_turnpike/models.json | 25 +++++- models/wario_stadium/models.json | 34 ++++++++- models/yoshi_valley/models.json | 56 +++++++++++++- util.mk | 3 + 10 files changed, 409 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 48ec681c1..49500bdc6 100644 --- a/Makefile +++ b/Makefile @@ -278,7 +278,7 @@ else ifeq ($(DETECTED_OS), windows) BLENDER := "C:\Program Files\Blender Foundation\Blender 3.6\blender.exe" endif -MODELS_JSON := $(wildcard models/*/models.json) +MODELS_JSON := $(call rwildcard,models,*.json) MODELS_PROC := $(MODELS_JSON:%.json=%) models/%: models/%.json diff --git a/models/mario_raceway/models.json b/models/mario_raceway/models.json index cff90dfe2..cd3916d3a 100644 --- a/models/mario_raceway/models.json +++ b/models/mario_raceway/models.json @@ -85,6 +85,59 @@ { "file":"courses/banshee_boardwalk/course_displaylists.inc.c", "out_dir": "banshee_boardwalk/collision_sections", - "models": [] + "models": [ + "d_course_mario_raceway_packed_dl_17D8", + "d_course_mario_raceway_packed_dl_1770", + "d_course_mario_raceway_packed_dl_16D8", + "d_course_mario_raceway_packed_dl_1668", + "d_course_mario_raceway_packed_dl_14C8", + "d_course_mario_raceway_packed_dl_1500", + "d_course_mario_raceway_packed_dl_1550", + "d_course_mario_raceway_packed_dl_1600", + "d_course_mario_raceway_packed_dl_1850", + "d_course_mario_raceway_packed_dl_1AF8", + "d_course_mario_raceway_packed_dl_1A80", + "d_course_mario_raceway_packed_dl_1A08", + "d_course_mario_raceway_packed_dl_1988", + "d_course_mario_raceway_packed_dl_1890", + "d_course_mario_raceway_packed_dl_18B8", + "d_course_mario_raceway_packed_dl_18E0", + "d_course_mario_raceway_packed_dl_1950", + "d_course_mario_raceway_packed_dl_1188", + "d_course_mario_raceway_packed_dl_2A28", + "d_course_mario_raceway_packed_dl_E0", + "d_course_mario_raceway_packed_dl_5218", + "d_course_mario_raceway_packed_dl_50E8", + "d_course_mario_raceway_packed_dl_4F90", + "d_course_mario_raceway_packed_dl_4EE8", + "d_course_mario_raceway_packed_dl_4E20", + "d_course_mario_raceway_packed_dl_52B8", + "d_course_mario_raceway_packed_dl_5608", + "d_course_mario_raceway_packed_dl_5550", + "d_course_mario_raceway_packed_dl_54B0", + "d_course_mario_raceway_packed_dl_5408", + "d_course_mario_raceway_packed_dl_5368", + "d_course_mario_raceway_packed_dl_4D48", + "d_course_mario_raceway_packed_dl_49E8", + "d_course_mario_raceway_packed_dl_4950", + "d_course_mario_raceway_packed_dl_4870", + "d_course_mario_raceway_packed_dl_4780", + "d_course_mario_raceway_packed_dl_46A0", + "d_course_mario_raceway_packed_dl_4AD8", + "d_course_mario_raceway_packed_dl_6198", + "d_course_mario_raceway_packed_dl_60F0", + "d_course_mario_raceway_packed_dl_63B0", + "d_course_mario_raceway_packed_dl_5AE0", + "d_course_mario_raceway_packed_dl_5A48", + "d_course_mario_raceway_packed_dl_5970", + "d_course_mario_raceway_packed_dl_5870", + "d_course_mario_raceway_packed_dl_5768", + "d_course_mario_raceway_packed_dl_5BC8", + "d_course_mario_raceway_packed_dl_5ED0", + "d_course_mario_raceway_packed_dl_5F88", + "d_course_mario_raceway_packed_dl_6068", + "d_course_mario_raceway_packed_dl_6308", + "d_course_mario_raceway_packed_dl_6490" + ] } ] \ No newline at end of file diff --git a/models/moo_moo_farm/models.json b/models/moo_moo_farm/models.json index b5b309cfd..0e6a90759 100644 --- a/models/moo_moo_farm/models.json +++ b/models/moo_moo_farm/models.json @@ -112,6 +112,83 @@ { "file":"courses/banshee_boardwalk/course_displaylists.inc.c", "out_dir": "banshee_boardwalk/collision_sections", - "models": [] + "models": [ + "d_course_moo_moo_farm_packed_dl_39F8", + "d_course_moo_moo_farm_packed_dl_3B88", + "d_course_moo_moo_farm_packed_dl_3C48", + "d_course_moo_moo_farm_packed_dl_3D50", + "d_course_moo_moo_farm_packed_dl_3E50", + "d_course_moo_moo_farm_packed_dl_3918", + "d_course_moo_moo_farm_packed_dl_34B8", + "d_course_moo_moo_farm_packed_dl_3590", + "d_course_moo_moo_farm_packed_dl_3668", + "d_course_moo_moo_farm_packed_dl_3748", + "d_course_moo_moo_farm_packed_dl_3828", + "d_course_moo_moo_farm_packed_dl_3F30", + "d_course_moo_moo_farm_packed_dl_46E8", + "d_course_moo_moo_farm_packed_dl_47C8", + "d_course_moo_moo_farm_packed_dl_48B8", + "d_course_moo_moo_farm_packed_dl_49A8", + "d_course_moo_moo_farm_packed_dl_4A88", + "d_course_moo_moo_farm_packed_dl_45D0", + "d_course_moo_moo_farm_packed_dl_40A8", + "d_course_moo_moo_farm_packed_dl_41B0", + "d_course_moo_moo_farm_packed_dl_42B8", + "d_course_moo_moo_farm_packed_dl_43A0", + "d_course_moo_moo_farm_packed_dl_4480", + "d_course_moo_moo_farm_packed_dl_1BA0", + "d_course_moo_moo_farm_packed_dl_1C40", + "d_course_moo_moo_farm_packed_dl_1C98", + "d_course_moo_moo_farm_packed_dl_1D00", + "d_course_moo_moo_farm_packed_dl_1D60", + "d_course_moo_moo_farm_packed_dl_1DD0", + "d_course_moo_moo_farm_packed_dl_1E58", + "d_course_moo_moo_farm_packed_dl_1B38", + "d_course_moo_moo_farm_packed_dl_18E0", + "d_course_moo_moo_farm_packed_dl_1940", + "d_course_moo_moo_farm_packed_dl_19A0", + "d_course_moo_moo_farm_packed_dl_1A00", + "d_course_moo_moo_farm_packed_dl_1A60", + "d_course_moo_moo_farm_packed_dl_1AA0", + "d_course_moo_moo_farm_packed_dl_1AD0", + "d_course_moo_moo_farm_packed_dl_1ED0", + "d_course_moo_moo_farm_packed_dl_20F8", + "d_course_moo_moo_farm_packed_dl_2160", + "d_course_moo_moo_farm_packed_dl_21D8", + "d_course_moo_moo_farm_packed_dl_2240", + "d_course_moo_moo_farm_packed_dl_22B0", + "d_course_moo_moo_farm_packed_dl_2338", + "d_course_moo_moo_farm_packed_dl_23C0", + "d_course_moo_moo_farm_packed_dl_2C68", + "d_course_moo_moo_farm_packed_dl_2CD8", + "d_course_moo_moo_farm_packed_dl_2D30", + "d_course_moo_moo_farm_packed_dl_2D90", + "d_course_moo_moo_farm_packed_dl_2DF0", + "d_course_moo_moo_farm_packed_dl_2E60", + "d_course_moo_moo_farm_packed_dl_2EA0", + "d_course_moo_moo_farm_packed_dl_2C10", + "d_course_moo_moo_farm_packed_dl_2998", + "d_course_moo_moo_farm_packed_dl_29F0", + "d_course_moo_moo_farm_packed_dl_2A50", + "d_course_moo_moo_farm_packed_dl_2AB8", + "d_course_moo_moo_farm_packed_dl_2AF0", + "d_course_moo_moo_farm_packed_dl_2B50", + "d_course_moo_moo_farm_packed_dl_2BA8", + "d_course_moo_moo_farm_packed_dl_2F10", + "d_course_moo_moo_farm_packed_dl_3210", + "d_course_moo_moo_farm_packed_dl_3268", + "d_course_moo_moo_farm_packed_dl_32A0", + "d_course_moo_moo_farm_packed_dl_3310", + "d_course_moo_moo_farm_packed_dl_3350", + "d_course_moo_moo_farm_packed_dl_3380", + "d_course_moo_moo_farm_packed_dl_31C8", + "d_course_moo_moo_farm_packed_dl_5290", + "d_course_moo_moo_farm_packed_dl_5018", + "d_course_moo_moo_farm_packed_dl_A80", + "d_course_moo_moo_farm_packed_dl_4D0", + "d_course_moo_moo_farm_packed_dl_4DF8", + "d_course_moo_moo_farm_packed_dl_CB0", + "d_course_moo_moo_farm_packed_dl_F20" + ] } ] \ No newline at end of file diff --git a/models/rainbow_road/models.json b/models/rainbow_road/models.json index e766a16ad..1f45bc295 100644 --- a/models/rainbow_road/models.json +++ b/models/rainbow_road/models.json @@ -43,6 +43,21 @@ { "file":"courses/banshee_boardwalk/course_displaylists.inc.c", "out_dir": "banshee_boardwalk/collision_sections", - "models": [] + "models": [ + "d_course_rainbow_road_packed_dl_20C0", + "d_course_rainbow_road_packed_dl_1850", + "d_course_rainbow_road_packed_dl_1758", + "d_course_rainbow_road_packed_dl_1698", + "d_course_rainbow_road_packed_dl_15F8", + "d_course_rainbow_road_packed_dl_1528", + "d_course_rainbow_road_packed_dl_13A0", + "d_course_rainbow_road_packed_dl_1978", + "d_course_rainbow_road_packed_dl_1D30", + "d_course_rainbow_road_packed_dl_1C70", + "d_course_rainbow_road_packed_dl_1BC0", + "d_course_rainbow_road_packed_dl_1B28", + "d_course_rainbow_road_packed_dl_1A20", + "d_course_rainbow_road_packed_dl_1318" + ] } ] \ No newline at end of file diff --git a/models/royal_raceway/models.json b/models/royal_raceway/models.json index 8c23918ee..1f44be798 100644 --- a/models/royal_raceway/models.json +++ b/models/royal_raceway/models.json @@ -149,6 +149,125 @@ { "file":"courses/banshee_boardwalk/course_displaylists.inc.c", "out_dir": "banshee_boardwalk/collision_sections", - "models": [] + "models": [ + "d_course_royal_raceway_packed_dl_650", + "d_course_royal_raceway_packed_dl_1FE8", + "d_course_royal_raceway_packed_dl_20A0", + "d_course_royal_raceway_packed_dl_2110", + "d_course_royal_raceway_packed_dl_21B8", + "d_course_royal_raceway_packed_dl_2230", + "d_course_royal_raceway_packed_dl_22C0", + "d_course_royal_raceway_packed_dl_1F58", + "d_course_royal_raceway_packed_dl_1B98", + "d_course_royal_raceway_packed_dl_1C48", + "d_course_royal_raceway_packed_dl_1CF0", + "d_course_royal_raceway_packed_dl_1D68", + "d_course_royal_raceway_packed_dl_1DF0", + "d_course_royal_raceway_packed_dl_1E60", + "d_course_royal_raceway_packed_dl_1EF0", + "d_course_royal_raceway_packed_dl_2370", + "d_course_royal_raceway_packed_dl_28D8", + "d_course_royal_raceway_packed_dl_2950", + "d_course_royal_raceway_packed_dl_2A10", + "d_course_royal_raceway_packed_dl_2AC8", + "d_course_royal_raceway_packed_dl_2B38", + "d_course_royal_raceway_packed_dl_A648", + "d_course_royal_raceway_packed_dl_2BA0", + "d_course_royal_raceway_packed_dl_A6A8", + "d_course_royal_raceway_packed_dl_2870", + "d_course_royal_raceway_packed_dl_23F8", + "d_course_royal_raceway_packed_dl_2478", + "d_course_royal_raceway_packed_dl_2530", + "d_course_royal_raceway_packed_dl_25E0", + "d_course_royal_raceway_packed_dl_26B0", + "d_course_royal_raceway_packed_dl_2758", + "d_course_royal_raceway_packed_dl_27E0", + "d_course_royal_raceway_packed_dl_5400", + "d_course_royal_raceway_packed_dl_54A8", + "d_course_royal_raceway_packed_dl_5520", + "d_course_royal_raceway_packed_dl_51E8", + "d_course_royal_raceway_packed_dl_4E90", + "d_course_royal_raceway_packed_dl_4F20", + "d_course_royal_raceway_packed_dl_4F98", + "d_course_royal_raceway_packed_dl_5018", + "d_course_royal_raceway_packed_dl_50B0", + "d_course_royal_raceway_packed_dl_5138", + "d_course_royal_raceway_packed_dl_5B50", + "d_course_royal_raceway_packed_dl_5C00", + "d_course_royal_raceway_packed_dl_5D18", + "d_course_royal_raceway_packed_dl_5DC8", + "d_course_royal_raceway_packed_dl_5EF8", + "d_course_royal_raceway_packed_dl_5AA8", + "d_course_royal_raceway_packed_dl_56A0", + "d_course_royal_raceway_packed_dl_5740", + "d_course_royal_raceway_packed_dl_57F0", + "d_course_royal_raceway_packed_dl_58E8", + "d_course_royal_raceway_packed_dl_5990", + "d_course_royal_raceway_packed_dl_5A10", + "d_course_royal_raceway_packed_dl_4078", + "d_course_royal_raceway_packed_dl_4118", + "d_course_royal_raceway_packed_dl_41A8", + "d_course_royal_raceway_packed_dl_4298", + "d_course_royal_raceway_packed_dl_4350", + "d_course_royal_raceway_packed_dl_3FA8", + "d_course_royal_raceway_packed_dl_3B70", + "d_course_royal_raceway_packed_dl_3C18", + "d_course_royal_raceway_packed_dl_3CF0", + "d_course_royal_raceway_packed_dl_3DC0", + "d_course_royal_raceway_packed_dl_3E50", + "d_course_royal_raceway_packed_dl_3F18", + "d_course_royal_raceway_packed_dl_4400", + "d_course_royal_raceway_packed_dl_4A08", + "d_course_royal_raceway_packed_dl_4A80", + "d_course_royal_raceway_packed_dl_4B30", + "d_course_royal_raceway_packed_dl_4BC8", + "d_course_royal_raceway_packed_dl_4CC8", + "d_course_royal_raceway_packed_dl_4968", + "d_course_royal_raceway_packed_dl_44B0", + "d_course_royal_raceway_packed_dl_4538", + "d_course_royal_raceway_packed_dl_45E0", + "d_course_royal_raceway_packed_dl_46E0", + "d_course_royal_raceway_packed_dl_47C0", + "d_course_royal_raceway_packed_dl_4890", + "d_course_royal_raceway_packed_dl_1720", + "d_course_royal_raceway_packed_dl_16B8", + "d_course_royal_raceway_packed_dl_1640", + "d_course_royal_raceway_packed_dl_15D8", + "d_course_royal_raceway_packed_dl_1548", + "d_course_royal_raceway_packed_dl_14C8", + "d_course_royal_raceway_packed_dl_1450", + "d_course_royal_raceway_packed_dl_1788", + "d_course_royal_raceway_packed_dl_1AA0", + "d_course_royal_raceway_packed_dl_1A30", + "d_course_royal_raceway_packed_dl_19B0", + "d_course_royal_raceway_packed_dl_1940", + "d_course_royal_raceway_packed_dl_18D8", + "d_course_royal_raceway_packed_dl_1860", + "d_course_royal_raceway_packed_dl_17F8", + "d_course_royal_raceway_packed_dl_3218", + "d_course_royal_raceway_packed_dl_A870", + "d_course_royal_raceway_packed_dl_AA10", + "d_course_royal_raceway_packed_dl_AA90", + "d_course_royal_raceway_packed_dl_ACE0", + "d_course_royal_raceway_packed_dl_AE00", + "d_course_royal_raceway_packed_dl_AD78", + "d_course_royal_raceway_packed_dl_E88", + "d_course_royal_raceway_packed_dl_AB28", + "d_course_royal_raceway_packed_dl_67E8", + "d_course_royal_raceway_packed_dl_AC60", + "d_course_royal_raceway_packed_dl_A998", + "d_course_royal_raceway_packed_dl_A7D8", + "d_course_royal_raceway_packed_dl_AE70", + "d_course_royal_raceway_packed_dl_CE0", + "d_course_royal_raceway_packed_dl_ABA8", + "d_course_royal_raceway_packed_dl_55D0", + "d_course_royal_raceway_packed_dl_A8F8", + "d_course_royal_raceway_packed_dl_A7D8", + "d_course_royal_raceway_packed_dl_3B50", + "d_course_royal_raceway_packed_dl_1A8", + "d_course_royal_raceway_packed_dl_840", + "d_course_royal_raceway_packed_dl_C38", + "d_course_royal_raceway_packed_dl_A618" + ] } ] \ No newline at end of file diff --git a/models/sherbet_land/models.json b/models/sherbet_land/models.json index c06218f6f..54e950d90 100644 --- a/models/sherbet_land/models.json +++ b/models/sherbet_land/models.json @@ -166,6 +166,30 @@ { "file":"courses/banshee_boardwalk/course_displaylists.inc.c", "out_dir": "banshee_boardwalk/collision_sections", - "models": [] + "models": [ + "d_course_sherbet_land_packed_dl_1B20", + "d_course_sherbet_land_packed_dl_1A98", + "d_course_sherbet_land_packed_dl_1A18", + "d_course_sherbet_land_packed_dl_1998", + "d_course_sherbet_land_packed_dl_1C50", + "d_course_sherbet_land_packed_dl_1E40", + "d_course_sherbet_land_packed_dl_1DC0", + "d_course_sherbet_land_packed_dl_730", + "d_course_sherbet_land_packed_dl_5D0", + "d_course_sherbet_land_packed_dl_470", + "d_course_sherbet_land_packed_dl_348", + "d_course_sherbet_land_packed_dl_858", + "d_course_sherbet_land_packed_dl_9A0", + "d_course_sherbet_land_packed_dl_B00", + "d_course_sherbet_land_packed_dl_C30", + "d_course_sherbet_land_packed_dl_1D48", + "d_course_sherbet_land_packed_dl_1CD8", + "d_course_sherbet_land_packed_dl_1BE0", + "d_course_sherbet_land_packed_dl_1940", + "d_course_sherbet_land_packed_dl_EA0", + "d_course_sherbet_land_packed_dl_1450", + "d_course_sherbet_land_packed_dl_2738", + "d_course_sherbet_land_packed_dl_2798" + ] } ] \ No newline at end of file diff --git a/models/toads_turnpike/models.json b/models/toads_turnpike/models.json index 84f3c9e3a..1201cdffb 100644 --- a/models/toads_turnpike/models.json +++ b/models/toads_turnpike/models.json @@ -81,6 +81,29 @@ { "file":"courses/banshee_boardwalk/course_displaylists.inc.c", "out_dir": "banshee_boardwalk/collision_sections", - "models": [] + "models": [ + "d_course_toads_turnpike_packed_dl_32A0", + "d_course_toads_turnpike_packed_dl_33A8", + "d_course_toads_turnpike_packed_dl_3478", + "d_course_toads_turnpike_packed_dl_3548", + "d_course_toads_turnpike_packed_dl_31E8", + "d_course_toads_turnpike_packed_dl_2E40", + "d_course_toads_turnpike_packed_dl_2EE0", + "d_course_toads_turnpike_packed_dl_2FA0", + "d_course_toads_turnpike_packed_dl_3060", + "d_course_toads_turnpike_packed_dl_3118", + "d_course_toads_turnpike_packed_dl_3638", + "d_course_toads_turnpike_packed_dl_3AD0", + "d_course_toads_turnpike_packed_dl_3B58", + "d_course_toads_turnpike_packed_dl_3C28", + "d_course_toads_turnpike_packed_dl_3D00", + "d_course_toads_turnpike_packed_dl_39A8", + "d_course_toads_turnpike_packed_dl_36C0", + "d_course_toads_turnpike_packed_dl_3780", + "d_course_toads_turnpike_packed_dl_3850", + "d_course_toads_turnpike_packed_dl_38E8", + "d_course_toads_turnpike_packed_dl_FA8", + "d_course_toads_turnpike_packed_dl_51C8" + ] } ] \ No newline at end of file diff --git a/models/wario_stadium/models.json b/models/wario_stadium/models.json index 3dce265f3..fea7be028 100644 --- a/models/wario_stadium/models.json +++ b/models/wario_stadium/models.json @@ -123,6 +123,38 @@ { "file":"courses/banshee_boardwalk/course_displaylists.inc.c", "out_dir": "banshee_boardwalk/collision_sections", - "models": [] + "models": [ + "d_course_wario_stadium_packed_dl_8D28", + "d_course_wario_stadium_packed_dl_8DE8", + "d_course_wario_stadium_packed_dl_8EF0", + "d_course_wario_stadium_packed_dl_8FC8", + "d_course_wario_stadium_packed_dl_9090", + "d_course_wario_stadium_packed_dl_9120", + "d_course_wario_stadium_packed_dl_8C28", + "d_course_wario_stadium_packed_dl_85F0", + "d_course_wario_stadium_packed_dl_8678", + "d_course_wario_stadium_packed_dl_8708", + "d_course_wario_stadium_packed_dl_8798", + "d_course_wario_stadium_packed_dl_88A0", + "d_course_wario_stadium_packed_dl_8A68", + "d_course_wario_stadium_packed_dl_91E8", + "d_course_wario_stadium_packed_dl_98A0", + "d_course_wario_stadium_packed_dl_9998", + "d_course_wario_stadium_packed_dl_9AD8", + "d_course_wario_stadium_packed_dl_9C80", + "d_course_wario_stadium_packed_dl_9D00", + "d_course_wario_stadium_packed_dl_9D78", + "d_course_wario_stadium_packed_dl_9820", + "d_course_wario_stadium_packed_dl_9328", + "d_course_wario_stadium_packed_dl_93B0", + "d_course_wario_stadium_packed_dl_9430", + "d_course_wario_stadium_packed_dl_9590", + "d_course_wario_stadium_packed_dl_9668", + "d_course_wario_stadium_packed_dl_9760", + "d_course_wario_stadium_packed_dl_6D20", + "d_course_wario_stadium_packed_dl_8510", + "d_course_wario_stadium_packed_dl_5D90", + "d_course_wario_stadium_packed_dl_9F18" + ] } ] \ No newline at end of file diff --git a/models/yoshi_valley/models.json b/models/yoshi_valley/models.json index 18751dd4c..40a375b7c 100644 --- a/models/yoshi_valley/models.json +++ b/models/yoshi_valley/models.json @@ -85,6 +85,60 @@ { "file":"courses/banshee_boardwalk/course_displaylists.inc.c", "out_dir": "banshee_boardwalk/collision_sections", - "models": [] + "models": [ + "d_course_yoshi_valley_packed_dl_44C8", + "d_course_yoshi_valley_packed_dl_4588", + "d_course_yoshi_valley_packed_dl_45F0", + "d_course_yoshi_valley_packed_dl_4670", + "d_course_yoshi_valley_packed_dl_46E0", + "d_course_yoshi_valley_packed_dl_4810", + "d_course_yoshi_valley_packed_dl_4428", + "d_course_yoshi_valley_packed_dl_3E08", + "d_course_yoshi_valley_packed_dl_3F10", + "d_course_yoshi_valley_packed_dl_3FF0", + "d_course_yoshi_valley_packed_dl_4108", + "d_course_yoshi_valley_packed_dl_41B0", + "d_course_yoshi_valley_packed_dl_4258", + "d_course_yoshi_valley_packed_dl_4358", + "d_course_yoshi_valley_packed_dl_4918", + "d_course_yoshi_valley_packed_dl_4FD0", + "d_course_yoshi_valley_packed_dl_5058", + "d_course_yoshi_valley_packed_dl_1418", + "d_course_yoshi_valley_packed_dl_50E0", + "d_course_yoshi_valley_packed_dl_5158", + "d_course_yoshi_valley_packed_dl_51D8", + "d_course_yoshi_valley_packed_dl_52D8", + "d_course_yoshi_valley_packed_dl_4F48", + "d_course_yoshi_valley_packed_dl_49C0", + "d_course_yoshi_valley_packed_dl_4A58", + "d_course_yoshi_valley_packed_dl_4B20", + "d_course_yoshi_valley_packed_dl_4C18", + "d_course_yoshi_valley_packed_dl_4CB0", + "d_course_yoshi_valley_packed_dl_1580", + "d_course_yoshi_valley_packed_dl_4D68", + "d_course_yoshi_valley_packed_dl_4E88", + "d_course_yoshi_valley_packed_dl_5788", + "d_course_yoshi_valley_packed_dl_5800", + "d_course_yoshi_valley_packed_dl_5880", + "d_course_yoshi_valley_packed_dl_58F8", + "d_course_yoshi_valley_packed_dl_5710", + "d_course_yoshi_valley_packed_dl_54B0", + "d_course_yoshi_valley_packed_dl_5548", + "d_course_yoshi_valley_packed_dl_55C0", + "d_course_yoshi_valley_packed_dl_5628", + "d_course_yoshi_valley_packed_dl_56A0", + "d_course_yoshi_valley_packed_dl_5970", + "d_course_yoshi_valley_packed_dl_5C80", + "d_course_yoshi_valley_packed_dl_5D00", + "d_course_yoshi_valley_packed_dl_5D90", + "d_course_yoshi_valley_packed_dl_5DF8", + "d_course_yoshi_valley_packed_dl_5C18", + "d_course_yoshi_valley_packed_dl_59F0", + "d_course_yoshi_valley_packed_dl_75D0", + "d_course_yoshi_valley_packed_dl_3010", + "d_course_yoshi_valley_packed_dl_8050", + "d_course_yoshi_valley_packed_dl_13D8", + "d_course_yoshi_valley_packed_dl_D20" + ] } ] \ No newline at end of file diff --git a/util.mk b/util.mk index 13044ea0e..7a68b7ccd 100644 --- a/util.mk +++ b/util.mk @@ -19,3 +19,6 @@ NULL_OUT = /dev/null endif # Returns the path to the command $(1) if exists. Otherwise returns an empty string. find-command = $(shell which $(1) 2> $(NULL_OUT)) + +# recursive wildcard +rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))