Merge branch 'master' of github.com:yquake2/yquake2

This commit is contained in:
Yamagi Burmeister 2012-11-04 18:52:27 +01:00
commit 82275f636e
6 changed files with 9 additions and 0 deletions

View file

@ -48,7 +48,10 @@ qboolean streamPlaying;
int active_buffers; int active_buffers;
static ALuint streamSource; static ALuint streamSource;
#ifndef __APPLE__
static ALuint underwaterFilter; static ALuint underwaterFilter;
#endif
static ALuint s_srcnums[MAX_CHANNELS - 1]; static ALuint s_srcnums[MAX_CHANNELS - 1];
static int s_framecount; static int s_framecount;

View file

@ -27,8 +27,14 @@
#ifdef RETEXTURE #ifdef RETEXTURE
#include "../header/local.h" #include "../header/local.h"
#ifdef __APPLE__
#include <libjpeg/jpeglib.h>
#include <libjpeg/jerror.h>
#else
#include <jpeglib.h> #include <jpeglib.h>
#include <jerror.h> #include <jerror.h>
#endif
void jpeg_memory_src(j_decompress_ptr cinfo, void jpeg_memory_src(j_decompress_ptr cinfo,
unsigned char *inbuffer, unsigned char *inbuffer,

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.