summaryrefslogtreecommitdiff
path: root/build/android/jni
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2015-04-07 06:13:12 -0400
committerShadowNinja <shadowninja@minetest.net>2015-08-23 22:04:06 -0400
commite4bff8be94c0db4f94e63ad448d0eeb869ccdbbd (patch)
tree7935586e79da5c8c7144e345a8c0fc1cda53beed /build/android/jni
parent6a1047d8c116f793890b63427d53f04ceca95d54 (diff)
downloadminetest-e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd.tar.gz
minetest-e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd.tar.bz2
minetest-e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd.zip
Clean up threading
* Rename everything. * Strip J prefix. * Change UpperCamelCase functions to lowerCamelCase. * Remove global (!) semaphore count mutex on OSX. * Remove semaphore count getter (unused, unsafe, depended on internal API functions on Windows, and used a hack on OSX). * Add `Atomic<type>`. * Make `Thread` handle thread names. * Add support for C++11 multi-threading. * Combine pthread and win32 sources. * Remove `ThreadStarted` (unused, unneeded). * Move some includes from the headers to the sources. * Move all of `Event` into its header (allows inlining with no new includes). * Make `Event` use `Semaphore` (except on Windows). * Move some porting functions into `Thread`. * Integrate logging with `Thread`. * Add threading test.
Diffstat (limited to 'build/android/jni')
-rw-r--r--build/android/jni/Android.mk15
1 files changed, 7 insertions, 8 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index 61ba1d0f0..cf7094ca8 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -342,17 +342,16 @@ LOCAL_SRC_FILES += \
jni/src/lua/src/lzio.c \
jni/src/lua/src/print.c
-# sqlite
+# SQLite3
LOCAL_SRC_FILES += deps/sqlite/sqlite3.c
-# jthread
-LOCAL_SRC_FILES += \
- jni/src/jthread/pthread/jevent.cpp \
- jni/src/jthread/pthread/jmutex.cpp \
- jni/src/jthread/pthread/jsemaphore.cpp \
- jni/src/jthread/pthread/jthread.cpp
+# Threading
+LOCAL_SRC_FILES += \
+ jni/src/threading/Mutex.cpp \
+ jni/src/threading/Semaphore.cpp \
+ jni/src/threading/Thread.cpp
-# json
+# JSONCPP
LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp
LOCAL_SHARED_LIBRARIES := iconv openal ogg vorbis gmp