From: Ryan C. Gordon <icculus@icculus.org>
Date: Wed, 12 May 2010 22:45:27 +0000 (-0400)
Subject: Merged latest cmake branch to default.
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;ds=sidebyside;h=d435148bf0fd538f3b69a8232253618e10249ffa;hp=-c;p=lugaru.git

Merged latest cmake branch to default.
---

d435148bf0fd538f3b69a8232253618e10249ffa
diff --combined Source/GameInitDispose.cpp
index 2c157c9,476a854..5b3113d
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@@ -115,12 -115,6 +115,12 @@@ extern FSOUND_STREAM * strm[20]
  extern "C"	void PlaySoundEx(int channel, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused);
  extern "C" void PlayStreamEx(int chan, FSOUND_STREAM *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused);
  
 +void LOG(const std::string &fmt, ...)
 +{
 +    // !!! FIXME: write me.
 +}
 +
 +
  Game::TextureList Game::textures;
  
  void Game::Dispose()
@@@ -1037,7 -1031,7 +1037,7 @@@ void Game::InitGame(
  				char tempstring[256];
  				#if defined(__APPLE__)
  				sprintf (tempstring, "%s", registrationname);
- 				#elif defined(_MSC_VER) || defined(__linux__)
+ 				#elif defined(_WIN32) || defined(__linux__)
  				sprintf (tempstring, "%s-windows", registrationname);
  				#else
  				#error Please make sure you have the right registration key stuff here!