Tweaked svn stuff a little more. Should be more robust now. 3rd party SVN headers+libs are no longer on svn.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4605 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
663c405165
commit
13b586ea06
88 changed files with 52 additions and 18490 deletions
|
@ -106,7 +106,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
#define AVAIL_D3D
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && !defined(_SDL)
|
||||
#if defined(_WIN32) && !defined(FTE_SDL)
|
||||
#define HAVE_WINSSPI //built in component, checks against windows' root ca database and revocations etc.
|
||||
#elif defined(__linux__) || defined(__CYGWIN__)
|
||||
#define HAVE_GNUTLS //currently disabled as it does not validate the server's certificate, beware the mitm attack.
|
||||
|
|
|
@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
//#include "./mingw-libs/jversion.h"
|
||||
#include "./mingw-libs/jpeglib.h"
|
||||
#endif
|
||||
#ifdef _SDL
|
||||
#ifdef FTE_SDL
|
||||
#include <SDL.h>
|
||||
#endif
|
||||
#elif defined(_WIN32)
|
||||
|
@ -54,7 +54,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
//#include "jversion.h"
|
||||
#include "jpeglib.h"
|
||||
#endif
|
||||
#ifdef _SDL
|
||||
#ifdef FTE_SDL
|
||||
#include <SDL.h>
|
||||
#endif
|
||||
#else
|
||||
|
@ -68,7 +68,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
//#include <jversion.h>
|
||||
#include <jpeglib.h>
|
||||
#endif
|
||||
#ifdef _SDL
|
||||
#ifdef FTE_SDL
|
||||
#include <SDL.h>
|
||||
#endif
|
||||
#endif
|
||||
|
@ -4052,7 +4052,7 @@ void COM_Version_f (void)
|
|||
Con_Printf("QuakeC just-in-time compiler (QCJIT) enabled\n");
|
||||
#endif
|
||||
|
||||
#ifdef _SDL
|
||||
#ifdef FTE_SDL
|
||||
Con_Printf("SDL version: %d.%d.%d\n", SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#define Z_Free free
|
||||
#define Z_Malloc malloc
|
||||
#else
|
||||
#if !defined(_WIN32) || defined(_SDL)
|
||||
#if !defined(_WIN32) || defined(FTE_SDL)
|
||||
#define FSSTDIO_OpenPath VFSOS_OpenPath
|
||||
#endif
|
||||
#define FSSTDIO_OpenTemp FS_OpenTemp
|
||||
|
@ -184,7 +184,7 @@ vfsfile_t *VFSSTDIO_Open(const char *osname, const char *mode, qboolean *needsfl
|
|||
return (vfsfile_t*)file;
|
||||
}
|
||||
|
||||
#if !defined(_WIN32) || defined(_SDL)
|
||||
#if !defined(_WIN32) || defined(FTE_SDL)
|
||||
vfsfile_t *VFSOS_Open(const char *osname, const char *mode)
|
||||
{
|
||||
vfsfile_t *f;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue