From 73899fc81e26797b5e60de8de3fac676373275d8 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Fri, 12 Jan 2018 17:55:43 +0500 Subject: Backported to C++14 --- CMakeLists.txt | 2 +- README.md | 4 ++-- src/DebugInfo.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e8e8c9..2033db4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(AltCraft) -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) diff --git a/README.md b/README.md index b6ffee6..813d7d1 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This is aimed at being fast, being free and being easy expandable. - [x] Compiles! - [x] Some general optimizations - [x] Some graphics and gameplay settings (mouse sensitivity, rendering distance, username, etc) -- [x] C++17 +- [x] C++14 - [x] Minecraft 1.12.1 - [ ] Decouple bundled dependencies ### Original Minecraft resources support @@ -44,7 +44,7 @@ This is aimed at being fast, being free and being easy expandable. - [ ] Optimization: Greedy mesh simplification # Build -1. Install C++17 compiler, CMake 3.8, SDL2, libZLib. +1. Install C++ compiler, CMake 3.8, SDL2, libZLIB. >Linux: GCC7 and system package manager. >Windows: Visual Studio 2017 and vcpkg. diff --git a/src/DebugInfo.cpp b/src/DebugInfo.cpp index 309c7aa..e2d439b 100644 --- a/src/DebugInfo.cpp +++ b/src/DebugInfo.cpp @@ -1,6 +1,6 @@ #include "DebugInfo.hpp" -std::atomic_int DebugInfo::totalSections = 0; -std::atomic_int DebugInfo::renderSections = 0; -std::atomic_int DebugInfo::readyRenderer = 0; -std::atomic_int DebugInfo::gameThreadTime = 0; \ No newline at end of file +std::atomic_int DebugInfo::totalSections(0); +std::atomic_int DebugInfo::renderSections(0); +std::atomic_int DebugInfo::readyRenderer(0); +std::atomic_int DebugInfo::gameThreadTime(0); \ No newline at end of file -- cgit v1.2.3