jpeglib (etc) need to be wrapped in extern "C". :/

[lugaru.git] / Source / OpenGL_Windows.cpp

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 7fbeb494e423053f40bb92037ef9eae2f931f84e..550552e3c361016f4d5df3da0b6038f338dfac83 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -37,9 +37,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
        #include "Game.h"
 #else
 
-       #include <zlib.h>
-       #include <png.h>
-       #include <jpeglib.h>
+    extern "C" {
+       #include "zlib.h"
+           #include "png.h"
+       #include "jpeglib.h"
+    }
        #include "Game.h"
     static bool load_image(const char * fname, TGAImageRec & tex);
     static bool load_png(const char * fname, TGAImageRec & tex);
@@ -1574,7 +1576,6 @@ int main(int argc, char **argv)
        LOGFUNC;
 
 #ifndef WIN32  // this is in WinMain, too.
-       logger.start(true);
        memset( &g_theKeys, 0, sizeof( KeyMap));
 #endif
 
@@ -1705,7 +1706,7 @@ int main(int argc, char **argv)
                std::string e = "Caught exception: ";
                e += error.what();
 
-               LOG(e, Logger::LOG_ERR);
+               LOG(e);
 
                MessageBox(g_windowHandle, error.what(), "ERROR", MB_OK | MB_ICONEXCLAMATION);
        }
@@ -2364,8 +2365,6 @@ int main(int argc, char **argv)
                        }
                }
 
-               logger.start(true);
-
                memset( &g_theKeys, 0, sizeof( KeyMap));
 
                unsigned int i = 0;