(svn r17339) -Codechange: move thread related files to their own directory (like done for video, music, sound, etc)

This commit is contained in:
rubidium 2009-09-01 10:07:22 +00:00
parent 5a3b2f0d02
commit 07d2af338e
18 changed files with 63 additions and 53 deletions

View File

@ -151,8 +151,8 @@ bundle_exe: all
@echo '[BUNDLE] Creating $(BUNDLE_NAME).exe'
$(Q)mkdir -p "$(BUNDLES_DIR)"
$(Q)unix2dos "$(ROOT_DIR)/docs/"* "$(ROOT_DIR)/readme.txt" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
$(Q)cd $(ROOT_DIR)/os/win32/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi
$(Q)mv $(ROOT_DIR)/os/win32/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"
$(Q)cd $(ROOT_DIR)/os/windows/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi
$(Q)mv $(ROOT_DIR)/os/windows/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"
ifdef OSXAPP
install:

View File

@ -735,10 +735,6 @@
RelativePath=".\..\src\tgp.cpp"
>
</File>
<File
RelativePath=".\..\src\thread_win32.cpp"
>
</File>
<File
RelativePath=".\..\src\tile_map.cpp"
>
@ -1503,10 +1499,6 @@
RelativePath=".\..\src\tgp.h"
>
</File>
<File
RelativePath=".\..\src\thread.h"
>
</File>
<File
RelativePath=".\..\src\tile_cmd.h"
>
@ -3580,6 +3572,18 @@
>
</File>
</Filter>
<Filter
Name="Threading"
>
<File
RelativePath=".\..\src\thread\thread.h"
>
</File>
<File
RelativePath=".\..\src\thread\thread_win32.cpp"
>
</File>
</Filter>
<Filter
Name="64-bit Specific Files"
Filter="asm"

View File

@ -732,10 +732,6 @@
RelativePath=".\..\src\tgp.cpp"
>
</File>
<File
RelativePath=".\..\src\thread_win32.cpp"
>
</File>
<File
RelativePath=".\..\src\tile_map.cpp"
>
@ -1500,10 +1496,6 @@
RelativePath=".\..\src\tgp.h"
>
</File>
<File
RelativePath=".\..\src\thread.h"
>
</File>
<File
RelativePath=".\..\src\tile_cmd.h"
>
@ -3577,6 +3569,18 @@
>
</File>
</Filter>
<Filter
Name="Threading"
>
<File
RelativePath=".\..\src\thread\thread.h"
>
</File>
<File
RelativePath=".\..\src\thread\thread_win32.cpp"
>
</File>
</Filter>
<Filter
Name="64-bit Specific Files"
Filter="asm"

View File

@ -76,23 +76,6 @@ strings.cpp
subsidy.cpp
texteff.cpp
tgp.cpp
#if HAVE_THREAD
#if WIN32
thread_win32.cpp
#else
#if OS2
thread_os2.cpp
#else
#if MORPHOS
thread_morphos.cpp
#else
thread_pthread.cpp
#end
#end
#end
#else
thread_none.cpp
#end
tile_map.cpp
#if WIN32
#else
@ -304,7 +287,6 @@ terraform_gui.h
textbuf_gui.h
texteff.hpp
tgp.h
thread.h
tile_cmd.h
tile_type.h
tilehighlight_func.h
@ -940,3 +922,23 @@ sound/null_s.cpp
os/macosx/splash.cpp
#end
#end
# Threading
thread/thread.h
#if HAVE_THREAD
#if WIN32
thread/thread_win32.cpp
#else
#if OS2
thread/thread_os2.cpp
#else
#if MORPHOS
thread/thread_morphos.cpp
#else
thread/thread_pthread.cpp
#end
#end
#end
#else
thread/thread_none.cpp
#end

View File

@ -14,7 +14,7 @@
#include "landscape.h"
#include "company_func.h"
#include "variables.h"
#include "thread.h"
#include "thread/thread.h"
#include "command_func.h"
#include "genworld.h"
#include "gfxinit.h"

View File

@ -32,7 +32,7 @@
#include "landscape_type.h"
#include "querystring_gui.h"
#include "town.h"
#include "thread.h"
#include "thread/thread.h"
#include "settings_func.h"
#include "table/strings.h"

View File

@ -26,7 +26,7 @@
#include "landscape_type.h"
#include "network/network_func.h"
#include "core/smallvec_type.hpp"
#include "thread.h"
#include "thread/thread.h"
#include "window_func.h"
#include "table/palettes.h"

View File

@ -16,7 +16,7 @@
#include "../../stdafx.h"
#include "../../debug.h"
#include "../../core/smallvec_type.hpp"
#include "../../thread.h"
#include "../../thread/thread.h"
#include "tcp.h"

View File

@ -17,7 +17,7 @@
#include "../stdafx.h"
#include "../debug.h"
#include "../core/alloc_func.hpp"
#include "../thread.h"
#include "../thread/thread.h"
#include "../string_func.h"
#include "network_internal.h"
#include "network_udp.h"

View File

@ -28,7 +28,7 @@
#include "../string_func.h"
#include "../company_base.h"
#include "../settings_type.h"
#include "../thread.h"
#include "../thread/thread.h"
#include "../rev.h"
#include "core/udp.h"

View File

@ -60,7 +60,7 @@
#include "elrail_func.h"
#include "rev.h"
#include "highscore.h"
#include "thread.h"
#include "thread/thread.h"
#include "station_base.h"
#include "newgrf_commons.h"

View File

@ -24,7 +24,7 @@
#include "../openttd.h"
#include "../debug.h"
#include "../station_base.h"
#include "../thread.h"
#include "../thread/thread.h"
#include "../town.h"
#include "../network/network.h"
#include "../variables.h"

View File

@ -9,10 +9,10 @@
/** @file thread_morphos.cpp MorphOS implementation of Threads. */
#include "stdafx.h"
#include "../stdafx.h"
#include "thread.h"
#include "debug.h"
#include "core/alloc_func.hpp"
#include "../debug.h"
#include "../core/alloc_func.hpp"
#include <stdlib.h>
#include <unistd.h>

View File

@ -9,7 +9,7 @@
/** @file thread_none.cpp No-Threads-Available implementation of Threads */
#include "stdafx.h"
#include "../stdafx.h"
#include "thread.h"
/* static */ bool ThreadObject::New(OTTDThreadFunc proc, void *param, ThreadObject **thread)

View File

@ -9,7 +9,7 @@
/** @file thread_os2.cpp OS/2 implementation of Threads. */
#include "stdafx.h"
#include "../stdafx.h"
#include "thread.h"
#define INCL_DOS

View File

@ -9,7 +9,7 @@
/** @file thread_pthread.cpp POSIX pthread implementation of Threads. */
#include "stdafx.h"
#include "../stdafx.h"
#include "thread.h"
#include <pthread.h>

View File

@ -9,10 +9,10 @@
/** @file thread_win32.cpp Win32 thread implementation of Threads. */
#include "stdafx.h"
#include "../stdafx.h"
#include "thread.h"
#include "debug.h"
#include "core/alloc_func.hpp"
#include "../debug.h"
#include "../core/alloc_func.hpp"
#include <stdlib.h>
#include <windows.h>
#include <process.h>