diff --git a/mk/windoze/Glest.suo b/mk/windoze/Glest.suo index acd65b35d..27aff2769 100755 Binary files a/mk/windoze/Glest.suo and b/mk/windoze/Glest.suo differ 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