c++20

and update json.hpp
D3fau4 · Sep 12, 2021 · 8481c02 · 8481c02
1 parent 42c134d
commit 8481c02
Show file tree

Hide file tree

Showing 3 changed files with 2,534 additions and 1,341 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -19,7 +19,7 @@
             ],
             "compilerPath": "C:/devkitPro/devkitA64/bin/aarch64-none-elf-g++",
             "cStandard": "c11",
-            "cppStandard": "c++17",
+            "cppStandard": "c++20",
             "intelliSenseMode": "gcc-x64"
         },
         {
@@ -42,7 +42,7 @@
             ],
             "compilerPath": "/opt/devkitpro/devkitA64/bin/aarch64-none-elf-g++",
             "cStandard": "c11",
-            "cppStandard": "c++17",
+            "cppStandard": "c++20",
             "intelliSenseMode": "gcc-x64"
         }
     ],

diff --git a/NightFall/Makefile b/NightFall/Makefile
@@ -40,7 +40,7 @@ include $(DEVKITPRO)/libnx/switch_rules
 TARGET				:=	$(notdir $(CURDIR))
 APP_TITLE 			:= 	NightFall
 APP_AUTHOR 			:= 	D3fau4
-APP_VERSION 		:= 	1.1.2
+APP_VERSION 		:= 	1.2.0
 ICON				:=  resources/icon/NightFall.jpg
 BUILD				:=	build
 SOURCES				:=	source source/amssu source/sm source/spl source/hid source/FS source/net source/psm source/UI
@@ -62,7 +62,7 @@ CFLAGS	+=	$(INCLUDE) -D__SWITCH__ \
 			-DBOREALIS_RESOURCES="\"$(BOREALIS_RESOURCES)\"" \
 			$(ARCH) $(DEFINES) `curl-config --cflags`
 
-CXXFLAGS	:= $(CFLAGS) -std=c++17 -O2
+CXXFLAGS	:= $(CFLAGS) -std=c++20 -O2
 
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)