X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FOpenGL_Windows.cpp;h=7b68b8f4849445fabf0121c08fe09418e52d8574;hb=88ca07d019951682ca9ece7030db83cf57389be1;hp=7fbeb494e423053f40bb92037ef9eae2f931f84e;hpb=9a5f2758e538d9216d255b4797f042a1b6874272;p=lugaru.git

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 7fbeb49..7b68b8f 100644
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -19,10 +19,13 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-
+/* No need for Visual Leak Detector
 #ifdef WIN32
 #include <vld.h>
 #endif
+*/
+
+#define USE_DEVIL 0
 
 #ifndef USE_DEVIL
 #  ifdef WIN32
@@ -37,10 +40,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 +261,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 +1581,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 +1711,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 +2370,6 @@ int main(int argc, char **argv)
 			}
 		}
 
-		logger.start(true);
-
 		memset( &g_theKeys, 0, sizeof( KeyMap));
 
 		unsigned int i = 0;