Use PortableBinary archives

opatut · Mar 6, 2014 · 1448df2 · 1448df2
1 parent b031fb4
commit 1448df2
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -3,10 +3,21 @@ default: compile run
 
 compile:
 	mkdir -p build
-	cd build && cmake .. && make -j$(shell nproc)
+	cd build && \
+		cmake .. && \
+		make -j$(shell nproc)
 
 run:
 	bin/arachnonoia
 
+win64:
+	mkdir -p build-win64
+	cd build-win64 && \
+		x86_64-w64-mingw32-cmake \
+			-DCMAKE_CXX_FLAGS="-DSFML_STATIC -DFLT_EPSILON=__FLT_EPSILON__" \
+			-DGLM_INCLUDE_DIR=/usr/include/ \
+			.. && \
+			make -j$(shell nproc) -j1 VERBOSE=1
+
 clean:
-	rm -r build bin
+	rm -rf build build-win64 bin
diff --git a/levels/jump-1.dat b/levels/jump-1.dat
diff --git a/levels/jump-2.dat b/levels/jump-2.dat
diff --git a/levels/pairs.dat b/levels/pairs.dat
diff --git a/levels/spawn.dat b/levels/spawn.dat
diff --git a/levels/upside-down.dat b/levels/upside-down.dat
diff --git a/levels/walls.dat b/levels/walls.dat
diff --git a/src/CerealTypes.cpp b/src/CerealTypes.cpp
@@ -5,6 +5,7 @@
 #include "Marker.hpp"
 
 #include <cereal/archives/binary.hpp>
+#include <cereal/archives/portable_binary.hpp>
 #include <cereal/archives/xml.hpp>
 #include <cereal/archives/json.hpp>
 
@@ -15,4 +16,3 @@ CEREAL_REGISTER_TYPE(Wall)
 CEREAL_REGISTER_TYPE(Pair)
 CEREAL_REGISTER_TYPE(CollisionShape)
 CEREAL_REGISTER_TYPE(Marker)
-
diff --git a/src/State.cpp b/src/State.cpp
@@ -6,6 +6,7 @@
 #include <fstream>
 #include <cereal/archives/json.hpp>
 #include <cereal/archives/binary.hpp>
+#include <cereal/archives/portable_binary.hpp>
 #include <cereal/types/vector.hpp>
 #include <cereal/types/memory.hpp>
 
@@ -223,7 +224,7 @@ void State::loadFromFile(const std::string& filename) {
         cereal::JSONInputArchive ar(stream);
         ar(cereal::make_nvp("entities", m_entities));
     } else {
-        cereal::BinaryInputArchive ar(stream);
+        cereal::PortableBinaryInputArchive ar(stream);
         ar(cereal::make_nvp("entities", m_entities));
     }
     stream.close();
@@ -245,7 +246,7 @@ void State::saveToFile(const std::string& filename) {
         cereal::JSONOutputArchive ar(stream);
         ar(cereal::make_nvp("entities", m_entities));
     } else {
-        cereal::BinaryOutputArchive ar(stream);
+        cereal::PortableBinaryOutputArchive ar(stream);
         ar(cereal::make_nvp("entities", m_entities));
     }