use C++14, closes #18

fortheusers · Sep 11, 2018 · fc1801b · fc1801b
1 parent 76a831f
commit fc1801b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -58,7 +58,7 @@ CFLAGS	:=	-g -Wall -O2 \
 CFLAGS	+=	$(INCLUDE) -DSWITCH -D__LIBNX__ -DUSE_FILE32API -DNOSTYLUS
 
 
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++14
 
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

diff --git a/Makefile.pc b/Makefile.pc
@@ -6,11 +6,11 @@ MINIZIP_O := zip.o ioapi.o unzip.o
 
 all:
 	gcc -c $(MINIZIP)/*.c
-	g++ -g -std=gnu++11 *.cpp ./console/*.cpp ./gui/*.cpp -lSDL2 -lSDL2main -lSDL2_image -lSDL2_ttf -lSDL2_gfx ./libs/get/src/*.cpp $(MINIZIP_O) -I $(RAPIDJSON) -I $(MINIZIP) -I /usr/local/include -lcurl -lz -o appstore.bin -fstack-protector-all
+	g++ -g -std=gnu++14 *.cpp ./console/*.cpp ./gui/*.cpp -lSDL2 -lSDL2main -lSDL2_image -lSDL2_ttf -lSDL2_gfx ./libs/get/src/*.cpp $(MINIZIP_O) -I $(RAPIDJSON) -I $(MINIZIP) -I /usr/local/include -lcurl -lz -o appstore.bin -fstack-protector-all
 
 macos:
 	gcc -c $(MINIZIP)/*.c
-	g++ -g -std=gnu++11 *.cpp -lSDL2 -lSDL2main -lSDL2_gfx -lSDL2_image -lSDL2_ttf -framework Cocoa ./console/*.cpp ./gui/*.cpp ./libs/get/src/*.cpp $(MINIZIP_O) -I $(RAPIDJSON) -I $(MINIZIP) -I /usr/local/include -lcurl -lz -o appstore.exe -fstack-protector-all -O0 
+	g++ -g -std=gnu++14 *.cpp -lSDL2 -lSDL2main -lSDL2_gfx -lSDL2_image -lSDL2_ttf -framework Cocoa ./console/*.cpp ./gui/*.cpp ./libs/get/src/*.cpp $(MINIZIP_O) -I $(RAPIDJSON) -I $(MINIZIP) -I /usr/local/include -lcurl -lz -o appstore.exe -fstack-protector-all -O0 
 
 clean:
 	rm *.o *.bin
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ See [get's instructions](https://github.com/vgmoose/get#setting-up-repos) for se
 A new project called [Barkeep](https://github.com/vgmoose/barkeep) is being worked on to allow this to be done without using a simple script.
 
 ### Building for PC
-There's a separate makefile for building the SDL1.2 app for PC. It requires libsdl, libcurl, and zlib installed. Below instructions are for Ubuntu, but should be similar on other platforms:
+There's a separate makefile for building the SDL2 app for PC. It requires libsdl, libcurl, and zlib installed. Below instructions are for Ubuntu, but should be similar on other platforms:
 ```
 sudo apt-get install libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev libsdl2-gfx-dev zlib1g-dev gcc g++ git
 git clone --recursive https://github.com/vgmoose/appstorenx.git