Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Xawotihs
2010-12-23 07:57:50 +00:00
parent 093d229c50
commit b3fb8022a0
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
JGE/include/JRenderer.h
View File

@@ -16,7 +16,7 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#if (!defined IOS) && (!defined QT_CONFIG) #if (!defined IOS)
#include <gif_lib.h> #include <gif_lib.h>
#endif //IOS #endif //IOS
@@ -572,7 +572,7 @@ private:
bool mVRAM; 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); 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); 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); void LoadGIF(TextureInfo &textureInfo, const char *filename, int mode = 0, int TextureFormat = TEXTURE_FORMAT);

4
JGE/src/pc/JGfx.cpp
View File

@@ -9,7 +9,7 @@
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
#define GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES
#if (!defined IOS) && (!defined QT_CONFIG) #if (!defined IOS)
#ifdef WIN32 #ifdef WIN32
#pragma warning(disable : 4786) #pragma warning(disable : 4786)
#pragma comment( lib, "giflib.lib" ) #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))) static void jpg_null(j_decompress_ptr cinfo __attribute__((unused)))
{ {
} }

3
projects/mtg/wagic.pro
View File

@@ -32,7 +32,8 @@ OBJECTS_DIR = objs
MOC_DIR = objs MOC_DIR = objs
DESTDIR = bin 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 macx|unix:LIBS += -lz
PRECOMPILED_HEADER = include/PrecompiledHeader.h PRECOMPILED_HEADER = include/PrecompiledHeader.h