From 247cf325319b19897916a0c5bbefdb2a4036da99 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sat, 8 May 2010 09:40:25 +0000 Subject: [PATCH] - Removed yet another platform specific remanant no longer required (win32 threads) since we use sdl threads --- mk/windoze/Glest.suo | Bin 265728 -> 265216 bytes mk/windoze/shared_lib.vcproj | 20 ++-- .../sources/platform/win32/thread.cpp | 88 ------------------ 3 files changed, 8 insertions(+), 100 deletions(-) delete mode 100644 source/shared_lib/sources/platform/win32/thread.cpp diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo index acd65b35d18c1bbe4130b5f3db849c3d1e8d96b3..27aff2769e45a37ffc4037a6946e53ab8ddc2800 100755 GIT binary patch delta 5463 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 InaO$L@0mQbcK`qY delta 5338 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 diff --git a/mk/windoze/shared_lib.vcproj b/mk/windoze/shared_lib.vcproj index 94401ef40..4b90d98ad 100755 --- a/mk/windoze/shared_lib.vcproj +++ b/mk/windoze/shared_lib.vcproj @@ -418,6 +418,10 @@ RelativePath="..\..\source\shared_lib\sources\platform\posix\socket.cpp" > + + @@ -441,10 +445,6 @@ RelativePath="..\..\source\shared_lib\sources\platform\win32\platform_util.cpp" > - - @@ -760,6 +760,10 @@ RelativePath="..\..\source\shared_lib\include\platform\posix\socket.h" > + + @@ -779,18 +783,10 @@ RelativePath="..\..\source\shared_lib\include\platform\win32\platform_definitions.h" > - - - - diff --git a/source/shared_lib/sources/platform/win32/thread.cpp b/source/shared_lib/sources/platform/win32/thread.cpp deleted file mode 100644 index 907542b59..000000000 --- a/source/shared_lib/sources/platform/win32/thread.cpp +++ /dev/null @@ -1,88 +0,0 @@ -// ============================================================== -// This file is part of Glest Shared Library (www.glest.org) -// -// Copyright (C) 2001-2008 Martio Figueroa -// -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== - -#include "thread.h" - -#include "leak_dumper.h" - -namespace Shared{ namespace Platform{ - -// ===================================================== -// class Threads -// ===================================================== - -ThreadId Thread::nextThreadId= threadIdBase; - -void Thread::start(){ - threadHandle= CreateThread(NULL, 0, beginExecution, this, 0, &nextThreadId); - nextThreadId++; -} - -void Thread::setPriority(Thread::Priority threadPriority){ - SetThreadPriority(threadHandle, threadPriority); -} - -DWORD WINAPI Thread::beginExecution(void *param){ - static_cast(param)->execute(); - return 0; -} - -void Thread::suspend(){ - SuspendThread(threadHandle); -} - -void Thread::resume(){ - ResumeThread(threadHandle); -} - -// ===================================================== -// class Mutex -// ===================================================== - -Mutex::Mutex(){ - InitializeCriticalSection(&mutex); -} - -Mutex::~Mutex(){ - DeleteCriticalSection(&mutex); -} - -void Mutex::p(){ - EnterCriticalSection(&mutex); -} - -void Mutex::v(){ - LeaveCriticalSection(&mutex); -} - -// ===================================================== -// class Semaphore -// ===================================================== - -Semaphore::Semaphore(Uint32 initialValue) { - semaphore = SDL_CreateSemaphore(initialValue); -} - -Semaphore::~Semaphore() { - SDL_DestroySemaphore(semaphore); - semaphore = NULL; -} - -void Semaphore::signal() { - SDL_SemPost(semaphore); -} - -int Semaphore::waitTillSignalled() { - int semValue = SDL_SemWait(semaphore); - return semValue; -} - -}}//end namespace