mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2025-02-16 17:11:03 +00:00
Merge branch 'master' of github.com:yquake2/yquake2
This commit is contained in:
commit
82275f636e
6 changed files with 9 additions and 0 deletions
|
@ -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;
|
||||||
|
|
|
@ -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,
|
||||||
|
|
BIN
stuff/osx-frameworks/SDL.zip
Normal file
BIN
stuff/osx-frameworks/SDL.zip
Normal file
Binary file not shown.
BIN
stuff/osx-frameworks/libjpeg.zip
Normal file
BIN
stuff/osx-frameworks/libjpeg.zip
Normal file
Binary file not shown.
BIN
stuff/osx-frameworks/ogg.zip
Normal file
BIN
stuff/osx-frameworks/ogg.zip
Normal file
Binary file not shown.
BIN
stuff/osx-frameworks/vorbis.zip
Normal file
BIN
stuff/osx-frameworks/vorbis.zip
Normal file
Binary file not shown.
Loading…
Reference in a new issue