Merge lp:~armagetronad-dev/armagetronad/trunk-armagetronad-boostthread into lp:~armagetronad-dev/armagetronad/trunk-armagetronad-work

[Manuel Moos]

Switching from zthread to boost::thread which is better maintained and easier to install on Unix.
Windows is a little bit of a PITA, but only for the winlibs maintainer (the static library needs to be built with bjam, which first needs to be compiled itself), no change for the game builder, though.

Left todo: the mac side. For the time being, the bits we use can be emulated by a tiny pthread wrapper in the main source which should work fine (we're just using threads, two mutex types and two lock types), but it's only a matter of time before someone gets the idea to use futures and whatnot.

[lp:~armagetronad-dev/armagetronad/trunk-armagetronad-boostthread]

1076. By dlh on 2011-09-11

Add new thread files to Mac OS X project.

1077. By dlh on 2011-09-11

Use pthreads. Building the boost thread library as a universal binary supporting Mac OS X 10.4 is tricky...

1078. By dlh on 2011-09-11

Enable authentication for Mac OS X dedicated servers

[dlh (dlh)]

review: Approve

=== modified file 'MacOS/Armagetron Advanced.xcodeproj/project.pbxproj'
--- MacOS/Armagetron Advanced.xcodeproj/project.pbxproj	2011-08-01 00:57:22 +0000
+++ MacOS/Armagetron Advanced.xcodeproj/project.pbxproj	2011-09-11 04:47:25 +0000
@@ -136,6 +136,8 @@
 		9B9755160F44B0DE00E41662 /* nBinary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B9755140F44B0DE00E41662 /* nBinary.cpp */; };
 		9B9755170F44B0DE00E41662 /* nBinary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9B9755140F44B0DE00E41662 /* nBinary.cpp */; };
 		9B97553D0F44B3EC00E41662 /* libarmaprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B97546A0F44AA2700E41662 /* libarmaprotobuf.a */; };
+		9BB084E4141C5FED009B30D0 /* tMutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB084E1141C5FED009B30D0 /* tMutex.cpp */; };
+		9BB084E5141C5FED009B30D0 /* tMutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB084E1141C5FED009B30D0 /* tMutex.cpp */; };
 		9BB7B4000D8246A2004FE8C3 /* config in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BD7DAE20A2CAE0700D7033C /* config */; };
 		9BB7B4010D8246A2004FE8C3 /* language in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BD7DAFE0A2CAE1D00D7033C /* language */; };
 		9BB7B5E10D8302FA004FE8C3 /* eAdvWall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9BB7B5A60D8302FA004FE8C3 /* eAdvWall.cpp */; };
@@ -631,6 +633,10 @@
 		9B9755140F44B0DE00E41662 /* nBinary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nBinary.cpp; sourceTree = "<group>"; };
 		9B9755150F44B0DE00E41662 /* nBinary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nBinary.h; sourceTree = "<group>"; };
 		9B9E56300D81D962008DD17D /* shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = shared.xcconfig; sourceTree = "<group>"; };
+		9BB084E0141C5FED009B30D0 /* tLockedQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tLockedQueue.h; sourceTree = "<group>"; };
+		9BB084E1141C5FED009B30D0 /* tMutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tMutex.cpp; sourceTree = "<group>"; };
+		9BB084E2141C5FED009B30D0 /* tMutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tMutex.h; sourceTree = "<group>"; };
+		9BB084E3141C5FED009B30D0 /* tThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tThread.h; sourceTree = "<group>"; };
 		9BB5B9240D84604400BF5F1C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../src/macosx/Info.plist; sourceTree = SOURCE_ROOT; };
 		9BB5B9270D84605700BF5F1C /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = English; path = InfoPlist.strings.in; sourceTree = "<group>"; };
 		9BB7B5A60D8302FA004FE8C3 /* eAdvWall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eAdvWall.cpp; sourceTree = "<group>"; };
@@ -1421,11 +1427,14 @@
 				9BB7B7C50D830422004FE8C3 /* tList.h */,
 				9BB7B7C60D830422004FE8C3 /* tLocale.cpp */,
 				9BB7B7C70D830422004FE8C3 /* tLocale.h */,
+				9BB084E0141C5FED009B30D0 /* tLockedQueue.h */,
 				9BB7B7C80D830422004FE8C3 /* tMath.h */,
 				9BB7B7C90D830422004FE8C3 /* tMemManager.cpp */,
 				9BB7B7CA0D830422004FE8C3 /* tMemManager.h */,
 				9BB7B7CB0D830422004FE8C3 /* tMemStack.cpp */,
 				9BB7B7CC0D830422004FE8C3 /* tMemStack.h */,
+				9BB084E1141C5FED009B30D0 /* tMutex.cpp */,
+				9BB084E2141C5FED009B30D0 /* tMutex.h */,
 				9BB7B7CD0D830422004FE8C3 /* tPlayList.cpp */,
 				9BB7B7CE0D830422004FE8C3 /* tPlayList.h */,
 				9B9754D90F44AFB700E41662 /* tPolynomial.cpp */,
@@ -1457,6 +1466,7 @@
 				9BB7B7EA0D830422004FE8C3 /* tString.h */,
 				9BB7B7EB0D830422004FE8C3 /* tSysTime.cpp */,
 				9BB7B7EC0D830422004FE8C3 /* tSysTime.h */,
+				9BB084E3141C5FED009B30D0 /* tThread.h */,
 				9BB7B7ED0D830422004FE8C3 /* tToDo.cpp */,
 				9BB7B7EE0D830422004FE8C3 /* tToDo.h */,
 				9BB7B7EF0D830422004FE8C3 /* tValue.h */,
@@ -2035,6 +2045,7 @@
 				9B62588C0F5865410083C429 /* zFortress.cpp in Sources */,
 				9B62588D0F5865410083C429 /* zTimedZone.cpp in Sources */,
 				9B0C8B3E0F7EBA78001802CD /* eChat.cpp in Sources */,
+				9BB084E5141C5FED009B30D0 /* tMutex.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2202,6 +2213,7 @@
 				9B62588A0F5865410083C429 /* zFortress.cpp in Sources */,
 				9B62588B0F5865410083C429 /* zTimedZone.cpp in Sources */,
 				9B0C8B3D0F7EBA78001802CD /* eChat.cpp in Sources */,
