mapeditor changes

src/framework/application.h

@@ -71,6 +71,7 @@ public:
     std::string getBuildRevision() { return BUILD_REVISION; }
     std::string getBuildCommit() { return BUILD_COMMIT; }
     std::string getBuildType() { return BUILD_TYPE; }
+    std::string getBuildArch() { return BUILD_ARCH; }
     std::string getStartupOptions() { return m_startupOptions; }
 
 protected:

src/framework/const.h

@@ -29,8 +29,8 @@
 #define BUILD_COMPILER "gcc " __VERSION__
 #define BUILD_DATE __DATE__
 
-    #ifndef BUILD_COMMIT
-#define BUILD_COMMIT "custom"
+#ifndef BUILD_COMMIT
+#define BUILD_COMMIT "devel"
 #endif
 
 #ifndef BUILD_REVISION
@@ -41,6 +41,16 @@
 #define BUILD_TYPE "unknown"
 #endif
 
+#ifndef BUILD_ARCH
+#if defined(__amd64) || defined(_M_X64)
+#define BUILD_ARCH "x64"
+#elif defined(__i386) || defined(_M_IX86) || defined(_X86_)
+#define BUILD_ARCH "X86"
+#else
+#define BUILD_ARCH "unknown"
+#endif
+#endif
+
 namespace Fw
 {
     constexpr float pi = 3.14159265;
@@ -207,7 +217,7 @@ namespace Fw
         AnchorLeft,
         AnchorRight,
         AnchorVerticalCenter,
-        AnchorHorizontalCenter,
+        AnchorHorizontalCenter
     };
 
     enum FocusReason {

src/framework/core/filestream.h

@@ -59,6 +59,8 @@ public:
     void addU32(uint32 v);
     void addU64(uint64 v);
     void addString(const std::string& v);
+    void startNode(uint8 nodeType) { addU8(0xFE); addU8(nodeType); }
+    void endNode() { addU8(0xFF); }
 
     FileStreamPtr asFileStream() { return std::static_pointer_cast<FileStream>(shared_from_this()); }
 

src/framework/luafunctions.cpp

@@ -501,6 +501,7 @@ void Application::registerLuaFunctions()
     g_lua.bindSingletonFunction("g_app", "getBuildRevision", &Application::getBuildRevision, &g_app);
     g_lua.bindSingletonFunction("g_app", "getBuildCommit", &Application::getBuildCommit, &g_app);
     g_lua.bindSingletonFunction("g_app", "getBuildType", &Application::getBuildType, &g_app);
+    g_lua.bindSingletonFunction("g_app", "getBuildArch", &Application::getBuildArch, &g_app);
     g_lua.bindSingletonFunction("g_app", "exit", &Application::exit, &g_app);
 
     // ConfigManager

src/framework/pch.h

@@ -64,7 +64,7 @@
 #include <boost/algorithm/string.hpp>
 
 // tiny XML
-#define TIXML_USE_STL
+#define TIXML_USE_STL // use std::string's instead
 #include <framework/thirdparty/tinyxml.h>
 
 #endif