BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Set of changes to build mineTest using Visual Studio 11.0. These affect

Browse Source 
the following:
1. String concatenation in guiMainMenu.cpp - it is required for all
individual strings to be of the same type <unicode/non-unicode>; adding
explicit L qualifier before the other strings.
2. Correcting type of BlockMakeData to struct in place of class forward
declarations. This information is used for name decoration by Visual
Studio, leading to linker errors in case of mismatches.
3. Windows headers define max as a macro somewhere, leading to a compile
time error in profiler.h; using () around function to prevent macro match
from occurring.
This commit is contained in:
Mukul Sati 2013-03-23 02:24:31 -04:00 committed by Ilya Zhuravlev
parent 6f8d40ef5d
commit ca7043e52d
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/guiMainMenu.cpp
View File

@ -43,6 +43,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "subgame.h" #include "subgame.h"
#define ARRAYLEN(x) (sizeof(x) / sizeof((x)[0])) #define ARRAYLEN(x) (sizeof(x) / sizeof((x)[0]))
#define LSTRING(x) LSTRING_(x)
#define LSTRING_(x) L##x
const wchar_t *contrib_core_strs[] = { const wchar_t *contrib_core_strs[] = {
L"Perttu Ahola (celeron55) <celeron55@gmail.com>", L"Perttu Ahola (celeron55) <celeron55@gmail.com>",
@ -760,7 +762,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
core::rect<s32> rect(0, 0, 130, 70); core::rect<s32> rect(0, 0, 130, 70);
rect += m_topleft_client + v2s32(35, 160); rect += m_topleft_client + v2s32(35, 160);
Environment->addStaticText( Environment->addStaticText(
L"Minetest " VERSION_STRING "\nhttp://minetest.net/", L"Minetest " LSTRING(VERSION_STRING) L"\nhttp://minetest.net/",
rect, false, true, this, -1); rect, false, true, this, -1);
} }
{ {

2
src/map.h
View File

@ -50,7 +50,7 @@ class NodeMetadata;
class IGameDef; class IGameDef;
class IRollbackReportSink; class IRollbackReportSink;
class EmergeManager; class EmergeManager;
class BlockMakeData; struct BlockMakeData;
/* /*

2
src/mapgen.h
View File

@ -45,7 +45,7 @@ class MapBlock;
class ManualMapVoxelManipulator; class ManualMapVoxelManipulator;
class VoxelManipulator; class VoxelManipulator;
class INodeDefManager; class INodeDefManager;
class BlockMakeData; struct BlockMakeData;
class VoxelArea; class VoxelArea;
struct MapgenParams { struct MapgenParams {

2
src/profiler.h
View File

@ -73,7 +73,7 @@ public:
else{ else{
/* No add shall have been used */ /* No add shall have been used */
assert(n->second != -2); assert(n->second != -2);
n->second = std::max(n->second, 0) + 1; n->second = (std::max)(n->second, 0) + 1;
} }
} }
{ {