+				9BB084E4141C5FED009B30D0 /* tMutex.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

=== modified file 'acinclude.m4'
--- acinclude.m4	2009-07-15 07:17:41 +0000
+++ acinclude.m4	2011-09-11 04:47:25 +0000
@@ -555,230 +555,6 @@
         fi
 ])
 
-dnl Modified ZThread test follows. This one works, AM_PATH_ZTHREAD alone does not.
-dnl Changes: hacked compiler temporarily to use CXX instead of CC
-dnl          added zthread/ to include path
-dnl          added #include "zthread/Task.h" and #include "zthread/Thread.h"
-dnl          added HAVE_LIBZTHREAD define
-
-dnl Copyright (c) 2005, Eric Crahen
-dnl
-dnl Permission is hereby granted, free of charge, to any person obtaining a copy
-dnl of this software and associated documentation files (the "Software"), to deal
-dnl in the Software without restriction, including without limitation the rights
-dnl to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-dnl copies of the Software, and to permit persons to whom the Software is furnished
-dnl to do so, subject to the following conditions:
-dnl 
-dnl The above copyright notice and this permission notice shall be included in all
-dnl copies or substantial portions of the Software.
-dnl 
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-dnl AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-dnl WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-dnl CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-dnl Detect the library and include paths for ZThreads, perform some test
-dnl compilations.
-dnl
-dnl Should be used in AC_PROG_CC mode before the swtich to C++ if any is made
-dnl (eg before AC_LANG_CPLUSPLUS)
-dnl
-dnl --with-zthread-prefix : Skip detection, use this general path
-dnl --with-zthread-exec-prefix : Skip detecting the zthread-config tool
-dnl 
-dnl Sets the following variables.
-dnl
-dnl ZTHREAD_CXXFLAGS
-dnl ZTHREAD_LIBS
-dnl 
-AC_DEFUN([AM_PATH_ZTHREAD_AA],
-[
-
-
-AC_ARG_WITH(zthread-prefix,[  --with-zthread-prefix=PFX   Prefix where ZTHREAD is installed (optional)],
-            zthread_prefix="$withval", zthread_prefix="")
-AC_ARG_WITH(zthread-exec-prefix,[  --with-zthread-exec-prefix=PFX Exec prefix where ZTHREAD is installed (optional)],
-            zthread_exec_prefix="$withval", zthread_exec_prefix="")
-AC_ARG_ENABLE(zthreadtest, [  --disable-zthreadtest       Do not try to compile and run a test ZTHREAD program],
-		    , enable_zthreadtest=yes)
-
-  if test x$zthread_exec_prefix != x ; then
-     zthread_args="$zthread_args --exec-prefix=$zthread_exec_prefix"
-     if test x${ZTHREAD_CONFIG+set} != xset ; then
-        ZTHREAD_CONFIG=$zthread_exec_prefix/bin/zthread-config
-     fi
-  fi
-  if test x$zthread_prefix != x ; then
-     zthread_args="$zthread_args --prefix=$zthread_prefix"
-     if test x${ZTHREAD_CONFIG+set} != xset ; then
-        ZTHREAD_CONFIG=$zthread_prefix/bin/zthread-config
-     fi
-  fi
-
-  AC_PATH_PROG(ZTHREAD_CONFIG, zthread-config, no)
-  min_zthread_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for ZTHREAD - version >= $min_zthread_version)
-  no_zthread=""
-  if test "$ZTHREAD_CONFIG" = "no" ; then
-    no_zthread=yes
-  else
-    ZTHREAD_CXXFLAGS=`$ZTHREAD_CONFIG $zthreadconf_args --cflags`
-    ZTHREAD_LIBS=`$ZTHREAD_CONFIG $zthreadconf_args --libs`
-
-    zthread_major_version=`$ZTHREAD_CONFIG $zthread_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    zthread_minor_version=`$ZTHREAD_CONFIG $zthread_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    zthread_micro_version=`$ZTHREAD_CONFIG $zthread_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_zthreadtest" = "xyes" ; then
-      ac_save_CXXFLAGS="$CXXFLAGS"
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CXXFLAGS="$CXXFLAGS $ZTHREAD_CXXFLAGS"
-      CFLAGS="$CFLAGS $ZTHREAD_CXXFLAGS"
-      LIBS="$LIBS $ZTHREAD_LIBS"
-
-dnl
-dnl Now check if the installed ZTHREAD is sufficiently new. (Also sanity
-dnl checks the results of zthread-config to some extent
-dnl
-      rm -f conf.zthreadtest
-      CC_OLD=${CC}
-      CC=${CXX}
-      for extra_flags in "NONE" "-fpermissive"; do
-        if test NONE != ${extra_flags}; then
-          ZTHREAD_CXXFLAGS="$ZTHREAD_CXXFLAGS ${extra_flags}"
-          CXXFLAGS="$CXXFLAGS ${extra_flags}"
-          CFLAGS="$CFLAGS ${extra_flags}"
-        fi
-        if test "x$no_zthread" = xyes || test NONE = ${extra_flags} ; then
-        no_zthread=""
-        AC_TRY_RUN([
-
-
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "zthread/Task.h"
-#include "zthread/Thread.h"
-#include "zthread/ZThread.h"
-
-int main (int argc, char *argv[]) {
-
-  int major, minor, micro;
-  char tmp_version[256];
-
-  { FILE *fp = fopen("conf.zthreadtest", "a"); if ( fp ) fclose(fp); }
-
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  strcpy(tmp_version, "$min_zthread_version");
-  
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-
-    printf("%s, bad version string\n", "$min_zthread_version");
-    return 1;
-
-  }
-
-  if (($zthread_major_version > major) ||
-     (($zthread_major_version == major) && ($zthread_minor_version > minor)) ||
-     (($zthread_major_version == major) && ($zthread_minor_version == minor) && 
-     ($zthread_micro_version >= micro))) {
-      return 0;
-  } else {
-
-    printf("\n*** 'zthread-config --version' returned %d.%d.%d, but the minimum version\n", $zthread_major_version, $zthread_minor_version, $zthread_micro_version);
-    printf("*** of ZThread required is %d.%d.%d. If zthread-config is correct, then it is\n", major, minor, micro);
-    printf("*** best to upgrade to the required version.\n");
-    printf("*** If zthread-config was wrong, set the environment variable ZTHREAD_CONFIG\n");
-    printf("*** to point to the correct copy of zthread-config, and remove the file\n");
-    printf("*** config.cache before re-running configure\n");
-
-    return 1;
-  }
-
-}
-
-],, no_zthread=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-      fi
-    done
-    CC=${CC_OLD}
-    CXXFLAGS="$ac_save_CXXFLAGS"
-    LIBS="$ac_save_LIBS"
-    fi
-  fi
-
-  if test "x$no_zthread" = x ; then
-    
-     AC_DEFINE(HAVE_LIBZTHREAD,[], [Define if you have the library ZThread.])
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-
-  else
-
-     AC_MSG_RESULT(no)
-
-     if test "$ZTHREAD_CONFIG" = "no" ; then
-
-       echo "*** The zthread-config script installed by ZThread could not be found"
-       echo "*** If ZThread was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the ZTHREAD_CONFIG environment variable to the"
-       echo "*** full path to zthread-config."
-
-     else
-       if test -f conf.zthreadtest ; then
-        :
-       else
-
-          echo "*** Could not run ZThread test program, checking why..."
-          CC_OLD=${CC}
-          CC=${CXX}
-          CXXFLAGS="$CXXFLAGS $ZTHREAD_CXXFLAGS"
-          LIBS="$LIBS $ZTHREAD_LIBS"
-
-          echo $LIBS;
-
-          AC_TRY_LINK([#include "zthread/Task.h"], 
-                      [ return 0; ], [
-          echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding ZThread or finding the wrong"
-          echo "*** version of ZThread. If it is not finding ZThread, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	        echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means ZThread was incorrectly installed"
-          echo "*** or that you have moved ZThread since it was installed. In the latter case, you"
-          echo "*** may want to edit the zthread-config script: $ZTHREAD_CONFIG" ])
-
-          CC=${CC_OLD}
-          CFLAGS="$ac_save_CFLAGS"
-          CXXFLAGS="$ac_save_CXXFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-
-     ZTHREAD_CXXFLAGS=""
-     ZTHREAD_LIBS=""
-     ifelse([$3], , :, [$3])
-
-  fi
-
-  AC_SUBST(ZTHREAD_CXXFLAGS)
-  AC_SUBST(ZTHREAD_LIBS)
-
-  rm -f conf.zthreadtest
-
-])
-
 dnl Copyright © 2008 Steven G. Johnson <[e-mail]> 
 dnl This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. 
 dnl This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. 

=== modified file 'configure.ac'
--- configure.ac	2011-08-26 15:34:37 +0000
+++ configure.ac	2011-09-11 04:47:25 +0000
@@ -670,26 +670,25 @@
 
 AC_LANG([C++])
 
+AC_CHECK_LIB([boost_thread],_ZNK5boost6thread6get_idEv,,[
+
 ACX_PTHREAD([
 
 LIBS="${PTHREAD_LIBS} ${LIBS}"
 CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}"
 CC="${PTHREAD_CC}"
-dnl AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.])
-
-],[
-
-AM_PATH_ZTHREAD_AA(2.3.2)
-CXXFLAGS="${CXXFLAGS} ${ZTHREAD_CXXFLAGS}"
-LIBS="${LIBS} ${ZTHREAD_LIBS}"
+AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.])
+
+],)
 
 ])
 
-fi # krawall
+
+fi # armathentication
 
 
 dnl *************************************************
-dnl         pattern buffers
+dnl         protocol buffers
 dnl *************************************************
 
 dnl check for compiler

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-08-26 13:48:33 +0000
+++ src/Makefile.am	2011-09-11 04:47:25 +0000
@@ -89,6 +89,9 @@
 	tools/tRectangle.h tools/tRectangle.cpp \
 	tools/tPlayList.h tools/tPlayList.cpp\
 	tools/tDecorator.h tools/tDecorator.cpp\
+	tools/tMutex.h tools/tMutex.cpp\
+	tools/tThread.h\
+	tools/tLockedQueue.h\
 	tools/tCoord.h tools/tCoord.cpp\
 	tools/tValue.h tools/tValueParser.h\
 	tools/tFunction.h tools/tFunction.cpp\

=== modified file 'src/macosx/config_common.h'
--- src/macosx/config_common.h	2008-03-09 18:02:20 +0000
+++ src/macosx/config_common.h	2011-09-11 04:47:25 +0000
@@ -174,3 +174,6 @@
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
+
+//#define HAVE_LIBBOOST_THREAD 1
+#define HAVE_PTHREAD 1

=== modified file 'src/macosx/dedicated/aa_config.h'
--- src/macosx/dedicated/aa_config.h	2006-11-11 13:12:48 +0000
+++ src/macosx/dedicated/aa_config.h	2011-09-11 04:47:25 +0000
@@ -2,3 +2,4 @@
 
 #define USER_DATA_DIR "~/Library/Application Support/Armagetron Advanced Dedicated"
 #define DEDICATED 1
+#define KRAWALL_SERVER 1

=== modified file 'src/network/nAuthentication.cpp'
--- src/network/nAuthentication.cpp	2011-01-01 18:14:12 +0000
+++ src/network/nAuthentication.cpp	2011-09-11 04:47:25 +0000
@@ -46,26 +46,10 @@
 
 #include <deque>
 
-#ifdef HAVE_LIBZTHREAD
-#include <zthread/Thread.h>
-#include <zthread/LockedQueue.h>
-//#include <zthread/ClassLockable.h>
-#include <zthread/FastMutex.h>
-#include <zthread/FastRecursiveMutex.h>
-#include <zthread/Guard.h>
-// #include <zthread/SynchronousExecutor.h>
-#include <zthread/ThreadedExecutor.h>
-typedef ZThread::ThreadedExecutor nExecutor;
-//typedef ZThread::SynchronousExecutor nExecutor;
-typedef ZThread::FastMutex nMutex;
-#define nQueue ZThread::LockedQueue
-#elif defined(HAVE_PTHREAD)
-#include "pthread-binding.h"
-typedef tPThreadMutex nMutex;
-#define nQueue tPThreadQueue
-#else
-typedef tNonMutex nMutex;
-#endif
+#include "tLockedQueue.h"
+
+#include "tThread.h"
+#include "tMutex.h"
 
 bool sn_supportRemoteLogins = false;
 
@@ -216,17 +200,8 @@
 
 //! template that runs void member functions of reference countable objects
 template< class T > class nMemberFunctionRunnerTemplate
-#ifdef HAVE_LIBZTHREAD
-    : public ZThread::Runnable
-#endif
 {
 private:
-#if defined(HAVE_PTHREAD) && !defined(HAVE_LIBZTHREAD)
-    static void* DoCall( void *o ) {
-        nMemberFunctionRunnerTemplate * functionRunner = (nMemberFunctionRunnerTemplate*) o;
-        ( (functionRunner->object_)->*(functionRunner->function_) )();
-    }
-#endif
 public:
     nMemberFunctionRunnerTemplate( T & object, void (T::*function)() )
     : object_( &object ), function_( function )
@@ -239,6 +214,11 @@
         (object_->*function_)();
     }
 
+    void operator () ()
+    {
+        run();
+    }
+
     //! schedule a task for execution at the next convenient break, between game rounds for example
     static void ScheduleBreak( T & object, void (T::*function)()  )
     {
@@ -248,19 +228,15 @@
     //! schedule a task for execution in a background thread
     static void ScheduleBackground( T & object, void (T::*function)()  )
     {
-#if defined(HAVE_LIBZTHREAD) || defined(HAVE_PTHREAD)
+        bool delays = true;
+#ifdef HAVE_THREADS
+        delays = tRecorder::IsRunning();
+#endif
+
         // schedule the task into a background thread
-        if ( !tRecorder::IsRunning() )
+        if ( !delays )
         {
-#if !defined(HAVE_LIBZTHREAD)
-            nMemberFunctionRunnerTemplate<T> * runner = new nMemberFunctionRunnerTemplate<T>( object, function );
-
-            pthread_t thread;
-            pthread_create(&thread, NULL, (nMemberFunctionRunnerTemplate::DoCall), (void*) runner);
-#else
-            static nExecutor executor;
-            executor.execute( ZThread::Task( new nMemberFunctionRunnerTemplate( object, function ) ) );
-#endif
+            boost::thread(nMemberFunctionRunnerTemplate<T>( object, function ) );
         }
         else
         {
@@ -268,23 +244,13 @@
             ScheduleBreak( object, function );
 
         }
-#else
-        // do it when you can without getting interrupted.
-        ScheduleBreak( object, function );
-#endif
     }
 
     //! schedule a task for execution in the next tToDo call
     static void ScheduleForeground( T & object, void (T::*function)()  )
     {
-#if defined(HAVE_LIBZTHREAD) || defined(HAVE_PTHREAD)
         Pending().add( nMemberFunctionRunnerTemplate( object, function ) );
         st_ToDo( FinishAll );
-#else
-        // execute it immedeately
-        (object.*function)();
-#endif
-
     }
 
     // function that calls tasks scheduled for the next break
@@ -314,25 +280,32 @@
     // taks for the break
     static std::deque< nMemberFunctionRunnerTemplate > pendingForBreak_;
 
-#if defined(HAVE_LIBZTHREAD) || defined(HAVE_PTHREAD)
+    typedef tLockedQueue< nMemberFunctionRunnerTemplate, boost::mutex > LockedQueue;
+
     // queue of foreground tasks
-    static nQueue< nMemberFunctionRunnerTemplate, nMutex > & Pending()
+    static LockedQueue & Pending()
     {
-        static nQueue< nMemberFunctionRunnerTemplate, nMutex > pending;
+        static LockedQueue pending;
         return pending;
     }
 
     // function that calls them
     static void FinishAll()
     {
-        // finish all pending tasks
-        while( Pending().size() > 0 )
-        {
-            nMemberFunctionRunnerTemplate next = Pending().next();
-            next.run();
+        try
+        {
+            // finish all pending tasks
+            while( Pending().size() > 0 )
+            {
+                nMemberFunctionRunnerTemplate next = Pending().next();
+                next.run();
+            }
+        }
+        catch( typename LockedQueue::Empty const & e )
+        {
+            // ignore, we just read over the end. No biggie.
         }
     }
-#endif
 };
 
 template< class T >
@@ -369,7 +342,7 @@
     {
         if ( block )
         {
-#if defined(HAVE_LIBZTHREAD) || defined(HAVE_PTHREAD)
+#ifdef HAVE_THREADS
             ScheduleBackground( object, function );
 #else
             ScheduleBreak( object, function );
@@ -388,7 +361,7 @@
     public nMachineDecorator, 
     public nKrawall::nCheckResult,
     public nKrawall::nPasswordCheckData,
-    public tReferencable< nLoginProcess, nMutex >
+    public tReferencable< nLoginProcess, boost::mutex >
 {
     // reference counting pointer 
     typedef tJUST_CONTROLLED_PTR< nLoginProcess > SelfPointer;
@@ -400,9 +373,9 @@
         // install self reference to keep this object alive
         selfReference_ = this;
 
-    // inform the user about delays
-        bool delays = false;
-#if defined(HAVE_LIBZTHREAD) || defined(HAVE_PTHREAD)
+        // inform the user about delays
+        bool delays = true;
+#ifdef HAVE_THREADS
         delays = tRecorder::IsRunning();
 #endif
         if ( delays )

=== removed file 'src/tools/pthread-binding.h'
--- src/tools/pthread-binding.h	2008-12-29 17:15:32 +0000
+++ src/tools/pthread-binding.h	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-#include <deque>
-#include <pthread.h>
-#include <stdexcept>
-
-class tPThreadMutex
-{
-private:
-    pthread_mutex_t mutex;
-public:
-    tPThreadMutex() {
-        // TODO: error checking
-        pthread_mutex_init(&mutex, NULL);
-    }
-    void acquire() {
-        pthread_mutex_lock(&mutex);
-    };
-    void release() {
-        pthread_mutex_unlock(&mutex);
-    };
-};
-
-class tPThreadRecursiveMutex
- : public tPThreadMutex
-{
-private:
-    pthread_mutex_t mutex;
-public:
-    tPThreadRecursiveMutex() {
-        // TODO: error checking
-        pthread_mutexattr_t mta;
-        
-        pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_RECURSIVE);
-        pthread_mutex_init(&mutex, &mta);
-    }
-};
-
-template <class T>
-class tPThreadGuard
-{
-private:
-    T*mutex;
-public:
-    tPThreadGuard(T*m) {
-        mutex = m;
-        mutex->acquire();
-    };
-    ~tPThreadGuard() {
-        mutex->release();
-    };
-};
-
-template <class T, class MutexT>
-class tPThreadQueue
-{
-    MutexT mutex;
-    std::deque<T> q;
-public:
-    virtual void add(const T& item) {
-        tPThreadGuard<MutexT> mL(&mutex);
-        
-        q.push_back(item);
-    }
-    
-    virtual size_t size() {
-        tPThreadGuard<MutexT> mL(&mutex);
-        
-        return q.size();
-    }
-    
-    virtual T next() {
-        tPThreadGuard<MutexT> mL(&mutex);
-
-        if(q.size() == 0)
-            // TODO: throw a specific exception?
-            throw std::exception();
-
-        T item = q.front();
-        q.pop_front();
-        
-        return item;
-    }
-};

=== modified file 'src/tools/tError.cpp'
--- src/tools/tError.cpp	2011-07-26 19:11:38 +0000
+++ src/tools/tError.cpp	2011-09-11 04:47:25 +0000
@@ -57,7 +57,7 @@
 {
     std::cerr << caption << ": " << message << "\n";
     st_Breakpoint();
-    static bool error = false; // to disable the error if it is inconvenient right now and you think it may not be fatal
+    static bool error = true; // to disable the error if it is inconvenient right now and you think it may not be fatal
     if ( error )
     {
         // throw 1; //tSimpleException( message, caption );

=== added file 'src/tools/tLockedQueue.h'
--- src/tools/tLockedQueue.h	1970-01-01 00:00:00 +0000
+++ src/tools/tLockedQueue.h	2011-09-11 04:47:25 +0000
@@ -0,0 +1,74 @@
+/*
+
+*************************************************************************
+
+ArmageTron -- Just another Tron Lightcycle Game in 3D.
+Copyright (C) 2011  Armagetron Advanced Development Team
+
+**************************************************************************
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  
+***************************************************************************
+
+*/
+
+#ifndef ArmageTron_LOCKED_QUEUE_H
+#define ArmageTron_LOCKED_QUEUE_H
+
+#include "tMutex.h"
+
+#include <deque>
+
+//! thread safe queue
+template< typename T, typename MUTEX >
+class tLockedQueue 
+{
+public:
+    //! exception thrown if next() is called on an empty queue
+    class Empty: public std::exception{};
+
+    void add(const T& item)
+    {
+        boost::lock_guard< MUTEX > lock(mutex_);
+        
+        queue_.push_back(item);
+    }
+    
+    virtual size_t size()
+    {
+        boost::lock_guard< MUTEX > lock(mutex_);
+        
+        return queue_.size();
+    }
+    
+    T next()
+    {
+        boost::lock_guard< MUTEX > lock(mutex_);
+
+        if(queue_.size() == 0)
+            throw Empty();
+
+        T item = queue_.front();
+        queue_.pop_front();
+        
+        return item;
+    }
+private:
+    std::deque<T> queue_;
+    MUTEX mutex_;
+};
+
+#endif

