Compiling fix for scons on windows

something is up with the pthreads library (dynamic compiles still broken), probably windows libraries all need to be recompiled and distributed separately like I did for visual studio

src/Config.h

@@ -174,12 +174,6 @@
 #define TPT_INLINE inline
 #endif
 
-#if defined(WIN) && defined(__GNUC__)
-#define TH_ENTRY_POINT __attribute__((force_align_arg_pointer)) 
-#else
-#define TH_ENTRY_POINT
-#endif
-
 // old Platform.h stuff, maybe we should have a file for these kinds of things
 typedef unsigned short Uint16;
 

src/client/requestbroker/RequestBroker.h

@@ -4,8 +4,7 @@
 #include <utility>
 #include <deque>
 #include <string>
-#include <pthread.h>
+#include "common/tpt-thread.h"
-#undef GetUserName //God dammit microsoft!
 
 #include "Config.h"
 #include "Singleton.h"

src/common/tpt-thread.h

@@ -0,0 +1,14 @@
+#ifndef TPT_THREAD_H
+#define TPT_THREAD_H
+
+#if defined(WIN) && defined(__GNUC__)
+#define TH_ENTRY_POINT __attribute__((force_align_arg_pointer)) 
+#define _TIMESPEC_DEFINED
+#else
+#define TH_ENTRY_POINT
+#endif
+
+#include <pthread.h>
+#undef GetUserName
+
+#endif

src/graphics/OpenGLGraphics.cpp

@@ -1,9 +1,6 @@
 #include "Graphics.h"
 #include "font.h"
-#include <pthread.h>
+#include "common/tpt-thread.h"
-#ifdef GetUserName
-#undef GetUserName //God dammit microsoft!
-#endif
 #ifdef OGLI
 
 static pthread_mutex_t gMutex = PTHREAD_MUTEX_INITIALIZER;

src/gui/preview/PreviewModel.h

@@ -3,8 +3,7 @@
 
 #include <vector>
 #include <iostream>
-#include <pthread.h>
+#include "common/tpt-thread.h"
-#undef GetUserName //God dammit microsoft!
 #include "PreviewView.h"
 #include "client/SaveInfo.h"
 #include "gui/preview/Comment.h"

src/gui/search/SearchModel.h

@@ -3,8 +3,7 @@
 
 #include <vector>
 #include <string>
-#include <pthread.h>
+#include "common/tpt-thread.h"
-#undef GetUserName //God dammit microsoft!
 #include <cmath>
 #include "client/SaveInfo.h"
 #include "SearchView.h"

src/simulation/Gravity.cpp

@@ -1,7 +1,6 @@
 #include <cmath>
 #include <sys/types.h>
-#include <pthread.h>
+#include "common/tpt-thread.h"
-#undef GetUserName //God dammit microsoft!
 #include "Config.h"
 #include "Gravity.h"
 //#include "powder.h"

src/simulation/Gravity.h

@@ -1,8 +1,7 @@
 #ifndef GRAVITY_H
 #define GRAVITY_H
 
-#include <pthread.h>
+#include "common/tpt-thread.h"
-#undef GetUserName //God dammit microsoft!
 #include "Config.h"
 #include "Simulation.h"
 

src/tasks/Task.h

@@ -2,8 +2,7 @@
 #define TASK_H_
 
 #include <string>
-#include <pthread.h>
+#include "common/tpt-thread.h"s
-#undef GetUserName //God dammit microsoft!
 #include "TaskListener.h"
 #include "Config.h"