diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index 6132a177f4..db414059d3 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make @@ -20,7 +20,7 @@ ifeq ($(APP_TYPE),ctru-app) is_app_build = endif -ifdef SELECTED_PLUGINS_SRC +ifneq ($(SELECTED_PLUGINS_SRC),DEFAULT) PLUGINS_SRC = $(SELECTED_PLUGINS_SRC) else ifdef is_app_build @@ -28,7 +28,7 @@ PLUGINS_SRC = $(call preprocess, $(APPSDIR)/plugins/SOURCES.app_build) else PLUGINS_SRC = $(call preprocess, $(APPSDIR)/plugins/SOURCES) endif -endif # ifdef SELECTED_PLUGINS_SRC +endif # if SELECTED_PLUGINS_SRC OTHER_SRC += $(PLUGINS_SRC) ROCKS1 := $(PLUGINS_SRC:.c=.rock) ROCKS1 := $(call full_path_subst,$(ROOTDIR)/%,$(BUILDDIR)/%,$(ROCKS1)) @@ -62,7 +62,7 @@ endif OTHER_SRC += $(ROOTDIR)/apps/plugins/plugin_crt0.c PLUGIN_CRT0 := $(BUILDDIR)/apps/plugins/plugin_crt0.o # multifile plugins (subdirs): -ifdef SELECTED_PLUGINS_SUBDIRS +ifneq ($(SELECTED_PLUGINS_SUBDIRS),DEFAULT) PLUGINSUBDIRS := $(SELECTED_PLUGINS_SUBDIRS) else ifdef is_app_build @@ -70,7 +70,7 @@ PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS.app_build) else PLUGINSUBDIRS := $(call preprocess, $(APPSDIR)/plugins/SUBDIRS) endif -endif # ifdef SELECTED_PLUGINS_SUBDIRS +endif # if SELECTED_PLUGINS_SUBDIRS PLUGIN_LIBS := $(PLUGINLIB) $(PLUGINBITMAPLIB) $(SETJMPLIB) $(FIXEDPOINTLIB) diff --git a/tools/configure b/tools/configure index 7e48cc93a1..cf15942b35 100755 --- a/tools/configure +++ b/tools/configure @@ -4848,6 +4848,10 @@ if [ -n "$ARG_PLUGINS" ]; then echo "Warning: Plugin '$p' found neither as file nor directory in $chk_plugin_dir. Use ':' as the separator." fi done +else + # Build the default set of plugins + selected_src="DEFAULT" + selected_subdirs="DEFAULT" fi ### end of cmdline