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
The-Powder-Toy · Mar 12, 2016 · 13d3547 · 13d3547
1 parent 1ef8b0c
commit 13d3547
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 22 deletions.
diff --git a/src/Config.h b/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;
 

diff --git a/src/client/requestbroker/RequestBroker.h b/src/client/requestbroker/RequestBroker.h
@@ -4,8 +4,7 @@
 #include <utility>
 #include <deque>
 #include <string>
-#include <pthread.h>
-#undef GetUserName //God dammit microsoft!
+#include "common/tpt-thread.h"
 
 #include "Config.h"
 #include "Singleton.h"

diff --git a/src/common/tpt-thread.h b/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
diff --git a/src/graphics/OpenGLGraphics.cpp b/src/graphics/OpenGLGraphics.cpp
@@ -1,9 +1,6 @@
 #include "Graphics.h"
 #include "font.h"
-#include <pthread.h>
-#ifdef GetUserName
-#undef GetUserName //God dammit microsoft!
-#endif
+#include "common/tpt-thread.h"
 #ifdef OGLI
 
 static pthread_mutex_t gMutex = PTHREAD_MUTEX_INITIALIZER;

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

diff --git a/src/gui/search/SearchModel.h b/src/gui/search/SearchModel.h
@@ -3,8 +3,7 @@
 
 #include <vector>
 #include <string>
-#include <pthread.h>
-#undef GetUserName //God dammit microsoft!
+#include "common/tpt-thread.h"
 #include <cmath>
 #include "client/SaveInfo.h"
 #include "SearchView.h"

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

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

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