From 35fffade4ea4fdbba9cf2443c321e724c9e70c3d Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Sat, 15 Aug 2020 09:20:11 -0700 Subject: [PATCH] libstrat: fix building of source/os/* --- libraries/config/common.mk | 1 + libraries/libstratosphere/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/libraries/config/common.mk b/libraries/config/common.mk index 832045842..164bed034 100644 --- a/libraries/config/common.mk +++ b/libraries/config/common.mk @@ -108,6 +108,7 @@ INCLUDES := include GENERAL_SOURCE_DIRS=$1 $(foreach d,$(filter-out $1/arch $1/board $1/os $1/cpu $1,$(wildcard $1/*)),$(if $(wildcard $d/.),$(call DIR_WILDCARD,$d) $d,)) SPECIFIC_SOURCE_DIRS=$(if $(wildcard $1/$2/$3/.*),$1/$2/$3 $(call DIR_WILDCARD,$1/$2/$3),$(if $(wildcard $1/$2/generic/.*), $1/$2/generic $(call DIR_WILDCARD,$1/$2/generic),)) +UNFILTERED_SOURCE_DIRS=$1 $(foreach d,$(wildcard $1/*),$(if $(wildcard $d/.),$(call DIR_WILDCARD,$d) $d,)) ALL_SOURCE_DIRS=$(call GENERAL_SOURCE_DIRS,$1) \ $(call SPECIFIC_SOURCE_DIRS,$1,arch,$(ATMOSPHERE_ARCH_DIR)) \ diff --git a/libraries/libstratosphere/Makefile b/libraries/libstratosphere/Makefile index 5c900280a..4174c842c 100644 --- a/libraries/libstratosphere/Makefile +++ b/libraries/libstratosphere/Makefile @@ -26,6 +26,7 @@ ASFLAGS := $(ATMOSPHERE_ASFLAGS) $(SETTINGS) LDFLAGS := -specs=$(DEVKITPRO)/libnx/switch.specs $(SETTINGS) -Wl,-Map,$(notdir $*.map) SOURCES += $(call ALL_SOURCE_DIRS,../libvapours/source) +SOURCES += $(call UNFILTERED_SOURCE_DIRS,source/os) LIBS := -lnx