Some compile fixes and remove some dead code.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5549 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2019-09-26 02:31:56 +00:00
parent cfd20f4f06
commit a09a8ebcc3
6 changed files with 10 additions and 30 deletions

View file

@ -44,46 +44,23 @@ fte_inlinebody float M_LinearToSRGB(float x, float mag);
// These 4 libraries required for the version command
#if defined(MINGW)
#if defined(AVAIL_PNGLIB) && !defined(SERVERONLY)
#include "./mingw-libs/png.h"
#endif
#ifdef AVAIL_ZLIB
#include "./mingw-libs/zlib.h"
#endif
#if defined(AVAIL_JPEGLIB) && !defined(SERVERONLY)
#define JPEG_API VARGS
//#include "./mingw-libs/jversion.h"
#include "./mingw-libs/jpeglib.h"
#endif
#ifdef FTE_SDL
#include <SDL.h>
#endif
#elif defined(_WIN32)
#if defined(AVAIL_PNGLIB) && !defined(SERVERONLY)
#include "png.h"
#endif
#ifdef AVAIL_ZLIB
#include "zlib.h"
#endif
#if defined(AVAIL_JPEGLIB) && !defined(SERVERONLY)
#define JPEG_API VARGS
//#include "jversion.h"
#include "jpeglib.h"
#endif
#ifdef FTE_SDL
#include <SDL.h>
#endif
#else
#if defined(AVAIL_PNGLIB) && !defined(SERVERONLY)
#include <png.h>
#endif
#ifdef AVAIL_ZLIB
#include <zlib.h>
#endif
#if defined(AVAIL_JPEGLIB) && !defined(SERVERONLY)
//#include <jversion.h>
#include <jpeglib.h>
#endif
#ifdef FTE_SDL
#include <SDL.h>
#endif