separate build xml for encoding

Author: Aidan Lee

include/cpp/encoding/Ascii.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <hxcpp.h>
+
 namespace cpp
 {
 	namespace encoding

include/cpp/encoding/Utf16.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <hxcpp.h>
+
 namespace cpp
 {
 	namespace encoding

include/cpp/encoding/Utf8.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <hxcpp.h>
+
 namespace cpp
 {
 	namespace encoding

include/hxcpp.h

@@ -358,9 +358,6 @@ typedef PropertyAccessMode PropertyAccess;
 #include <cpp/marshal/PointerReference.hpp>
 #include <cpp/marshal/View.hpp>
 #include <cpp/marshal/Marshal.hpp>
-#include <cpp/encoding/Ascii.hpp>
-#include <cpp/encoding/Utf8.hpp>
-#include <cpp/encoding/Utf16.hpp>
 #include <hx/Native.h>
 #include <hx/Operators.h>
 #include <hx/Functions.h>

src/cpp/encoding/Ascii.cpp

@@ -1,4 +1,5 @@
 #include <hxcpp.h>
+#include <cpp/encoding/Ascii.hpp>
 
 using namespace cpp::marshal;
 

src/cpp/encoding/Build.xml

@@ -0,0 +1,20 @@
+<xml>
+  <pragma once="true" />
+
+  <files id="hxcpp_encoding">
+    <cache value="true" asLibrary="true" />
+
+    <compilerflag value="-I${HXCPP}/include/cpp/encoding"/>
+
+    <depend files="hxcpp-depends"/>
+    <depend name="${this_dir}/Build.xml" dateOnly="true" />
+
+    <file name="${this_dir}/Ascii.cpp"/>
+    <file name="${this_dir}/Utf8.cpp"/>
+    <file name="${this_dir}/Utf16.cpp"/>
+  </files>
+
+  <target id="haxe">
+    <files id="hxcpp_encoding"/>
+  </target>
+</xml>

src/cpp/encoding/Utf16.cpp

@@ -1,4 +1,6 @@
 #include <hxcpp.h>
+#include <cpp/encoding/Utf16.hpp>
+#include <cpp/encoding/Utf8.hpp>
 #include <array>
 
 using namespace cpp::marshal;

src/cpp/encoding/Utf8.cpp

@@ -1,4 +1,7 @@
 #include <hxcpp.h>
+#include <cpp/encoding/Ascii.hpp>
+#include <cpp/encoding/Utf8.hpp>
+#include <cpp/encoding/Utf16.hpp>
 #include <array>
 
 using namespace cpp::marshal;

toolchain/haxe-target.xml

@@ -68,9 +68,6 @@
   <depend name="${HXCPP}/include/cpp/marshal/ValueReference.hpp"/>
   <depend name="${HXCPP}/include/cpp/marshal/View.hpp"/>
   <depend name="${HXCPP}/include/cpp/marshal/Marshal.hpp"/>
-  <depend name="${HXCPP}/include/cpp/encoding/Ascii.hpp"/>
-  <depend name="${HXCPP}/include/cpp/encoding/Utf8.hpp"/>
-  <depend name="${HXCPP}/include/cpp/encoding/Utf16.hpp"/>
   <depend name="${HXCPP}/include/hx/Scriptable.h"/>
   <depend name="${HXCPP}/include/hx/zip/Zip.hpp"/>
   <depend name="${HXCPP}/include/hx/zip/Compress.hpp"/>
@@ -202,10 +199,6 @@
   <file name = "src/Math.cpp"/>
   <file name = "src/String.cpp" tags="haxe,hxstring" />
 
-  <file name = "src/cpp/encoding/Ascii.cpp"/>
-  <file name = "src/cpp/encoding/Utf8.cpp"/>
-  <file name = "src/cpp/encoding/Utf16.cpp"/>
-
   <addTwice if="linux||android" />
   <cache value="1" project="hxcpp_runtime" asLibrary="true" />
 </files>