Browse Source

Compile fixes. May be suboptimal.

DjWarmonger 14 years ago
parent
commit
dfea7db6e8
2 changed files with 5 additions and 3 deletions
  1. 3 3
      client/CPreGame.cpp
  2. 2 0
      lib/CLodHandler.cpp

+ 3 - 3
client/CPreGame.cpp

@@ -69,8 +69,8 @@ using boost::bind;
 using boost::ref;
 
 #if _MSC_VER >= 1600
-	#define bind boost::bind
-	#define ref boost::ref
+	//#define bind boost::bind
+	//#define ref boost::ref
 #endif
 
 void startGame(StartInfo * options, CConnection *serv = NULL);
@@ -796,7 +796,7 @@ void CSelectionScreen::startGame()
 		selectedName = GVCMIDirs.UserPath + "/Games/" + sel->txt->text + ".vlgm1";
 
 		CFunctionList<void()> overWrite;
-		overWrite += bind(&CCallback::save, LOCPLINT->cb, sel->txt->text);
+		overWrite += boost::bind(&CCallback::save, LOCPLINT->cb, sel->txt->text);
 		overWrite += bind(&CGuiHandler::popIntTotally, &GH, this);
 
 		if(fs::exists(selectedName))

+ 2 - 0
lib/CLodHandler.cpp

@@ -18,6 +18,8 @@
 #undef max
 #endif
 
+VCMIDirs GVCMIDirs;
+
 /*
  * CLodHandler.cpp, part of VCMI engine
  *