Improve buildsystem, split out generic code

Makefile

@@ -0,0 +1,10 @@
+ATMOSPHERE_LIBRARIES := libstratosphere
+
+TOPTARGETS := all clean
+
+$(TOPTARGETS): $(ATMOSPHERE_LIBRARIES)
+
+$(ATMOSPHERE_LIBRARIES):
+	$(MAKE) -C $@ $(MAKECMDGOALS)
+
+.PHONY: $(TOPTARGETS) $(ATMOSPHERE_LIBRARIES)

config/arch/arm64/arch.mk

@@ -0,0 +1,11 @@
+ifeq ($(strip $(DEVKITPRO)),)
+$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
+endif
+
+include $(DEVKITPRO)/devkitA64/base_rules
+
+export ATMOSPHERE_DEFINES  += -DATMOSPHERE_ARCH_ARM64
+export ATMOSPHERE_SETTINGS += -march=armv8-a -mtp=soft
+export ATMOSPHERE_CFLAGS   +=
+export ATMOSPHERE_CXXFLAGS +=
+export ATMOSPHERE_ASFLAGS  +=

config/board/nintendo/switch/board.mk

@@ -0,0 +1,5 @@
+export ATMOSPHERE_DEFINES  += -DATMOSPHERE_BOARD_NINTENDO_SWITCH -D__SWITCH__
+export ATMOSPHERE_SETTINGS += -mtune=cortex-a57
+export ATMOSPHERE_CFLAGS   +=
+export ATMOSPHERE_CXXFLAGS +=
+export ATMOSPHERE_ASFLAGS  +=

config/common.mk

@@ -0,0 +1,26 @@
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
+
+export ATMOSPHERE_CONFIG_MAKE_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+export ATMOSPHERE_LIBRARY_DIR     := $(ATMOSPHERE_CONFIG_MAKE_DIR)/..
+
+ifeq ($(strip $(ATMOSPHERE_BOARD)),)
+export ATMOSPHERE_BOARD := nx-hac-001
+endif
+
+export ATMOSPHERE_DEFINES  := -DATMOSPHERE
+export ATMOSPHERE_SETTINGS := -fPIE -g
+export ATMOSPHERE_CFLAGS   := -Wall -ffunction-sections -fdata-sections -fno-strict-aliasing -fwrapv \
+                          -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-stack-protector
+export ATMOSPHERE_CXXFLAGS := -fno-rtti -fno-exceptions -std=gnu++17
+export ATMOSPHERE_ASFLAGS  :=
+
+
+ifeq ($(ATMOSPHERE_BOARD),nx-hac-001)
+export ATMOSPHERE_ARCH_MAKE_DIR   := $(ATMOSPHERE_CONFIG_MAKE_DIR)/arch/arm64
+export ATMOSPHERE_BOARD_MAKE_DIR  := $(ATMOSPHERE_CONFIG_MAKE_DIR)/board/nintendo/switch
+endif
+
+include $(ATMOSPHERE_ARCH_MAKE_DIR)/arch.mk
+include $(ATMOSPHERE_BOARD_MAKE_DIR)/board.mk

libstratosphere/Makefile

@@ -1,12 +1,15 @@
 #---------------------------------------------------------------------------------
-.SUFFIXES:
+# pull in common atmosphere configuration
 #---------------------------------------------------------------------------------
+include  $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/../config/common.mk
 
+#---------------------------------------------------------------------------------
+# pull in switch rules
+#---------------------------------------------------------------------------------
 ifeq ($(strip $(DEVKITPRO)),)
 $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
 endif
 
-TOPDIR ?= $(CURDIR)
 include $(DEVKITPRO)/libnx/switch_rules
 
 #---------------------------------------------------------------------------------
@@ -16,34 +19,28 @@ include $(DEVKITPRO)/libnx/switch_rules
 # INCLUDES is a list of directories containing header files
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
-SOURCES		?=	$(shell find source -type d)
 DATA		:=	data
 INCLUDES	:=  include
