mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-13 03:44:00 +02:00
Code Issues Projects Releases Wiki Activity

win32 compile fixes

Browse Source
This commit is contained in:
Mark Vejvoda
2010-04-30 23:30:15 +00:00
parent fd2274775e
commit 5cf84e8a2a
6 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mk/windoze/Glest.suo
View File

Binary file not shown.

12
mk/windoze/shared_lib.vcproj
View File

@@ -707,6 +707,14 @@
<Filter <Filter
Name="platform" Name="platform"
> >
<File
RelativePath="..\..\source\shared_lib\sources\platform\common\base_thread.cpp"
>
</File>
<File
RelativePath="..\..\source\shared_lib\sources\platform\common\cache_manager.cpp"
>
</File>
<File <File
RelativePath="..\..\source\shared_lib\include\platform\sdl\gl_wrap.h" RelativePath="..\..\source\shared_lib\include\platform\sdl\gl_wrap.h"
> >
@@ -727,6 +735,10 @@
RelativePath="..\..\source\shared_lib\include\platform\sdl\sdl_private.h" RelativePath="..\..\source\shared_lib\include\platform\sdl\sdl_private.h"
> >
</File> </File>
<File
RelativePath="..\..\source\shared_lib\sources\platform\common\simple_threads.cpp"
>
</File>
<File <File
RelativePath="..\..\source\shared_lib\include\platform\posix\socket.h" RelativePath="..\..\source\shared_lib\include\platform\posix\socket.h"
> >

2
source/shared_lib/include/platform/sdl/window.h
View File

@@ -116,7 +116,7 @@ private:
static SDL_keysym keystate; static SDL_keysym keystate;
static void setLastMouseEvent(int64 lastMouseEvent) {Window::lastMouseEvent = lastMouseEvent;} static void setLastMouseEvent(int64 lastMouseEvent) {Window::lastMouseEvent = lastMouseEvent;}
static unsigned int getLastMouseEvent() {return Window::lastMouseEvent;} static int64 getLastMouseEvent() {return Window::lastMouseEvent;}
static const MouseState &getMouseState() {return Window::mouseState;} static const MouseState &getMouseState() {return Window::mouseState;}
static void setMouseState(MouseButton b, bool state) {Window::mouseState.set(b, state);} static void setMouseState(MouseButton b, bool state) {Window::mouseState.set(b, state);}

2
source/shared_lib/sources/platform/common/base_thread.cpp
View File

@@ -11,7 +11,9 @@
// ============================================================== // ==============================================================
#include "base_thread.h" #include "base_thread.h"
#include "platform_common.h"
#include "util.h" #include "util.h"
#include <time.h>
using namespace Shared::Util; using namespace Shared::Util;

4
source/shared_lib/sources/platform/common/simple_threads.cpp
View File

@@ -33,9 +33,9 @@ void FileCRCPreCacheThread::execute() {
vector<string> techPaths; vector<string> techPaths;
findDirs(techDataPaths, techPaths); findDirs(techDataPaths, techPaths);
if(techPaths.empty() == false) { if(techPaths.empty() == false) {
for(int idx = 0; idx < techPaths.size(); idx++) { for(unsigned int idx = 0; idx < techPaths.size(); idx++) {
string &techPath = techPaths[idx]; string &techPath = techPaths[idx];
for(int idx2 = 0; idx2 < techPaths.size(); idx2++) { for(unsigned int idx2 = 0; idx2 < techPaths.size(); idx2++) {
string techName = techPaths[idx2]; string techName = techPaths[idx2];
printf("In [%s::%s Line: %d] caching CRC value for Tech [%s]\n",__FILE__,__FUNCTION__,__LINE__,techName.c_str()); printf("In [%s::%s Line: %d] caching CRC value for Tech [%s]\n",__FILE__,__FUNCTION__,__LINE__,techName.c_str());

2
source/shared_lib/sources/util/util.cpp
View File

@@ -60,7 +60,7 @@ inline bool acquire_file_lock(int hnd)
return -1 != ::fcntl(hnd, F_SETLK, &lock); return -1 != ::fcntl(hnd, F_SETLK, &lock);
#else #else
HANDLE hFile = (HANDLE)_get_osfhandle(hnd); HANDLE hFile = (HANDLE)_get_osfhandle(hnd);
return true == ::LockFile(hFile, 0, 0, 0, -0x10000); return TRUE == ::LockFile(hFile, 0, 0, 0, -0x10000);
#endif #endif
} }