From b3fb8022a053d31bb6c666fb481739749421dd7d Mon Sep 17 00:00:00 2001
From: Xawotihs <Xawotihs@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Thu, 23 Dec 2010 07:57:50 +0000
Subject: [PATCH] Deactivated the QImage code as it causes problems on win7 and
 vista. This implies that the Qt version still depends on libjpeg, libpng and
 libgif

---
 JGE/include/JRenderer.h | 4 ++--
 JGE/src/pc/JGfx.cpp     | 4 ++--
 projects/mtg/wagic.pro  | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/JGE/include/JRenderer.h b/JGE/include/JRenderer.h
index 9eaca9ba0..b84daf26c 100644
--- a/JGE/include/JRenderer.h
+++ b/JGE/include/JRenderer.h
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#if (!defined IOS) && (!defined QT_CONFIG)
+#if (!defined IOS)
 #include <gif_lib.h>
 #endif //IOS
 
@@ -572,7 +572,7 @@ private:
 		bool mVRAM;
 	};
 
-#if (!defined IOS) && (!defined QT_CONFIG)
+#if (!defined IOS)
 	void LoadJPG(TextureInfo &textureInfo, const char *filename, int mode = 0, int TextureFormat = TEXTURE_FORMAT);
 	int LoadPNG(TextureInfo &textureInfo, const char *filename, int mode = 0, int TextureFormat = TEXTURE_FORMAT);
 	void LoadGIF(TextureInfo &textureInfo, const char *filename, int mode = 0, int TextureFormat = TEXTURE_FORMAT);
diff --git a/JGE/src/pc/JGfx.cpp b/JGE/src/pc/JGfx.cpp
index 2ef9accf8..d4281e42b 100644
--- a/JGE/src/pc/JGfx.cpp
+++ b/JGE/src/pc/JGfx.cpp
@@ -9,7 +9,7 @@
 //-------------------------------------------------------------------------------------
 #define GL_GLEXT_PROTOTYPES
 
-#if (!defined IOS) && (!defined QT_CONFIG)
+#if (!defined IOS)
 #ifdef WIN32
   #pragma warning(disable : 4786)
   #pragma comment( lib, "giflib.lib" )
@@ -1477,7 +1477,7 @@ static int getNextPower2(int width)
 }
 
 
-#if (!defined IOS) && (!defined QT_CONFIG)
+#if (!defined IOS)
 static void jpg_null(j_decompress_ptr cinfo __attribute__((unused)))
 {
 }
diff --git a/projects/mtg/wagic.pro b/projects/mtg/wagic.pro
index 7e4f898d3..4044d65d7 100644
--- a/projects/mtg/wagic.pro
+++ b/projects/mtg/wagic.pro
@@ -32,7 +32,8 @@ OBJECTS_DIR = objs
 MOC_DIR = objs
 DESTDIR = bin
 
-windows:LIBS += -L../../JGE/Dependencies/lib -lfmodvc
+unix:LIBS += -ljpeg -lgif -lpng12
+windows:LIBS += -L../../JGE/Dependencies/lib -llibjpeg-static-mt-debug -lgiflib -llibpng -lfmodvc
 macx|unix:LIBS += -lz
 
 PRECOMPILED_HEADER = include/PrecompiledHeader.h