-
+SOURCES		?=	$(shell find source -type d)
-DEFINES	:=
 
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-ARCH	:=	-march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE
+DEFINES	    := $(ATMOSPHERE_DEFINES) -DATMOSPHERE_IS_STRATOSPHERE
+SETTINGS    := $(ATMOSPHERE_SETTINGS) -O2
+CFLAGS      := $(ATMOSPHERE_CFLAGS) $(SETTINGS) $(DEFINES) $(INCLUDE)
+CXXFLAGS    := $(CFLAGS) $(ATMOSPHERE_CXXFLAGS) -flto
+ASFLAGS     := $(ATMOSPHERE_ASFLAGS) $(SETTINGS)
 
-CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
+LDFLAGS     := -specs=$(DEVKITPRO)/libnx/switch.specs $(SETTINGS) -Wl,-Map,$(notdir $.map)
-			$(ARCH) $(DEFINES)
 
-CFLAGS	+=	$(INCLUDE) -D__SWITCH__
+LIBS        := -lnx
-
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++17 -flto
-
-ASFLAGS	:=	-g $(ARCH)
-LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
-
-LIBS	:= -lnx
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
 # include and lib
 #---------------------------------------------------------------------------------
-LIBDIRS	:= $(PORTLIBS) $(LIBNX)
+LIBDIRS	:= $(PORTLIBS) $(LIBNX) $(ATMOSPHERE_LIBRARY_DIR)/libvapours
 
 #---------------------------------------------------------------------------------
 # no real need to edit anything past this point unless you need to add additional
@@ -81,8 +78,7 @@ export HFILES	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
 
 export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
 			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-			-I. \
+			-I.
-			-iquote $(CURDIR)/include/switch/
 
 .PHONY: clean all
 

libstratosphere/include/stratosphere.hpp

@@ -16,8 +16,8 @@
 
 #pragma once
 
-/* Pulls in util, svc. */
+/* libvapours (pulls in util, svc, results). */
-#include "atmosphere/common.hpp"
+#include <vapours.hpp>
 
 /* Critical modules with no dependencies. */
 #include "stratosphere/ams.hpp"

libstratosphere/include/stratosphere/ams/ams_types.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 #include "../sf/sf_buffer_tags.hpp"
 #include "../hos.hpp"
 

