From 70698e17b79e908180fb3dd0401a61f748f8ee6c Mon Sep 17 00:00:00 2001 From: Lance Date: Thu, 11 Nov 2010 09:14:30 +0000 Subject: [PATCH] My mistake, jversion.h isn't a header that is distributed in linux library development packages git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3646 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/common.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/engine/common/common.c b/engine/common/common.c index 6892ef902..cee92c5db 100644 --- a/engine/common/common.c +++ b/engine/common/common.c @@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif #if defined(AVAIL_JPEGLIB) && !defined(SERVERONLY) #define JPEG_API VARGS - #include "./mingw-libs/jversion.h" + //#include "./mingw-libs/jversion.h" #include "./mingw-libs/jpeglib.h" #endif #elif defined(_WIN32) @@ -46,7 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #endif #if defined(AVAIL_JPEGLIB) && !defined(SERVERONLY) #define JPEG_API VARGS - #include "jversion.h" + //#include "jversion.h" #include "jpeglib.h" #endif #else @@ -57,7 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #endif #if defined(AVAIL_JPEGLIB) && !defined(SERVERONLY) - #include + //#include #include #endif #endif @@ -3195,8 +3195,7 @@ void COM_Version_f (void) #ifndef AVAIL_JPEGLIB Con_Printf("libjpeg disabled\n"); #else - //Con_Printf("libjpeg: %i series (%s)\n", ( JPEG_LIB_VERSION / 10 ), JVERSION ); - Con_Printf("libjpeg: %s\n", JVERSION ); + Con_Printf("libjpeg: %i (%d series)\n", JPEG_LIB_VERSION, ( JPEG_LIB_VERSION / 10 ) ); #endif #ifndef AVAIL_OGGVORBIS Con_Printf("libvorbis disabled\n");