Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/ptrettner/aion

6de00aa9 · Philip Trettner · bbea44f7 · 55c5bfa9 · 6de00aa9 · 6de00aa9
Commit 6de00aa9 authored Jul 07, 2018 by Philip Trettner
Showing with 3590 additions and 3880 deletions

CMakeLists.txt CMakeLists.txt +1 -1

src/aion/common/format.cc src/aion/common/format.cc +350 -1332

src/aion/common/format.hh src/aion/common/format.hh +3239 -2547

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,6 @@ if (MSVC)
    target_compile_options(aion PUBLIC /MP)
 else()
    target_compile_options(aion PRIVATE -Wall -Werror -fPIC)
-    target_compile_options(aion PUBLIC
+    target_compile_options(aion PRIVATE
        $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>)
 endif()
--- a/src/aion/common/format.cc
+++ b/src/aion/common/format.cc
--- a/src/aion/common/format.hh
+++ b/src/aion/common/format.hh