=== modified file 'src/tools/tMemManager.cpp'
--- src/tools/tMemManager.cpp	2011-07-10 18:22:34 +0000
+++ src/tools/tMemManager.cpp	2011-09-11 04:47:25 +0000
@@ -88,23 +88,9 @@
 
 static bool reported=false;
 
-#ifdef HAVE_LIBZTHREAD
-#include <zthread/FastRecursiveMutex.h>
-
-static ZThread::FastRecursiveMutex st_mutex;
-#elif defined(HAVE_PTHREAD)
-#include "pthread-binding.h"
-static tPThreadRecursiveMutex st_mutex;
-#else
-class tMockMutex
-{
-public:
-    void acquire(){}
-    void release(){}
-};
-
-static tMockMutex st_mutex;
-#endif
+#include "tMutex.h"
+
+static boost::recursive_mutex st_mutex;
 
 // create an object of this class while calling external functions
 // that are known to have (harmless!) leaks
@@ -122,15 +108,12 @@
 
 class tBottleNeck
 {
+private:
+    boost::lock_guard< boost::recursive_mutex > lock_;
 public:
     tBottleNeck()
-    {
-        st_mutex.acquire();
-    }
-
-    ~tBottleNeck()
-    {
-        st_mutex.release();
+    :lock_(st_mutex)
+    {
     }
 };
 
@@ -644,9 +627,6 @@
 tMemManager::~tMemManager(){
 #ifdef LEAKFINDER
     static bool warn = true;
-#ifdef HAVE_LIBZTHREAD
-    warn = false;
-#endif
 
     if (inited){
         // l???sche das ding
@@ -1306,10 +1286,8 @@
     tAllocationInfo info( false );
 
 #ifdef LEAKFINDER
-#ifndef HAVE_LIBZTHREAD
     info.checksum = size;
 #endif
-#endif
     return tMemMan::Alloc(info, size);
 }
 
@@ -1377,10 +1355,8 @@
 void* operator new[]	(size_t size) THROW_BADALLOC{
     tAllocationInfo info( true );
 #ifdef LEAKFINDER
-#ifndef HAVE_LIBZTHREAD
     info.checksum = size % MAXCHECKSUM;
 #endif
-#endif
     return tMemMan::Alloc(info, size);
 }
 

=== added file 'src/tools/tMutex.cpp'
--- src/tools/tMutex.cpp	1970-01-01 00:00:00 +0000
+++ src/tools/tMutex.cpp	2011-09-11 04:47:25 +0000
@@ -0,0 +1,82 @@
+/*
+
+*************************************************************************
+
+ArmageTron -- Just another Tron Lightcycle Game in 3D.
+Copyright (C) 2005  by 
+the AA DevTeam (see the file AUTHORS(.txt) in the main source directory)
+
+**************************************************************************
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  
+***************************************************************************
+
+*/
+
+#include "tMutex.h"
+
+#ifndef HAVE_LIBBOOST_THREAD
+
+namespace boost
+{
+    // special constructor, do not initialize mutex
+    mutex::mutex( int )
+    {
+    }
+
+    mutex::mutex()
+    {
+#ifdef HAVE_REAL_MUTEX
+        // TODO: error checking
+        pthread_mutex_init(&mutex_, NULL);
+#endif
+    }
+
+    mutex::~mutex()
+    {
+#ifdef HAVE_REAL_MUTEX
+        pthread_mutex_destroy(&mutex_);
+#endif
+    }
+
+    void mutex::lock()
+    {
+#ifdef HAVE_REAL_MUTEX
+        pthread_mutex_lock(&mutex_);
+#endif
+    }
+
+    void mutex::unlock()
+    {
+#ifdef HAVE_REAL_MUTEX
+        pthread_mutex_unlock(&mutex_);
+#endif
+    }
+
+    recursive_mutex::recursive_mutex()
+    : mutex(5)
+    {
+#ifdef HAVE_REAL_MUTEX
+        // TODO: error checking
+        pthread_mutexattr_t mta;
+        
+        pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_RECURSIVE);
+        pthread_mutex_init(&mutex_, &mta);
+#endif
+    }
+}
+
+#endif

=== added file 'src/tools/tMutex.h'
--- src/tools/tMutex.h	1970-01-01 00:00:00 +0000
+++ src/tools/tMutex.h	2011-09-11 04:47:25 +0000
@@ -0,0 +1,150 @@
+/*
+
+*************************************************************************
+
+ArmageTron -- Just another Tron Lightcycle Game in 3D.
+Copyright (C) 2011  Armagetron Advanced Development Team
+
+**************************************************************************
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  
+***************************************************************************
+
+*/
+
+#ifndef ArmageTron_TMUTEX_H
+#define ArmageTron_TMUTEX_H
+
+#include "defs.h"
+
+#ifdef HAVE_LIBBOOST_THREAD
+
+#include <boost/thread/recursive_mutex.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/locks.hpp>
+
+#else // HAVE_LIBBOOST_THREAD
+
+namespace boost
+{
+// replicate the little we actually use with PThreads; for documentation, see boost.
+class mutex
+{
+private:
+    mutex( mutex const & );
+    mutex & operator = ( mutex const & );
+protected:
+#ifdef HAVE_PTHREAD
+#define HAVE_REAL_MUTEX
+    pthread_mutex_t mutex_;
+#endif
+
+    // special constructor, do not initialize mutex
+    explicit mutex( int );
+public:
+    mutex();
+    ~mutex();
+    void lock();
+    void unlock();
+};
+
+class recursive_mutex
+ : public mutex
+{
+public:
+    recursive_mutex();
+};
+
+template <class T>
+class lock_base
+{
+private:
+    T & mutex_;
+    lock_base( lock_base const & );
+    lock_base & operator = ( lock_base const & );
+protected:
+lock_base(T & m)
+    : mutex_(m)
+    {}
+
+    void lock_()
+    {
+        mutex_.lock();
+    };
+
+    void unlock_()
+    {
+        mutex_.unlock();
+    }
+};
+
+template <class T>
+class lock_guard: public lock_base<T>
+{
+public:
+    lock_guard(T & m)
+    : lock_base<T>(m)
+    {
+        this->lock_();
+    };
+
+    ~lock_guard()
+    {
+        this->unlock_();
+    };
+};
+
+template <class T>
+class unique_lock: public lock_base<T>
+{
+private:
+    bool locked_;
+public:
+    unique_lock(T & m)
+    : lock_base<T>(m), locked_(false)
+    {
+        this->lock();
+    };
+
+    ~unique_lock()
+    {
+        this->unlock();
+    };
+
+    void lock()
+    {
+        if( !locked_ )
+        {
+            locked_ = true;
+            this->lock_();
+        }
+    }
+
+    void unlock()
+    {
+        if( locked_ )
+        {
+            locked_ = false;
+            this->unlock_();
+        }
+    }
+};
+
+}
+
+#endif // HAVE_LIBBOOST_THREAD
+
+#endif

=== modified file 'src/tools/tSafePTR.h'
--- src/tools/tSafePTR.h	2011-08-25 11:47:18 +0000
+++ src/tools/tSafePTR.h	2011-09-11 04:47:25 +0000
@@ -36,6 +36,8 @@
 
 #include "tError.h"
 
+#include "tMutex.h"
+
 class tCheckedPTRBase{
     friend class tPTRList;
     int id;
@@ -424,8 +426,8 @@
 // not thread-safe mutex
 struct tNonMutex
 {
-    void acquire(){}
-    void release(){}
+    void lock(){}
+    void unlock(){}
 };
 
 template< class T, class MUTEX = tNonMutex > class tReferencable
@@ -443,9 +445,8 @@
         st_AddRefBreakpint( this );
 #endif        
         tASSERT( this && refCtr_ >= 0 );
-        mutex_.acquire();
+        boost::lock_guard< MUTEX > lock( mutex_ );
         ++refCtr_;
-        mutex_.release();
         tASSERT( this && refCtr_ >= 0 );
     }
 
@@ -456,14 +457,13 @@
 #endif        
 
         tASSERT ( this && refCtr_ >= 0 );
-        mutex_.acquire();
+        boost::unique_lock< MUTEX > lock( mutex_ );
         --refCtr_;
-        bool kill = (refCtr_ <= 0);
-        mutex_.release();
 
-        if ( kill )
+        if ( refCtr_ <= 0 )
         {
             refCtr_ = -1000;
+            lock.unlock();
             delete static_cast< const T* >( this );
         }
     }

