Skip to content
Permalink
Browse files

Always use builtin JThread library

  • Loading branch information
kwolekr committed Sep 16, 2013
1 parent 3c4734d commit d308352dbd4121d12d4f44d591463468c09d37f9

This file was deleted.

@@ -3,7 +3,6 @@ cmake_minimum_required( VERSION 2.6 )

# Set some random things default to not being visible in the GUI
mark_as_advanced(EXECUTABLE_OUTPUT_PATH LIBRARY_OUTPUT_PATH)
mark_as_advanced(JTHREAD_INCLUDE_DIR JTHREAD_LIBRARY)
mark_as_advanced(SQLITE3_INCLUDE_DIR SQLITE3_LIBRARY)
mark_as_advanced(JSON_INCLUDE_DIR JSON_LIBRARY)

@@ -169,7 +168,6 @@ else()
set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
endif()

find_package(Jthread REQUIRED)
find_package(Sqlite3 REQUIRED)
find_package(Json REQUIRED)
find_package(OpenGLES2)
@@ -225,6 +223,7 @@ configure_file(
"${PROJECT_BINARY_DIR}/cmake_config.h"
)

add_subdirectory(jthread)
add_subdirectory(script)
add_subdirectory(util)

@@ -294,6 +293,7 @@ set(common_SRCS
serverlist.cpp
pathfinder.cpp
convert_json.cpp
${JTHREAD_SRCS}
${common_SCRIPT_SRCS}
${UTIL_SRCS}
)
@@ -381,7 +381,6 @@ include_directories(
${PNG_INCLUDE_DIR}
${GETTEXT_INCLUDE_DIR}
${SOUND_INCLUDE_DIRS}
${JTHREAD_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${LUA_INCLUDE_DIR}
${JSON_INCLUDE_DIR}
@@ -416,7 +415,6 @@ if(BUILD_CLIENT)
${X11_LIBRARIES}
${GETTEXT_LIBRARY}
${SOUND_LIBRARIES}
${JTHREAD_LIBRARY}
${SQLITE3_LIBRARY}
${LUA_LIBRARY}
${JSON_LIBRARY}
@@ -447,7 +445,6 @@ if(BUILD_SERVER)
target_link_libraries(
${PROJECT_NAME}server
${ZLIB_LIBRARIES}
${JTHREAD_LIBRARY}
${SQLITE3_LIBRARY}
${JSON_LIBRARY}
${GETTEXT_LIBRARY}
@@ -622,11 +619,6 @@ endif(USE_GETTEXT)

# Subdirectories

if (JTHREAD_FOUND)
else (JTHREAD_FOUND)
add_subdirectory(jthread)
endif (JTHREAD_FOUND)

if (SQLITE3_FOUND)
else (SQLITE3_FOUND)
add_subdirectory(sqlite)
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,

#include "ban.h"
#include <fstream>
#include <jmutexautolock.h>
#include "jthread/jmutexautolock.h"
#include <sstream>
#include <set>
#include "strfnd.h"
@@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,

#include <map>
#include <string>
#include <jthread.h>
#include <jmutex.h>
#include "jthread/jthread.h"
#include "jthread/jmutex.h"
#include "exceptions.h"

class BanManager
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "client.h"
#include <iostream>
#include "clientserver.h"
#include "jmutexautolock.h"
#include "jthread/jmutexautolock.h"
#include "main.h"
#include <sstream>
#include "filesys.h"
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "connection.h"
#include "environment.h"
#include "irrlichttypes_extrabloated.h"
#include "jmutex.h"
#include "jthread/jmutex.h"
#include <ostream>
#include <map>
#include <set>
@@ -25,8 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <stdlib.h>
#include <cstring>
#include <map>
#include <jmutex.h>
#include <jmutexautolock.h>
#include "jthread/jmutex.h"
#include "jthread/jmutexautolock.h"

/*
Debug output
@@ -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}
)


@@ -29,7 +29,7 @@

#define JTHREAD_H

#include "jmutex.h"
#include "jthread/jmutex.h"

#define ERR_JTHREAD_CANTINITMUTEX -1
#define ERR_JTHREAD_CANTSTARTTHREAD -2
@@ -25,7 +25,7 @@
*/

#include "jmutex.h"
#include "jthread/jmutex.h"

JMutex::JMutex()
{
@@ -25,7 +25,7 @@
*/

#include "jthread.h"
#include "jthread/jthread.h"
#include <sys/time.h>
#include <time.h>
#include <stdlib.h>
@@ -25,7 +25,7 @@
*/

#include "jmutex.h"
#include "jthread/jmutex.h"

JMutex::JMutex()
{
@@ -25,7 +25,7 @@
*/

#include "jthread.h"
#include "jthread/jthread.h"

#ifndef _WIN32_WCE
#include <process.h>
@@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,

#include "irrlichttypes.h"
#include <string>
#include <jmutex.h>
#include <jmutexautolock.h>
#include "jthread/jmutex.h"
#include "jthread/jmutexautolock.h"
#include <map>
#include "util/timetaker.h"
#include "util/numeric.h" // paging()
@@ -18,8 +18,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/

#include "quicktune.h"
#include <jmutex.h>
#include <jmutexautolock.h>
#include "jthread/jmutex.h"
#include "jthread/jmutexautolock.h"
#include "util/string.h"

std::string QuicktuneValue::getString()
@@ -28,8 +28,8 @@ extern "C" {
}

#include "irrlichttypes.h"
#include "jmutex.h"
#include "jmutexautolock.h"
#include "jthread/jmutex.h"
#include "jthread/jmutexautolock.h"
#include "common/c_types.h"

#define SCRIPTAPI_LOCK_DEBUG
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "ban.h"
#include "environment.h"
#include "map.h"
#include "jmutexautolock.h"
#include "jthread/jmutexautolock.h"
#include "main.h"
#include "constants.h"
#include "voxel.h"
@@ -23,8 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes_bloated.h"
#include "exceptions.h"
#include <string>
#include <jmutex.h>
#include <jmutexautolock.h>
#include "jthread/jmutex.h"
#include "jthread/jmutexautolock.h"
#include "strfnd.h"
#include <iostream>
#include <fstream>
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef THREADS_HEADER
#define THREADS_HEADER

#include <jmutex.h>
#include "jthread/jmutex.h"

#if (defined(WIN32) || defined(_WIN32_WCE))
typedef DWORD threadid_t;
@@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,

#include "../irrlichttypes.h"
#include "../exceptions.h"
#include <jmutex.h>
#include <jmutexautolock.h>
#include "../jthread/jmutex.h"
#include "../jthread/jmutexautolock.h"
#include "../porting.h" // For sleep_ms
#include <list>
#include <vector>
@@ -21,9 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define UTIL_THREAD_HEADER

#include "../irrlichttypes.h"
#include <jthread.h>
#include <jmutex.h>
#include <jmutexautolock.h>
#include "../jthread/jthread.h"
#include "../jthread/jmutex.h"
#include "../jthread/jmutexautolock.h"

template<typename T>
class MutexedVariable

0 comments on commit d308352

Please sign in to comment.
You can’t perform that action at this time.