game: mac build fixes

CMakeLists.txt

@@ -310,7 +310,11 @@ endif()
 # set boost directories early to override any /usr/local/include from elsewhere that might find boost there
 set(Boost_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/external/boost-libs/install/include)
 set(Boost_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR}/external/boost-libs/install/lib/)
+if (APPLE)
 include_directories(${Boost_INCLUDE_DIRS})
+else()
+include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+endif()
 link_directories(${Boost_LIBRARY_DIRS})
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/external/unbound)
 
@@ -904,8 +908,6 @@ set(Boost_PROGRAM_OPTIONS_LIBRARY ${Boost_LIBRARY_DIRS}/libboost_program_options
 set(Boost_SERIALIZATION_LIBRARY ${Boost_LIBRARY_DIRS}/libboost_serialization.a)
 set(Boost_THREAD_LIBRARY ${Boost_LIBRARY_DIRS}/libboost_thread.a)
 set(Boost_SYSTEM_LIBRARY ${Boost_LIBRARY_DIRS}/libboost_system.a)
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-link_directories(SYSTEM ${Boost_LIBRARY_DIRS})
 
 if(MINGW)
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")

src/game/main-urho3d.cc

@@ -3976,6 +3976,17 @@ template<> bool GetJSONValue(const JSONValue &field, unsigned long &value)
   value = ul;
   return true;
 }
+template<> bool GetJSONValue(const JSONValue &field, unsigned long long &value)
+{
+  if (!field.IsString()) return false;
+  const String s = field.GetString();
+  char *endptr = NULL;
+  errno = 0;
+  unsigned long long ull = strtoull(s.CString(), &endptr, 10);
+  if (errno || (endptr && *endptr)) return false;
+  value = ull;
+  return true;
+}
 
 template<typename T>
 T CryptoCityUrho3D::GetConfigValue(const String &filename, SharedPtr<JSONFile> &config, const char *section, const char *key, const T &default_value)

tests/performance_tests/magica.h

@@ -0,0 +1,64 @@
+// Copyright (c) 2014-2019, The Monero Project
+// 
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+// 
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+// 
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+// 
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
+
+#pragma once
+
+#include <string.h>
+#include "game/magica.h"
+
+template<bool load>
+class test_magica
+{
+public:
+  static const size_t loop_count = 1000;
+
+  bool init()
+  {
+    m.width = m.height = m.depth = 64;
+    m.data.resize(64*64*64);
+    for (size_t i = 0; i < 64*64*64; ++i)
+      m.data[i] = i;
+    return save_magica_data({m}, s);
+  }
+
+  bool test()
+  {
+    if (load)
+      return load_magica_data(mm, s);
+    else
+      return save_magica_data({m}, s);
+  }
+
+private:
+  MagicaModel m;
+  std::list<MagicaModel> mm;
+  std::string s;
+};
+