=== added file 'src/tools/tThread.h'
--- src/tools/tThread.h	1970-01-01 00:00:00 +0000
+++ src/tools/tThread.h	2011-09-11 04:47:25 +0000
@@ -0,0 +1,105 @@
+/*
+
+*************************************************************************
+
+ArmageTron -- Just another Tron Lightcycle Game in 3D.
+Copyright (C) 2011  Armagetron Advanced Development Team
+
+**************************************************************************
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  
+***************************************************************************
+
+*/
+
+#ifndef ArmageTron_THREAD_H
+#define ArmageTron_THREAD_H
+
+#include "defs.h"
+
+#ifdef HAVE_LIBBOOST_THREAD
+
+#include <boost/thread/thread.hpp>
+
+#define HAVE_THREADS
+
+#else // HAVE_LIBBOOST_THREAD
+
+#ifdef HAVE_PTHREAD
+
+#define HAVE_THREADS
+
+#include <pthread.h>
+
+// replicate the little we actually use with PThreads
+namespace boost
+{
+class thread
+{
+public:
+    template< class T>
+    thread( T const & t )
+    {
+        // we don't currently hang on to thread objects, so no need to store handles
+        pthread_t thread;
+
+        // make a copy of the object to call
+        T * o = new T(t);
+
+        pthread_create(&thread, NULL, &run<T>, (void*) o);
+    }
+private:
+    // worker function
+    template< class T >
+    static void * run( void * o )
+    {
+        T * t = static_cast< T * >(o);
+
+        // do the actual call
+        (*t)();
+
+        // clean up
+        delete t;
+
+        return NULL;
+    }
+};
+}
+
+#else  // HAVE_LIBPTHREAD
+
+#include "tError.h"
+
+// replicate the little we actually use with PThreads
+namespace boost
+{
+class thread
+{
+public:
+    template< class T>
+    thread( T const & t )
+    {
+        // should never be called, then
+        tVERIFY(0);
+    }
+};
+}
+
+#endif // HAVE_LIBPTHREAD
+
+#endif // HAVE_LIBBOOST_THREAD
+
+#endif

