diff options
| author | rubidium <rubidium@openttd.org> | 2008-04-14 19:54:33 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-04-14 19:54:33 +0000 |
| commit | d022d4af3d8b64e06484cfb05e3d6e8b94f3d200 (patch) | |
| tree | a38226d767be0babf008f3304e7a61a4a00af2aa /projects | |
| parent | bf1d42c23d9c7249d63edd953339af9e6acc9b0d (diff) | |
| download | openttd-d022d4af3d8b64e06484cfb05e3d6e8b94f3d200.tar.xz | |
(svn r12706) -Merge: the thread rewrite from NoAI. The rewrite makes the threading we have better extendable.
Diffstat (limited to 'projects')
| -rwxr-xr-x | projects/generate | 2 | ||||
| -rwxr-xr-x | projects/generate.vbs | 2 | ||||
| -rw-r--r-- | projects/openttd_vs80.vcproj | 18 | ||||
| -rw-r--r-- | projects/openttd_vs90.vcproj | 18 |
4 files changed, 36 insertions, 4 deletions
diff --git a/projects/generate b/projects/generate index cdc29bf40..0e1929583 100755 --- a/projects/generate +++ b/projects/generate @@ -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; diff --git a/projects/generate.vbs b/projects/generate.vbs index bdb6ef203..1435e84a1 100755 --- a/projects/generate.vbs +++ b/projects/generate.vbs @@ -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 "#" diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index 3507106ea..56eedfc24 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -736,7 +736,11 @@ > </File> <File - RelativePath=".\..\src\thread.cpp" + RelativePath=".\..\src\thread_win32.cpp" + > + </File> + <File + RelativePath=".\..\src\fiber_win32.cpp" > </File> <File @@ -792,6 +796,10 @@ > </File> <File + RelativePath=".\..\src\core\alloc_type.hpp" + > + </File> + <File RelativePath=".\..\src\articulated_vehicles.h" > </File> @@ -944,6 +952,10 @@ > </File> <File + RelativePath=".\..\src\fiber.hpp" + > + </File> + <File RelativePath=".\..\src\fileio.h" > </File> @@ -2232,6 +2244,10 @@ > </File> <File + RelativePath=".\..\src\misc\countedobj.cpp" + > + </File> + <File RelativePath=".\..\src\misc\countedptr.hpp" > </File> diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index e4be42d9c..435e7f87e 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -733,7 +733,11 @@ > </File> <File - RelativePath=".\..\src\thread.cpp" + RelativePath=".\..\src\thread_win32.cpp" + > + </File> + <File + RelativePath=".\..\src\fiber_win32.cpp" > </File> <File @@ -789,6 +793,10 @@ > </File> <File + RelativePath=".\..\src\core\alloc_type.hpp" + > + </File> + <File RelativePath=".\..\src\articulated_vehicles.h" > </File> @@ -941,6 +949,10 @@ > </File> <File + RelativePath=".\..\src\fiber.hpp" + > + </File> + <File RelativePath=".\..\src\fileio.h" > </File> @@ -2229,6 +2241,10 @@ > </File> <File + RelativePath=".\..\src\misc\countedobj.cpp" + > + </File> + <File RelativePath=".\..\src\misc\countedptr.hpp" > </File> |