Merged latest cmake branch to default.

diff --combined Source/GameInitDispose.cpp
index 2c157c9c7b558e18cacd572ba09453a29e3b146b,476a854e90ecf0966d75f35f55024f63fb8f1762..5b3113ddb301d78f5af0986e5f5f28f662109d32
--- 1/Source/GameInitDispose.cpp
--- 2/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!