(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
This commit is contained in:
@@ -83,7 +83,7 @@ load_main_data() {
|
||||
if ($0 == "MSVC" && "'$os'" != "MSVC") { next; }
|
||||
if ($0 == "DIRECTMUSIC" && "'$enable_directmusic'" != "1") { next; }
|
||||
if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" ) { next; }
|
||||
if ($0 == "NO_THREADS" && "'$with_threads'" == "0") { next; }
|
||||
if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0") { next; }
|
||||
|
||||
skip += 1;
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@ Function load_main_data(filename)
|
||||
line = "WIN32" Or _
|
||||
line = "MSVC" Or _
|
||||
line = "DIRECTMUSIC" Or _
|
||||
line = "NO_THREADS" _
|
||||
line = "HAVE_THREAD" _
|
||||
) Then skip = skip + 1
|
||||
deep = deep + 1
|
||||
Case "#"
|
||||
|
||||
@@ -736,7 +736,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\thread.cpp"
|
||||
RelativePath=".\..\src\thread_win32.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\fiber_win32.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@@ -791,6 +795,10 @@
|
||||
RelativePath=".\..\src\core\alloc_func.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\core\alloc_type.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\articulated_vehicles.h"
|
||||
>
|
||||
@@ -943,6 +951,10 @@
|
||||
RelativePath=".\..\src\core\enum_type.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\fiber.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\fileio.h"
|
||||
>
|
||||
@@ -2231,6 +2243,10 @@
|
||||
RelativePath=".\..\src\misc\blob.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\misc\countedobj.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\misc\countedptr.hpp"
|
||||
>
|
||||
|
||||
@@ -733,7 +733,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\thread.cpp"
|
||||
RelativePath=".\..\src\thread_win32.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\fiber_win32.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
@@ -788,6 +792,10 @@
|
||||
RelativePath=".\..\src\core\alloc_func.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\core\alloc_type.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\articulated_vehicles.h"
|
||||
>
|
||||
@@ -940,6 +948,10 @@
|
||||
RelativePath=".\..\src\core\enum_type.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\fiber.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\fileio.h"
|
||||
>
|
||||
@@ -2228,6 +2240,10 @@
|
||||
RelativePath=".\..\src\misc\blob.hpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\misc\countedobj.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\..\src\misc\countedptr.hpp"
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user