summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar mooglyguy <therealmogminer@gmail.com>2018-12-02 11:16:20 +0100
committerGravatarGravatar mooglyguy <therealmogminer@gmail.com>2018-12-02 11:16:20 +0100
commit01c57a6daa4f15ca7d559f282d73ecb33c3d37ac (patch) (github)
tree1d1aa7617a0e69af4ae7107020635f5ec8968d25
parent86224fda2b56436a3c7202d8464d40e7d28ff11b (diff)
downloadmame-android-updates.tar.bz2
mame-android-updates.zip
-toolchain.lua: Updated for latest NDK, nwandroid-updates
-http.cpp: websocket_connection_impl needs a virtual destructor, give it one. nw -posixptty.cpp: <util.h> no longer exists on Android, omit it. nw
-rw-r--r--scripts/toolchain.lua5
-rw-r--r--src/emu/http.cpp2
-rw-r--r--src/osd/modules/file/posixptty.cpp2
3 files changed, 7 insertions, 2 deletions
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 79378f83d2a..a7ba234476f 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -887,10 +887,11 @@ function toolchain(_buildDir, _subDir)
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib",
}
includedirs {
- "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/include",
+ "$(ANDROID_NDK_ROOT)/sysroot/usr/include/arm-linux-androideabi"
}
buildoptions {
"-gcc-toolchain $(ANDROID_NDK_ARM)",
+ "--sysroot=$(ANDROID_NDK_ROOT)/sysroot",
"-target armv7-none-linux-androideabi",
"-march=armv7-a",
"-mfloat-abi=softfp",
@@ -902,7 +903,7 @@ function toolchain(_buildDir, _subDir)
}
linkoptions {
"-gcc-toolchain $(ANDROID_NDK_ARM)",
- "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm",
+ "--sysroot=$(ANDROID_NDK_ROOT)/sysroot",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib/crtbegin_so.o",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib/crtend_so.o",
"-target armv7-none-linux-androideabi",
diff --git a/src/emu/http.cpp b/src/emu/http.cpp
index c6a8bc011f0..d937ddb74f8 100644
--- a/src/emu/http.cpp
+++ b/src/emu/http.cpp
@@ -248,6 +248,8 @@ struct websocket_connection_impl : public http_manager::websocket_connection {
websocket_connection_impl(webpp::ws_server *server, std::shared_ptr<webpp::Connection> connection)
: m_wsserver(server), m_connection(connection) { }
+ virtual ~websocket_connection_impl() = default;
+
/** Sends a message to the client that is connected on the other end of this Websocket connection. */
virtual void send_message(const std::string &payload, int opcode) {
if (auto connection = m_connection.lock()) {
diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp
index 3eab9e45d0c..a0ab75a4da1 100644
--- a/src/osd/modules/file/posixptty.cpp
+++ b/src/osd/modules/file/posixptty.cpp
@@ -24,7 +24,9 @@
#include <libutil.h>
#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__ANDROID__)
#include <termios.h>
+#if !defined(__ANDROID__)
#include <util.h>
+#endif
#elif defined(__linux__) || defined(EMSCRIPTEN)
#include <pty.h>
#elif defined(__HAIKU__)