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
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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)))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user