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

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index a50c24f..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)
 {