X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=550552e3c361016f4d5df3da0b6038f338dfac83;hb=ce7a0cd9e7bb28d1b26e1b2cda36a52592224d9e;hp=9affb71359f7c2401d00640ccf4555d2b00cad0a;hpb=8866bcf90dba64f2fd6cecd6839b9b80988e46a6;p=lugaru.git

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 9affb71..550552e 100644
--- 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;
@@ -2679,7 +2678,7 @@ static bool load_png(const char *file_name, TGAImageRec &tex)
     png_init_io(png_ptr, fp);
     png_read_png(png_ptr, info_ptr,
                  PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING,
-                 png_voidp_NULL);
+                 NULL);
     png_get_IHDR(png_ptr, info_ptr, &width, &height,
                  &bit_depth, &color_type, &interlace_type, NULL, NULL);
 
@@ -2729,7 +2728,7 @@ static bool load_png(const char *file_name, TGAImageRec &tex)
     retval = true;
 
 png_done:
-    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
     if (fp)
         fclose(fp);
     return (retval);