diff --git a/.gitmodules b/.gitmodules index 12a3cba..ca4cb0a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "source/libstratosphere"] - path = source/libstratosphere +[submodule "source/Atmosphere-libs"] + path = source/Atmosphere-libs url = https://github.com/Atmosphere-NX/Atmosphere-libs.git diff --git a/source/libstratosphere b/source/Atmosphere-libs similarity index 100% rename from source/libstratosphere rename to source/Atmosphere-libs diff --git a/source/Makefile b/source/Makefile index 8460df3..6a7b465 100644 --- a/source/Makefile +++ b/source/Makefile @@ -1,11 +1,12 @@ -COMPONENTS := libstratosphere AppletCompanion Sysmodule +Libstrat := Atmosphere-libs/libstratosphere +COMPONENTS := $(Libstrat) AppletCompanion Sysmodule TOPTARGETS := all clean mrproper .PHONY: $(TOPTARGETS) $(COMPONENTS) all: $(COMPONENTS) -libstratosphere: +$(Libstrat): @echo Building libstratosphere... @$(MAKE) --no-print-directory -C $@ @@ -13,7 +14,7 @@ AppletCompanion: @echo Building applet companion... @$(MAKE) --no-print-directory -C $@ -Sysmodule: libstratosphere +Sysmodule: $(Libstrat) @echo Building sysmodule... @$(MAKE) --no-print-directory -C $@ @@ -25,4 +26,4 @@ clean: mrproper: clean @echo Cleaning libstratosphere... - @$(MAKE) --no-print-directory -C libstratosphere clean \ No newline at end of file + @$(MAKE) --no-print-directory -C $(Libstrat) clean \ No newline at end of file diff --git a/source/Sysmodule/Makefile b/source/Sysmodule/Makefile index d775de8..9de1fe6 100644 --- a/source/Sysmodule/Makefile +++ b/source/Sysmodule/Makefile @@ -1,7 +1,7 @@ #--------------------------------------------------------------------------------- # pull in common stratosphere sysmodule configuration #--------------------------------------------------------------------------------- -include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/../libstratosphere/config/templates/stratosphere.mk +include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/../Atmosphere-libs/config/templates/stratosphere.mk TARGET := sys-con SOURCES += ../ControllerSwitch ../ControllerLib ../ControllerLib/Controllers ../inih