From e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Tue, 7 Apr 2015 06:13:12 -0400 Subject: 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`. * 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. --- build/android/jni/Android.mk | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'build/android') 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 -- cgit v1.2.3