cloudpilot-armhf.patch

diff --git a/src/Makefile b/src/Makefile
index 182dd0c..ed34a08 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,8 +1,8 @@
 -include Makefile.local

-CC_NATIVE ?= gcc
-CXX_NATIVE ?= g++
-LD_NATIVE ?= g++
+CC_NATIVE ?= clang-10
+CXX_NATIVE ?= clang++-10
+LD_NATIVE ?= clang-10 -v

 CC_EMCC ?= emcc
 CXX_EMCC ?= emcc
@@ -23,10 +23,10 @@ CXXFLAGS_NATIVE ?= $(CFLAGS_NATIVE)
 INCLUDE_EXTRA ?=

 LDFLAGS_NATIVE ?=  \
-	$(shell sdl2-config --libs) -lSDL2_image \
-	-lreadline -lboost_coroutine -lboost_json
+	-Wl,--start-group $(shell sdl2-config --libs) -lSDL2_image \
+	-lreadline -lboost_coroutine -lboost_json -Wl,--end-group -lm -ldl -lpthread -lstdc++

-CFLAGS_COMMON := -Werror -Wextra -Wall -Wno-unused-parameter -Wno-pragma-pack \
+CFLAGS_COMMON := -Wextra -Wall -Wno-unused-parameter -Wno-pragma-pack \
 	-DEMULATION_LEVEL=EMULATION_UNIX
 CXXFLAGS_COMMON := $(CFLAGS_COMMON) -std=c++17
 CFLAGS_COMMON := $(CFLAGS_COMMON) -std=c99
diff --git a/src/emulator/Fifo.cpp b/src/emulator/Fifo.cpp
index a9c75dc..9abd662 100644
--- a/src/emulator/Fifo.cpp
+++ b/src/emulator/Fifo.cpp
@@ -1,4 +1,5 @@
 #include "Fifo.h"
+#include <string.h>

 Fifo::Fifo(uint32 capacity) : capacity(capacity) {
     buffer = new uint32[capacity];
diff --git a/src/emulator/Marshall.cpp b/src/emulator/Marshall.cpp
index 2085943..e56ddd4 100644
--- a/src/emulator/Marshall.cpp
+++ b/src/emulator/Marshall.cpp
@@ -1,6 +1,7 @@
 #include "EmPalmStructs.h"
 #include "Marshal.h"
 #include "ROMStubs.h"
+#include <netinet/in.h>

 void Marshal::GetPointType(emuptr p, PointType& dest) {
     memset(&dest, 0, sizeof(PointType));
diff --git a/src/emulator/NetworkProxy.cpp b/src/emulator/NetworkProxy.cpp
index 0653475..5acd0cc 100644
--- a/src/emulator/NetworkProxy.cpp
+++ b/src/emulator/NetworkProxy.cpp
@@ -1,6 +1,7 @@
 #include "NetworkProxy.h"

 #include <memory>
+#include <netinet/in.h>

 #include "EmMemory.h"
 #include "EmSubroutine.h"
diff --git a/src/emulator/SessionImage.cpp b/src/emulator/SessionImage.cpp
index 3102a9e..5cbaa23 100644
--- a/src/emulator/SessionImage.cpp
+++ b/src/emulator/SessionImage.cpp
@@ -1,4 +1,5 @@
 #include "SessionImage.h"
+#include <string.h>

 namespace {
     constexpr uint32 MAGIC = 0x20150103;
diff --git a/src/emulator/ZipfileWalker.h b/src/emulator/ZipfileWalker.h
index a661641..b7e7931 100644
--- a/src/emulator/ZipfileWalker.h
+++ b/src/emulator/ZipfileWalker.h
@@ -2,6 +2,7 @@
 #define _ZIPFILE_WALKER_H_

 #include "EmCommon.h"
+#include <memory>

 struct zip_t;

diff --git a/src/emulator/hardware/handera/EmTRGDiskIO.cpp b/src/emulator/hardware/handera/EmTRGDiskIO.cpp
index f1dea94..9a49ba5 100644
--- a/src/emulator/hardware/handera/EmTRGDiskIO.cpp
+++ b/src/emulator/hardware/handera/EmTRGDiskIO.cpp
@@ -19,6 +19,7 @@
  * This class handles the generic low level disk access.
  ************************************************************************/
 #include <stdio.h>
+#include <string.h>

 #include "EmCommon.h"
 #include "EmTRGDiskIO.h"
diff --git a/src/emulator/hardware/handera/EmTRGSD.cpp b/src/emulator/hardware/handera/EmTRGSD.cpp
index 71aa539..cb6120b 100644
--- a/src/emulator/hardware/handera/EmTRGSD.cpp
+++ b/src/emulator/hardware/handera/EmTRGSD.cpp
@@ -12,6 +12,7 @@
 \* ===================================================================== */

 #include "EmTRGSD.h"
+#include <string.h>

 #include "EmCommon.h"

diff --git a/src/emulator/savestate/SavestateLoader.h b/src/emulator/savestate/SavestateLoader.h
index 8896944..02e0892 100644
--- a/src/emulator/savestate/SavestateLoader.h
+++ b/src/emulator/savestate/SavestateLoader.h
@@ -3,6 +3,7 @@

 #include <map>
 #include <memory>
+#include <string.h>

 #include "Chunk.h"
 #include "ChunkType.h"
diff --git a/src/emulator/suspend/SuspendContextNetworkRpc.h b/src/emulator/suspend/SuspendContextNetworkRpc.h
index 83ad58a..b081d65 100644
--- a/src/emulator/suspend/SuspendContextNetworkRpc.h
+++ b/src/emulator/suspend/SuspendContextNetworkRpc.h
@@ -2,6 +2,7 @@
 #define _SUSPEND_CONTEXT_NETWORK_RPC_H_

 #include <functional>
+#include <memory>

 #include "EmCommon.h"
 #include "SuspendContext.h"
diff --git a/src/native/Cli.cpp b/src/native/Cli.cpp
index 5569719..23212c7 100644
--- a/src/native/Cli.cpp
+++ b/src/native/Cli.cpp
@@ -18,6 +18,9 @@
 #include <thread>
 #include <vector>

+#include <condition_variable>
+#include <iterator>
+
 #include "DbBackup.h"
 #include "DbInstaller.h"
 #include "EmCommon.h"
diff --git a/src/native/main.cpp b/src/native/main.cpp
index 2f8c20c..f543caa 100644
--- a/src/native/main.cpp
+++ b/src/native/main.cpp
@@ -102,7 +102,7 @@ void run(const Options& options) {

     ScreenDimensions::Kind screenDimensionsKind = gSession->GetDevice().GetScreenDimensions();
     ScreenDimensions screenDimensions(screenDimensionsKind);
-    int scale = screenDimensionsKind == ScreenDimensions::screen160x160 ? 3 : 2;
+    int scale = 2; //screenDimensionsKind == ScreenDimensions::screen160x160 ? 3 : 2;

     if (SDL_CreateWindowAndRenderer(
             screenDimensions.Width() * scale,