=== modified file 'src/tools/tToDo.cpp'
--- src/tools/tToDo.cpp	2011-07-10 18:22:34 +0000
+++ src/tools/tToDo.cpp	2011-09-11 04:47:25 +0000
@@ -28,37 +28,24 @@
 #include "tToDo.h"
 #include "tArray.h"
 
-#ifdef HAVE_LIBZTHREAD
-#include <zthread/FastRecursiveMutex.h>
-
-static ZThread::FastRecursiveMutex st_mutex;
-#elif defined(HAVE_PTHREAD)
-#include "pthread-binding.h"
-static tPThreadRecursiveMutex st_mutex;
-#else
-class tMockMutex
-{
-public:
-    void acquire(){}
-    void release(){}
-};
-
-static tMockMutex st_mutex;
-#endif
+#include "tMutex.h"
+
+static boost::recursive_mutex st_mutex;
 
 tArray<tTODO_FUNC *> tToDos;
 
 void st_ToDo(tTODO_FUNC *td){ // postpone something
-    st_mutex.acquire();
+    boost::lock_guard< boost::recursive_mutex > lock( st_mutex );
+
     tToDos[tToDos.Len()]=td;
-    st_mutex.release();
 }
 
 // the function currently in execution
 static tTODO_FUNC * st_toDoCurrent = 0;
 
 void st_ToDoOnce(tTODO_FUNC *td){ // postpone something, avoid double entries
-    st_mutex.acquire();
+    boost::lock_guard< boost::recursive_mutex > lock( st_mutex );
+
     if( st_toDoCurrent == td )
     {
         return;
@@ -71,7 +58,6 @@
         }
     }
     tToDos[tToDos.Len()]=td;
