mirror of
				https://github.com/zenorogue/hyperrogue.git
				synced 2025-10-31 14:02:59 +00:00 
			
		
		
		
	Use c++14 by default
Needed for 'default value of lambda parameter'
This commit is contained in:
		
							
								
								
									
										8
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								Makefile
									
									
									
									
									
								
							| @@ -80,7 +80,7 @@ ifeq (${OS},osx) | |||||||
| endif | endif | ||||||
|  |  | ||||||
| ifeq (${TOOLCHAIN},clang) | ifeq (${TOOLCHAIN},clang) | ||||||
|   CXXFLAGS_STD = -std=c++11 |   CXXFLAGS_STD = -std=c++14 | ||||||
|   CXXFLAGS_EARLY += -fPIC |   CXXFLAGS_EARLY += -fPIC | ||||||
|   CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -pedantic |   CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -pedantic | ||||||
|   CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized -Wno-char-subscripts -Wno-unknown-warning-option |   CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized -Wno-char-subscripts -Wno-unknown-warning-option | ||||||
| @@ -88,7 +88,7 @@ ifeq (${TOOLCHAIN},clang) | |||||||
| endif | endif | ||||||
|  |  | ||||||
| ifeq (${TOOLCHAIN},gcc) | ifeq (${TOOLCHAIN},gcc) | ||||||
|   CXXFLAGS_STD = -std=c++11 |   CXXFLAGS_STD = -std=c++14 | ||||||
|   CXXFLAGS_EARLY += -fPIC |   CXXFLAGS_EARLY += -fPIC | ||||||
|   CXXFLAGS_EARLY += -W -Wall -Wextra -pedantic |   CXXFLAGS_EARLY += -W -Wall -Wextra -pedantic | ||||||
|   CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized |   CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized | ||||||
| @@ -96,7 +96,7 @@ ifeq (${TOOLCHAIN},gcc) | |||||||
| endif | endif | ||||||
|  |  | ||||||
| ifeq (${TOOLCHAIN},mingw) | ifeq (${TOOLCHAIN},mingw) | ||||||
|   CXXFLAGS_STD = -std=c++11 |   CXXFLAGS_STD = -std=c++14 | ||||||
|   CXXFLAGS_EARLY += -W -Wall -Wextra |   CXXFLAGS_EARLY += -W -Wall -Wextra | ||||||
|   CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized |   CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized | ||||||
|   CXXFLAGS_EARLY += -Wno-invalid-offsetof |   CXXFLAGS_EARLY += -Wno-invalid-offsetof | ||||||
| @@ -169,7 +169,7 @@ mymake$(EXE_EXTENSION): mymake.cpp | |||||||
| emscripten: hyper.html | emscripten: hyper.html | ||||||
|  |  | ||||||
| %.html %.js %.wasm: %.emscripten-sources | %.html %.js %.wasm: %.emscripten-sources | ||||||
| 	emcc -std=c++11 -O3 -s USE_ZLIB=1 -s LEGACY_GL_EMULATION=1 -s TOTAL_MEMORY=128MB hyperweb.cpp -o hyper.html | 	emcc -std=c++14 -O3 -s USE_ZLIB=1 -s LEGACY_GL_EMULATION=1 -s TOTAL_MEMORY=128MB hyperweb.cpp -o hyper.html | ||||||
|  |  | ||||||
| hyper.emscripten-sources: *.cpp autohdr.h | hyper.emscripten-sources: *.cpp autohdr.h | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Locria Cyber
					Locria Cyber