From d308352dbd4121d12d4f44d591463468c09d37f9 Mon Sep 17 00:00:00 2001
From: kwolekr <kwolekr@minetest.net>
Date: Sun, 15 Sep 2013 23:00:01 -0400
Subject: Always use builtin JThread library

---
 src/jthread/CMakeLists.txt      | 21 ++++++++-------------
 src/jthread/jthread.h           |  2 +-
 src/jthread/pthread/jmutex.cpp  |  2 +-
 src/jthread/pthread/jthread.cpp |  2 +-
 src/jthread/win32/jmutex.cpp    |  2 +-
 src/jthread/win32/jthread.cpp   |  2 +-
 6 files changed, 13 insertions(+), 18 deletions(-)

(limited to 'src/jthread')

diff --git a/src/jthread/CMakeLists.txt b/src/jthread/CMakeLists.txt
index be38f87f3..aa438eaaf 100644
--- a/src/jthread/CMakeLists.txt
+++ b/src/jthread/CMakeLists.txt
@@ -1,16 +1,11 @@
 if( UNIX )
-	set(jthread_SRCS pthread/jmutex.cpp pthread/jthread.cpp)
-	set(jthread_platform_LIBS "")
+	set(JTHREAD_SRCS
+		${CMAKE_CURRENT_SOURCE_DIR}/pthread/jmutex.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/pthread/jthread.cpp
+		PARENT_SCOPE)
 else( UNIX )
-	set(jthread_SRCS win32/jmutex.cpp win32/jthread.cpp)
-	set(jthread_platform_LIBS "")
+	set(JTHREAD_SRCS
+		${CMAKE_CURRENT_SOURCE_DIR}/win32/jmutex.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/win32/jthread.cpp
+		PARENT_SCOPE)
 endif( UNIX )
-
-add_library(jthread ${jthread_SRCS})
-
-target_link_libraries(
-	jthread
-	${jthread_platform_LIBS}
-)
-
-
diff --git a/src/jthread/jthread.h b/src/jthread/jthread.h
index cd78231e9..ec1eafaeb 100644
--- a/src/jthread/jthread.h
+++ b/src/jthread/jthread.h
@@ -29,7 +29,7 @@
 
 #define JTHREAD_H
 
-#include "jmutex.h"
+#include "jthread/jmutex.h"
 
 #define ERR_JTHREAD_CANTINITMUTEX						-1
 #define ERR_JTHREAD_CANTSTARTTHREAD						-2
diff --git a/src/jthread/pthread/jmutex.cpp b/src/jthread/pthread/jmutex.cpp
index 6bc3ae5e2..29e0baac0 100644
--- a/src/jthread/pthread/jmutex.cpp
+++ b/src/jthread/pthread/jmutex.cpp
@@ -25,7 +25,7 @@
 
 */
 
-#include "jmutex.h"
+#include "jthread/jmutex.h"
 
 JMutex::JMutex()
 {
diff --git a/src/jthread/pthread/jthread.cpp b/src/jthread/pthread/jthread.cpp
index 4a5c736eb..0ef250825 100644
--- a/src/jthread/pthread/jthread.cpp
+++ b/src/jthread/pthread/jthread.cpp
@@ -25,7 +25,7 @@
 
 */
 
-#include "jthread.h"
+#include "jthread/jthread.h"
 #include <sys/time.h>
 #include <time.h>
 #include <stdlib.h>
diff --git a/src/jthread/win32/jmutex.cpp b/src/jthread/win32/jmutex.cpp
index 000461e3b..d079d448d 100644
--- a/src/jthread/win32/jmutex.cpp
+++ b/src/jthread/win32/jmutex.cpp
@@ -25,7 +25,7 @@
 
 */
 
-#include "jmutex.h"
+#include "jthread/jmutex.h"
 
 JMutex::JMutex()
 {
diff --git a/src/jthread/win32/jthread.cpp b/src/jthread/win32/jthread.cpp
index c07425dca..48b83b894 100644
--- a/src/jthread/win32/jthread.cpp
+++ b/src/jthread/win32/jthread.cpp
@@ -25,7 +25,7 @@
 
 */
 
-#include "jthread.h"
+#include "jthread/jthread.h"
 
 #ifndef _WIN32_WCE
 	#include <process.h>
-- 
cgit v1.2.3