diff options
| author | Steven Fuller <relnev@icculus.org> | 2001-08-18 22:46:08 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:36 +0200 |
| commit | e49862a2d283798b8d80b222acf6aa02f5459368 (patch) | |
| tree | ba445fc3f8a4940c0a569c3e3288fdd7d717e171 | |
| parent | d6cb06cd9ec1f941e8c7e05059c057e7139607df (diff) | |
Fixed compilation with GCC 3.0.
Fixed invalid cast (ushort * -> uint *) in openal.c.
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | src/openal.c | 5 | ||||
| -rw-r--r-- | src/win95/fail.h | 14 |
3 files changed, 9 insertions, 17 deletions
@@ -1,12 +1,17 @@ CC = gcc +CXX = gcc +#CC = gcc-3.0 +#CXX = gcc-3.0 NASM = nasm CFLAGS = -g -Wall -pipe -O2 -Dengine=1 -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend -Iavp/win95/gadgets +#CFLAGS = -Wall -pipe -O6 -ffast-math -fomit-frame-pointer -march=pentiumpro -mcpu=pentiumpro -Dengine=1 -I. -Iinclude -Iwin95 -Iavp -Iavp/win95 -Iavp/support -Iavp/win95/frontend -Iavp/win95/gadgets CXXFLAGS = $(CFLAGS) LDLIBS = -lm CFLAGS += `sdl-config --cflags` LDLIBS += -L/usr/X11R6/lib -lX11 -lXext -lGL `sdl-config --libs` -lopenal -lm +#LDLIBS += -lstdc++ AFLAGS = -g -Iinclude/ -w+macro-params -w+orphan-labels -w+number-overflow @@ -50,7 +55,7 @@ OBJ = $(ROOTOBJ) $(AVPOBJ) $(SHAPESOBJ) $(SUPPORTOBJ) $(AVPWIN95OBJ) $(FRONTENDO all: AvP AvP: depend $(OBJ) - gcc -o AvP $(OBJ) $(LDLIBS) + $(CC) -o AvP $(OBJ) $(LDLIBS) compile: $(OBJ) diff --git a/src/openal.c b/src/openal.c index 24362eb..5e617b1 100644 --- a/src/openal.c +++ b/src/openal.c @@ -498,7 +498,8 @@ unsigned char *ExtractWavFile(int soundIndex, unsigned char *bufferPtr) ALint len, seclen = 0; unsigned char *nb; void *udata; - ALushort rfmt, rchan, rfreq, rsize; + ALushort rfmt, rchan, rfreq; + ALuint rsize; fprintf(stderr, "ExtractWavFile(%d, %p)\n", soundIndex, bufferPtr); @@ -510,7 +511,7 @@ unsigned char *ExtractWavFile(int soundIndex, unsigned char *bufferPtr) fprintf (stderr, "Loaded %s\n", GameSounds[soundIndex].wavName); } - if (acLoadWAV (bufferPtr, (ALuint *) &rsize, &udata, &rfmt, + if (acLoadWAV (bufferPtr, &rsize, &udata, &rfmt, &rchan, &rfreq) == NULL) { fprintf (stderr, "Unable to convert data\n"); return (unsigned char *)0; diff --git a/src/win95/fail.h b/src/win95/fail.h index 8838103..8c13555 100644 --- a/src/win95/fail.h +++ b/src/win95/fail.h @@ -21,22 +21,8 @@ extern "C" { #define VARARG_DECL #endif -#ifdef __GNUC__ - -#if __GNUC__ >= 2 && __GNUC_MINOR__ >= 5 -extern void -VARARG_DECL fail (const char * __format, ...) - __attribute__ ((noreturn, format (printf, 1, 2))); -#else -extern __volatile__ void VARARG_DECL fail (const char * __format, ...); -#endif - -#else - extern void VARARG_DECL fail (const char * __format, ...); -#endif - #ifdef __cplusplus } #endif |