Merge to mainline.

[lugaru.git] / Source / GameInitDispose.cpp

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index 118a7b5f2006829bd23fdc09d458843b6e567ef3..5b3113ddb301d78f5af0986e5f5f28f662109d32 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -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()
@@ -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!