-    st_mutex.release();
 }
 
 // a lone (but relatively safe) function pointer for things to do triggered by signals.
@@ -83,7 +69,7 @@
         st_ToDo( st_toDoFromSignal );
         st_toDoFromSignal = 0;
     }
-    st_mutex.acquire();
+    boost::lock_guard< boost::recursive_mutex > lock( st_mutex );
     while (tToDos.Len()){
         tTODO_FUNC *last = st_toDoCurrent;
         tTODO_FUNC *td = tToDos[tToDos.Len()-1];
@@ -92,7 +78,6 @@
         (*td)();
         st_toDoCurrent = last;
     }
-    st_mutex.release();
 }
 
 void st_ToDo_Signal(tTODO_FUNC *td){ // postpone something

=== modified file 'src/win32/config_common.h'
--- src/win32/config_common.h	2011-07-30 23:11:58 +0000
+++ src/win32/config_common.h	2011-09-11 04:47:25 +0000
@@ -11,6 +11,10 @@
 // is now defined for code::blocks > 8 or so
 #define HAVE_ISBLANK
 
+// this one is included in winlibs as static library
+#define HAVE_LIBBOOST_THREAD
+#define BOOST_THREAD_USE_LIB
+
 // and disable warnings about those calls that can't be converted. We may want to look at
 // them later, though.
 #define _CRT_SECURE_NO_DEPRECATE 1

=== modified file 'src/win32_ded/aa_config.h'
--- src/win32_ded/aa_config.h	2011-07-30 23:11:58 +0000
+++ src/win32_ded/aa_config.h	2011-09-11 04:47:25 +0000
@@ -7,7 +7,6 @@
 #define DEDICATED 1
 
 // activate armathentication support
-#define HAVE_LIBZTHREAD 1
 #define KRAWALL_SERVER 1
 
 // include common Windows header

=== modified file 'win32/code_blocks/ArmagetronAd.cbp'
--- win32/code_blocks/ArmagetronAd.cbp	2011-08-10 12:53:41 +0000
+++ win32/code_blocks/ArmagetronAd.cbp	2011-09-11 04:47:25 +0000
@@ -26,7 +26,7 @@
 					<Add library="..\..\..\winlibs\build\dist\SDL.dll" />
 					<Add library="..\..\..\winlibs\build\dist\FTGL.dll" />
 					<Add library="..\..\..\winlibs\protobuf\vsprojects\libprotobuf.a" />
-					<Add library="..\..\..\winlibs\build\dist\libZThread.a" />
+					<Add library="..\..\..\winlibs\win32\boost_libs\libboost_thread-mgw44-mt-1_47.a" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug">
@@ -47,7 +47,7 @@
 					<Add library="..\..\..\winlibs\build\debug\SDL.dll" />
 					<Add library="..\..\..\winlibs\build\debug\FTGL.dll" />
 					<Add library="..\..\..\winlibs\protobuf\vsprojects\libprotobuf_debug.a" />
-					<Add library="..\..\..\winlibs\build\debug\libZThread.a" />
+					<Add library="..\..\..\winlibs\win32\boost_libs\libboost_thread-mgw44-mt-d-1_47.a" />
 				</Linker>
 			</Target>
 		</Build>
@@ -90,7 +90,6 @@
 			<Add directory="..\..\..\winlibs\FTGL\win32\freetype\include\freetype2" />
 			<Add directory="..\..\..\winlibs\boost\includes" />
 			<Add directory="..\..\src\thirdparty\scrap" />
-			<Add directory="..\..\..\winlibs\ZThread\include" />
 			<Add directory="..\..\..\winlibs\protobuf\src" />
 			<Add directory="..\..\src\protobuf" />
 			<Add directory="..\..\src\thirdparty\utf8" />
@@ -463,6 +462,8 @@
 		<Unit filename="..\..\src\tools\tMemManager.h" />
 		<Unit filename="..\..\src\tools\tMemStack.cpp" />
 		<Unit filename="..\..\src\tools\tMemStack.h" />
+		<Unit filename="..\..\src\tools\tMutex.cpp" />
+		<Unit filename="..\..\src\tools\tMutex.h" />
 		<Unit filename="..\..\src\tools\tPlayList.cpp" />
 		<Unit filename="..\..\src\tools\tPlayList.h" />
 		<Unit filename="..\..\src\tools\tPolynomial.cpp" />
@@ -498,6 +499,7 @@
 		<Unit filename="..\..\src\tools\tString.h" />
 		<Unit filename="..\..\src\tools\tSysTime.cpp" />
 		<Unit filename="..\..\src\tools\tSysTime.h" />
+		<Unit filename="..\..\src\tools\tThread.h" />
 		<Unit filename="..\..\src\tools\tToDo.cpp" />
 		<Unit filename="..\..\src\tools\tToDo.h" />
 		<Unit filename="..\..\src\tools\tValue.h" />

=== modified file 'win32/code_blocks/ArmagetronAd.workspace'
--- win32/code_blocks/ArmagetronAd.workspace	2011-08-10 12:53:41 +0000
+++ win32/code_blocks/ArmagetronAd.workspace	2011-09-11 04:47:25 +0000
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="Armagetron Advanced workspace">
-		<Project filename="../../../winlibs/win32/code_blocks/ZThread.cbp" active="1" />
 		<Project filename="../../../winlibs/protobuf/vsprojects/libprotobuf.cbp" />
-		<Project filename="Dedicated.cbp" />
+		<Project filename="Dedicated.cbp" active="1" />
 		<Project filename="Master.cbp" />
 		<Project filename="../../../winlibs/win32/code_blocks/SDL.cbp" />
 		<Project filename="../../../winlibs/win32/code_blocks/SDL_image.cbp" />

=== modified file 'win32/code_blocks/Dedicated.cbp'
--- win32/code_blocks/Dedicated.cbp	2011-08-10 12:53:41 +0000
+++ win32/code_blocks/Dedicated.cbp	2011-09-11 04:47:25 +0000
@@ -20,8 +20,8 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add library="..\..\..\winlibs\build\dist\libZThread.a" />
 					<Add library="..\..\..\winlibs\protobuf\vsprojects\libprotobuf.a" />
+					<Add library="..\..\..\winlibs\win32\boost_libs\libboost_thread-mgw44-mt-1_47.a" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug">
@@ -38,8 +38,8 @@
 					<Add option="-DDEBUG" />
 				</Compiler>
 				<Linker>
-					<Add library="..\..\..\winlibs\build\debug\libZThread.a" />
 					<Add library="..\..\..\winlibs\protobuf\vsprojects\libprotobuf_debug.a" />
+					<Add library="..\..\..\winlibs\win32\boost_libs\libboost_thread-mgw44-mt-d-1_47.a" />
 				</Linker>
 			</Target>
 		</Build>
@@ -71,7 +71,6 @@
 			<Add directory="..\..\..\winlibs\iconv\include" />
 			<Add directory="..\..\..\winlibs\boost\includes" />
 			<Add directory="..\..\src\resource" />
-			<Add directory="..\..\..\winlibs\ZThread\include" />
 			<Add directory="..\..\src\protobuf" />
 			<Add directory="..\..\..\winlibs\protobuf\src" />
 			<Add directory="..\..\src\thirdparty\utf8" />
@@ -370,6 +369,8 @@
 		<Unit filename="..\..\src\tools\tMemManager.h" />
 		<Unit filename="..\..\src\tools\tMemStack.cpp" />
 		<Unit filename="..\..\src\tools\tMemStack.h" />
+		<Unit filename="..\..\src\tools\tMutex.cpp" />
+		<Unit filename="..\..\src\tools\tMutex.h" />
 		<Unit filename="..\..\src\tools\tPlayList.cpp" />
 		<Unit filename="..\..\src\tools\tPlayList.h" />
 		<Unit filename="..\..\src\tools\tPolynomial.cpp" />
@@ -400,6 +401,7 @@
 		<Unit filename="..\..\src\tools\tString.h" />
 		<Unit filename="..\..\src\tools\tSysTime.cpp" />
 		<Unit filename="..\..\src\tools\tSysTime.h" />
+		<Unit filename="..\..\src\tools\tThread.h" />
 		<Unit filename="..\..\src\tools\tToDo.cpp" />
 		<Unit filename="..\..\src\tools\tToDo.h" />
 		<Unit filename="..\..\src\tools\tVersion.cpp" />

=== modified file 'win32/code_blocks/Master.cbp'
--- win32/code_blocks/Master.cbp	2011-08-10 12:53:41 +0000
+++ win32/code_blocks/Master.cbp	2011-09-11 04:47:25 +0000
@@ -20,8 +20,8 @@
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
-					<Add library="..\..\..\winlibs\build\dist\libZThread.a" />
 					<Add library="..\..\..\winlibs\protobuf\vsprojects\libprotobuf.a" />
+					<Add library="..\..\..\winlibs\win32\boost_libs\libboost_thread-mgw44-mt-1_47.a" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug">
@@ -38,8 +38,8 @@
 					<Add option="-DDEBUG" />
 				</Compiler>
 				<Linker>
-					<Add library="..\..\..\winlibs\build\debug\libZThread.a" />
 					<Add library="..\..\..\winlibs\protobuf\vsprojects\libprotobuf_debug.a" />
+					<Add library="..\..\..\winlibs\win32\boost_libs\libboost_thread-mgw44-mt-d-1_47.a" />
 				</Linker>
 			</Target>
 		</Build>
@@ -59,7 +59,6 @@
 			<Add directory="..\..\src\tools" />
 			<Add directory="..\..\src\ui" />
 			<Add directory="..\..\src\win32_ded" />
-			<Add directory="..\..\..\winlibs\ZThread\include" />
 			<Add directory="..\..\..\winlibs\libxml2\include" />
 			<Add directory="..\..\src\resource" />
 			<Add directory="..\..\..\winlibs\boost\includes" />
@@ -269,6 +268,8 @@
 		<Unit filename="..\..\src\tools\tMemManager.h" />
 		<Unit filename="..\..\src\tools\tMemStack.cpp" />
 		<Unit filename="..\..\src\tools\tMemStack.h" />
+		<Unit filename="..\..\src\tools\tMutex.cpp" />
+		<Unit filename="..\..\src\tools\tMutex.h" />
 		<Unit filename="..\..\src\tools\tRandom.cpp" />
 		<Unit filename="..\..\src\tools\tRandom.h" />
 		<Unit filename="..\..\src\tools\tRecorder.cpp" />
@@ -284,6 +285,7 @@
 		<Unit filename="..\..\src\tools\tString.h" />
 		<Unit filename="..\..\src\tools\tSysTime.cpp" />
 		<Unit filename="..\..\src\tools\tSysTime.h" />
+		<Unit filename="..\..\src\tools\tThread.h" />
 		<Unit filename="..\..\src\tools\tToDo.cpp" />
 		<Unit filename="..\..\src\tools\tToDo.h" />
 		<Unit filename="..\..\src\tools\tVersion.cpp" />