libstratosphere/include/stratosphere/boot2/boot2_api.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::boot2 {
 

libstratosphere/include/stratosphere/dd/dd_io_mappings.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::dd {
 

libstratosphere/include/stratosphere/dd/dd_process_handle.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::dd {
 

libstratosphere/include/stratosphere/fatal/fatal_types.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 #include "../ncm/ncm_types.hpp"
 #include "../sf/sf_buffer_tags.hpp"
 

libstratosphere/include/stratosphere/fs/fs_common.hpp

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 #include "../os.hpp"
 #include "../ncm.hpp"
 #include "../sf.hpp"

libstratosphere/include/stratosphere/hos/hos_types.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::hos {
 

libstratosphere/include/stratosphere/kvdb/kvdb_auto_buffer.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::kvdb {
 

libstratosphere/include/stratosphere/kvdb/kvdb_bounded_string.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::kvdb {
 

libstratosphere/include/stratosphere/ldr/ldr_types.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 #include "../ncm/ncm_types.hpp"
 #include "../sf/sf_buffer_tags.hpp"
 

libstratosphere/include/stratosphere/map/map_types.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::map {
 

libstratosphere/include/stratosphere/ncm/ncm_types.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::ncm {
 

libstratosphere/include/stratosphere/os/os_common_types.hpp

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::os {
 

libstratosphere/include/stratosphere/os/os_memory_common.hpp

@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::os {
 

libstratosphere/include/stratosphere/reg.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::reg {
 

libstratosphere/include/stratosphere/rnd/rnd_api.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::rnd {
 

libstratosphere/include/stratosphere/ro/ro_types.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 #include "../ncm/ncm_types.hpp"
 
 namespace ams::ro {

libstratosphere/include/stratosphere/settings/settings_fwdbg_api.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 #include "settings_fwdbg_types.hpp"
 
 namespace ams::settings::fwdbg {

libstratosphere/include/stratosphere/settings/settings_fwdbg_types.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 #include "../sf/sf_buffer_tags.hpp"
 
 namespace ams::settings::fwdbg {

libstratosphere/include/stratosphere/settings/settings_types.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::settings {
 

libstratosphere/include/stratosphere/sf/sf_common.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 #include "../ams.hpp"
 #include "../os.hpp"
 #include "../sm/sm_types.hpp"

libstratosphere/include/stratosphere/sm/sm_types.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 #include "../ncm/ncm_types.hpp"
 #include "../cfg/cfg_types.hpp"
 

libstratosphere/include/stratosphere/spl/spl_types.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::spl {
 

libstratosphere/include/stratosphere/updater/updater_types.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include <atmosphere/common.hpp>
+#include <vapours.hpp>
 
 namespace ams::updater {
 

libstratosphere/include/stratosphere/util.hpp

@@ -15,8 +15,6 @@
  */
 
 #pragma once
-#include "common_includes.hpp"
+
-#include "defines.hpp"
+#include "util/util_compression.hpp"
-#include "util.hpp"
+#include "util/util_ini.hpp"
-#include "results.hpp"
-#include "svc.hpp"

libstratosphere/include/stratosphere/util/util_compression.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "../defines.hpp"
+#include <vapours.hpp>
 
 namespace ams::util {
 

libstratosphere/include/stratosphere/util/util_ini.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "../defines.hpp"
+#include <vapours.hpp>
 
 namespace ams::util::ini {
 

libvapours/include/vapours.hpp

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2018-2019 Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include "vapours/includes.hpp"
+#include "vapours/defines.hpp"
+
+#include "vapours/util.hpp"
+#include "vapours/results.hpp"
+#include "vapours/svc.hpp"

libvapours/include/vapours/defines.hpp

@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "common_includes.hpp"
+#include "includes.hpp"
 
 /* Any broadly useful language defines should go here. */
 

libvapours/include/vapours/includes.hpp

@@ -26,17 +26,23 @@
 #include <climits>
 #include <cctype>
 
-/* C++ headers. */
+
 #include <type_traits>
+#include <algorithm>
+#include <iterator>
 #include <limits>
+#include <random>
+
+/* Stratosphere wants stdlib headers, others do not.. */
+#ifdef ATMOSPHERE_IS_STRATOSPHERE
+
+/* C++ headers. */
 #include <atomic>
 #include <utility>
-#include <iterator>
 #include <optional>
 #include <memory>
 #include <mutex>
 #include <shared_mutex>
-#include <algorithm>
 #include <functional>
 #include <tuple>
 #include <array>
@@ -44,9 +50,19 @@
 #include <unordered_map>
 #include <set>
 
+#endif /* ATMOSPHERE_IS_STRATOSPHERE */
+
+#ifdef ATMOSPHERE_BOARD_NINTENDO_SWITCH
+
 /* Libnx. */
 #include <switch.h>
 
+#else
+
+#error "Unsupported board"
+
+#endif /* ATMOSPHERE_BOARD_NINTENDO_SWITCH */
+
 /* Atmosphere meta. */
 #if __has_include(<atmosphere.h>)
 #include <atmosphere.h>

libvapours/include/vapours/util.hpp

@@ -23,5 +23,3 @@
 #include "util/util_typed_storage.hpp"
 #include "util/util_intrusive_list.hpp"
 #include "util/util_intrusive_red_black_tree.hpp"
-#include "util/util_compression.hpp"
-#include "util/util_ini.hpp"