Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed win32 build from last checkin

Browse Source
This commit is contained in:
Mark Vejvoda 2011-01-31 23:17:42 +00:00
parent 0b4eef10c5
commit f373a66c31
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/windoze/build-mg.bat
View File

@ -65,4 +65,4 @@ if not "%SVNVERSION%" == "." echo #define SVNVERSION "%SVNVERSION%" > ..\..\sour
msbuild /p:Configuration=Release Glest.sln msbuild /p:Configuration=Release Glest.sln
rem pause execution so we can see the output before the batch file exits rem pause execution so we can see the output before the batch file exits
pause if not "%1" == "nopause" pause

12
source/shared_lib/include/platform/sdl/thread.h
View File

@ -12,23 +12,27 @@
#ifndef _SHARED_PLATFORM_THREAD_H_ #ifndef _SHARED_PLATFORM_THREAD_H_
#define _SHARED_PLATFORM_THREAD_H_ #define _SHARED_PLATFORM_THREAD_H_
//#define DEBUG_MUTEXES
//#define DEBUG_PERFORMANCE_MUTEXES
#include <SDL_thread.h> #include <SDL_thread.h>
#include <SDL_mutex.h> #include <SDL_mutex.h>
#include <string> #include <string>
#ifdef DEBUG_PERFORMANCE_MUTEXES
#include "platform_common.h" #include "platform_common.h"
#endif
//#include "util.h" //#include "util.h"
#include "leak_dumper.h" #include "leak_dumper.h"
//#define DEBUG_MUTEXES
//#define DEBUG_PERFORMANCE_MUTEXES
// ===================================================== // =====================================================
// class Thread // class Thread
// ===================================================== // =====================================================
using namespace std; using namespace std;
#ifdef DEBUG_PERFORMANCE_MUTEXES
using namespace Shared::PlatformCommon; using namespace Shared::PlatformCommon;
#endif
namespace Shared { namespace Platform { namespace Shared { namespace Platform {