X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=b1e158cb03f6feb24e6a733ec0b91f81e3168591;hb=aaed539630d0da64431735dcc15b45fafa324f5d;hp=7fbeb494e423053f40bb92037ef9eae2f931f84e;hpb=f9ef2c2bd027be01928effcabcee2efe21d83dd2;p=lugaru.git

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 7fbeb49..b1e158c 100644
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -19,10 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-
-#ifdef WIN32
-#include <vld.h>
-#endif
+#define USE_DEVIL 0
 
 #ifndef USE_DEVIL
 #  ifdef WIN32
@@ -37,10 +34,13 @@ 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>
 	#include "Game.h"
+	extern "C" {
+		#include "zlib.h"
+		#include "png.h"
+		#include "jpeglib.h"
+	}
+
     static bool load_image(const char * fname, TGAImageRec & tex);
     static bool load_png(const char * fname, TGAImageRec & tex);
     static bool load_jpg(const char * fname, TGAImageRec & tex);
@@ -255,9 +255,10 @@ Boolean gDone = false, gfFrontProcess = true;
 
 Game * pgame = 0;
 
-
+#ifndef WIN32
 static int _argc = 0;
 static char **_argv = NULL;
+#endif
 
 bool cmdline(const char *cmd)
 {
@@ -1574,7 +1575,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 +1705,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 +2364,6 @@ int main(int argc, char **argv)
 			}
 		}
 
-		logger.start(true);
-
 		memset( &g_theKeys, 0, sizeof( KeyMap));
 
 		unsigned int i = 0;