From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 2 20:20:16 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B76C616A4D0 for ; Tue, 2 Nov 2004 20:20:16 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B74643D55 for ; Tue, 2 Nov 2004 20:20:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) iA2KKGpH056523 for ; Tue, 2 Nov 2004 20:20:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id iA2KKGZj056522; Tue, 2 Nov 2004 20:20:16 GMT (envelope-from gnats) Resent-Date: Tue, 2 Nov 2004 20:20:16 GMT Resent-Message-Id: <200411022020.iA2KKGZj056522@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Igor Pokrovsky Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D6E9816A4CE for ; Tue, 2 Nov 2004 20:10:48 +0000 (GMT) Received: from voodoo.oberon.net (voodoo.oberon.net [212.118.165.100]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2241243D41 for ; Tue, 2 Nov 2004 20:10:48 +0000 (GMT) (envelope-from igor@doom.homeunix.org) Received: from dialup84127-155.ip.peterstar.net ([84.204.127.155] helo=doom.homeunix.org) by voodoo.oberon.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.43 (FreeBSD)) id 1CP4zG-0005Ru-Dg for FreeBSD-gnats-submit@freebsd.org; Tue, 02 Nov 2004 21:10:47 +0100 Received: from doom.homeunix.org (localhost [127.0.0.1]) by doom.homeunix.org (8.13.1/8.13.1) with ESMTP id iA2K9oqE095459 for ; Tue, 2 Nov 2004 23:09:51 +0300 (MSK) (envelope-from igor@doom.homeunix.org) Received: (from igor@localhost) by doom.homeunix.org (8.13.1/8.13.1/Submit) id iA2JwNns095414; Tue, 2 Nov 2004 22:58:23 +0300 (MSK) (envelope-from igor) Message-Id: <200411021958.iA2JwNns095414@doom.homeunix.org> Date: Tue, 2 Nov 2004 22:58:23 +0300 (MSK) From: Igor Pokrovsky To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/73432: Update port: games/vavoom 1.15.2 -> 1.15.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Igor Pokrovsky List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2004 20:20:16 -0000 >Number: 73432 >Category: ports >Synopsis: Update port: games/vavoom 1.15.2 -> 1.15.3 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Nov 02 20:20:16 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Igor Pokrovsky >Release: FreeBSD 4.10-STABLE i386 >Organization: >Environment: System: FreeBSD doom.homeunix.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Wed Oct 13 20:27:55 MSD 2004 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386 >Description: Update to 1.15.3. Sound and music support is still very poor. >How-To-Repeat: >Fix: --- vavoom.diff begins here --- diff -ruN /usr/ports/games/vavoom/Makefile vavoom/Makefile --- /usr/ports/games/vavoom/Makefile Wed Oct 27 19:45:36 2004 +++ vavoom/Makefile Tue Nov 2 21:33:41 2004 @@ -6,11 +6,11 @@ # PORTNAME= vavoom -PORTVERSION= 1.15.2 +PORTVERSION= 1.15.3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= v115_2_src +DISTNAME= v115_3_src MAINTAINER= ip@doom.homeunix.org COMMENT= Doom, Doom II, Heretic, Hexen and Strife source port @@ -47,7 +47,7 @@ .endif post-patch: - cd ${WRKSRC} && ${SH} ${WRKSRC}/fixunix.sh + cd ${WRKSRC} && ${TR} -d '\r' <${WRKSRC}/fixunix.sh | ${SH} @${REINPLACE_CMD} -e 's|SDL\/||g' ${WRKSRC}/source/*.cpp do-install: diff -ruN /usr/ports/games/vavoom/distinfo vavoom/distinfo --- /usr/ports/games/vavoom/distinfo Wed Mar 31 10:16:02 2004 +++ vavoom/distinfo Tue Nov 2 21:15:52 2004 @@ -1,2 +1,2 @@ -MD5 (v115_2_src.zip) = 635e5ba761c1d91a3aa03ee5adb802b8 -SIZE (v115_2_src.zip) = 4292268 +MD5 (v115_3_src.zip) = ba834b78d74947bc31182009f5c13580 +SIZE (v115_3_src.zip) = 4328768 diff -ruN /usr/ports/games/vavoom/files/patch-Makefile vavoom/files/patch-Makefile --- /usr/ports/games/vavoom/files/patch-Makefile Fri Jan 23 18:31:16 2004 +++ vavoom/files/patch-Makefile Tue Nov 2 22:15:26 2004 @@ -1,5 +1,5 @@ ---- Makefile.orig Fri Dec 19 20:00:14 2003 -+++ Makefile Fri Jan 23 16:41:34 2004 +--- Makefile.orig ++++ Makefile @@ -8,7 +8,7 @@ #DEBUG = 1 @@ -9,7 +9,7 @@ # Uncomment to compile without OpenGL driver #NOGL = 1 -@@ -70,7 +70,7 @@ +@@ -73,7 +73,7 @@ obj/sys_i386.o \ obj/sys_sdl.o GL_SYS_OBJ = obj/gl_sdl.o @@ -18,7 +18,7 @@ else #-- Linux with Allegro -- SYS_OBJS = \ -@@ -214,7 +214,7 @@ +@@ -213,7 +213,7 @@ ifdef MESAGL LIBS := -lMesaGL $(LIBS) else @@ -27,18 +27,24 @@ endif endif -@@ -308,8 +308,8 @@ +@@ -317,11 +317,11 @@ # --------------------------------------- --C_ARGS = -c -W -Wall -march=pentiumpro -ffast-math --CPP_ARGS = -c -W -Wall -march=pentiumpro -ffast-math +-ARCH ?= -march=pentiumpro +-export ARCH +-C_ARGS = -c -W -Wall $(ARCH) -ffast-math +-CPP_ARGS = -c -W -Wall $(ARCH) -ffast-math +-ASM_ARGS = -c -W -Wall $(ARCH) -x assembler-with-cpp ++#ARCH ?= -march=pentiumpro ++#export ARCH +C_ARGS = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -ffast-math -+CPP_ARGS = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -ffast-math - ASM_ARGS = -c -W -Wall -x assembler-with-cpp ++CPP_ARGS = -c ${CXXFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -ffast-math ++ASM_ARGS = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -x assembler-with-cpp LINK_ARGS = -Wall -@@ -337,7 +337,7 @@ + ifdef DEBUG +@@ -348,7 +348,7 @@ exe: Vavoom$(EXE) Vavoom$(EXE): $(OBJ_FILES) $(LIB_FILES) @@ -47,7 +53,7 @@ suid: chown root.root Vavoom -@@ -347,13 +347,13 @@ +@@ -358,13 +358,13 @@ addr2line -e Vavoom -f < crash.txt >> basev/debug.txt obj/%.o : source/%.c @@ -64,7 +70,7 @@ # --------------------------------------- -@@ -370,16 +370,16 @@ +@@ -381,16 +381,16 @@ svexe: VavoomSV$(EXE) VavoomSV$(EXE): $(SV_OBJ_FILES) @@ -85,7 +91,7 @@ # --------------------------------------- -@@ -415,11 +415,11 @@ +@@ -433,11 +433,11 @@ # --------------------------------------- ifndef INSTALL @@ -99,7 +105,7 @@ endif ifndef INSTALL_GROUP -@@ -511,8 +511,8 @@ +@@ -529,8 +529,8 @@ asm: $(ASM_FILES) source/%.asm : source/%.s source/asm_i386.h source/gas2tasm.exe diff -ruN /usr/ports/games/vavoom/files/patch-source-s_sdl.cpp vavoom/files/patch-source-s_sdl.cpp --- /usr/ports/games/vavoom/files/patch-source-s_sdl.cpp Fri Jan 23 18:31:16 2004 +++ vavoom/files/patch-source-s_sdl.cpp Thu Jan 1 03:00:00 1970 @@ -1,150 +0,0 @@ ---- source/s_sdl.cpp.orig Sat Mar 8 14:08:04 2003 -+++ source/s_sdl.cpp Wed Jan 21 15:41:52 2004 -@@ -82,8 +82,8 @@ - - IMPLEMENT_CLASS(VDefaultSoundDevice); - --static TCvarI mix_frequency ("mix_frequency", "22050", CVAR_ARCHIVE); --static TCvarI mix_bits ("mix_bits", "16", CVAR_ARCHIVE); -+static TCvarI mix_frequency ("mix_frequency", "44100", CVAR_ARCHIVE); -+static TCvarI mix_bits ("mix_bits", "8", CVAR_ARCHIVE); - static TCvarI mix_channels ("mix_channels", "2", CVAR_ARCHIVE); - - static TCvarI mix_chunksize ("mix_chunksize", "4096", CVAR_ARCHIVE); -@@ -107,6 +107,8 @@ - static TVec listener_forward; - static TVec listener_right; - static TVec listener_up; -+ -+SDL_AudioCVT wavecvt; - - // CODE -------------------------------------------------------------------- - -@@ -337,6 +339,12 @@ - mix_bits = fmt & 0xFF; - mix_channels = ch; - -+ if (SDL_BuildAudioCVT(&wavecvt, AUDIO_S8, 2, 4096, -+ fmt, mix_channels, mix_frequency) == -1) { -+ Sys_Error("SDL_BuildAudioCVT: failed.\n"); -+ return; -+ } -+ - channels = Z_CNew(mix_voices); - for (i = 0; i < mix_voices; i++) - { -@@ -425,13 +433,23 @@ - return; - } - -- // copy the lump to a SDL_Mixer chunk... -- chunk = Mix_LoadRAW_RW(SDL_RWFromMem((void*)S_sfx[sound_id].data, -- S_sfx[sound_id].len), 0, S_sfx[sound_id].freq, AUDIO_U8, 1); -- if (chunk == NULL) -- Sys_Error("Mix_LoadRAW_RW() failed!\n"); -- voice = Mix_LoadChannel(-1, chunk, 0); -- -+ wavecvt.len = S_sfx[sound_id].len; -+ wavecvt.buf = (Uint8*)malloc(wavecvt.len*wavecvt.len_mult); -+ memcpy(wavecvt.buf, S_sfx[sound_id].data, S_sfx[sound_id].len); -+ -+ if (SDL_ConvertAudio(&wavecvt) == -1) { -+ Sys_Error("SDL_ConvertAudio: error during conversion\n"); -+ return; -+ } -+ -+ // copy the lump to a SDL_Mixer chunk... -+ chunk = Mix_QuickLoad_RAW((Uint8*)wavecvt.buf, -+ wavecvt.len*wavecvt.len_mult); -+ if (chunk == NULL) -+ Sys_Error("Mix_QuickLoad_RAW() failed!\n"); -+ -+ voice = Mix_PlayChannel(-1, chunk, 0); -+ - if (voice < 0) - { - S_DoneWithLump(sound_id); -@@ -448,9 +466,6 @@ - pitch = CalcPitch(S_sfx[sound_id].freq, sound_id); - #warning how to set the pitch? (CS) - -- // ready to go... -- Mix_Play(voice); -- - channels[chan].origin_id = origin_id; - channels[chan].origin = origin; - channels[chan].channel = channel; -@@ -501,22 +516,28 @@ - return; - } - -- // copy the lump to a SDL_Mixer chunk... -- chunk = Mix_LoadRAW_RW(SDL_RWFromMem((void*)S_VoiceInfo.data, -- S_VoiceInfo.len), 0, S_VoiceInfo.freq, AUDIO_U8, 1); -- if (chunk == NULL) -- Sys_Error("Mix_LoadRAW_RW() failed!\n"); -- voice = Mix_LoadChannel(-1, chunk, 0); -- -+ wavecvt.len = S_sfx[VOICE_SOUND_ID].len; -+ wavecvt.buf = (Uint8*)malloc(wavecvt.len*wavecvt.len_mult); -+ memcpy(wavecvt.buf, S_sfx[VOICE_SOUND_ID].data, S_sfx[VOICE_SOUND_ID].len); -+ -+ if (SDL_ConvertAudio(&wavecvt) == -1) { -+ Sys_Error("SDL_ConvertAudio: error during conversion\n"); -+ return; -+ } -+ // copy the lump to a SDL_Mixer chunk... -+ chunk = Mix_QuickLoad_RAW((Uint8*)wavecvt.buf, -+ wavecvt.len*wavecvt.len_mult); -+ if (chunk == NULL) -+ Sys_Error("Mix_QuickLoad_RAW() failed!\n"); -+ -+ voice = Mix_PlayChannel(-1, chunk, 0); -+ - if (voice < 0) - { - S_DoneWithLump(VOICE_SOUND_ID); - return; - } - -- // ready to go... -- Mix_Play(voice); -- - channels[chan].origin_id = 0; - channels[chan].origin = TVec(0, 0, 0); - channels[chan].channel = 1; -@@ -558,19 +579,26 @@ - return; - } - -- chunk = Mix_LoadRAW_RW(SDL_RWFromMem((void*)S_sfx[sound_id].data, -- S_sfx[sound_id].len), 0, S_sfx[sound_id].freq, AUDIO_U8, 1); -- if (chunk == NULL) -- Sys_Error("Mix_LoadRAW_RW() failed!\n"); -- -- voice = Mix_LoadChannel(-1, chunk, 0); -+ wavecvt.len = S_sfx[sound_id].len; -+ wavecvt.buf = (Uint8*)malloc(wavecvt.len*wavecvt.len_mult); -+ memcpy(wavecvt.buf, S_sfx[sound_id].data, S_sfx[sound_id].len); -+ -+ if (SDL_ConvertAudio(&wavecvt) == -1) { -+ Sys_Error("SDL_ConvertAudio: error during conversion\n"); -+ return; -+ } -+ // copy the lump to a SDL_Mixer chunk... -+ chunk = Mix_QuickLoad_RAW((Uint8*)wavecvt.buf, -+ wavecvt.len*wavecvt.len_mult); -+ if (chunk == NULL) -+ Sys_Error("Mix_QuickLoad_RAW() failed!\n"); -+ -+ voice = Mix_PlayChannel(-1, chunk, 0); - - if (voice < 0) - { - return; - } -- -- Mix_Play(voice); - - start = Sys_Time(); - while (1) diff -ruN /usr/ports/games/vavoom/files/patch-utils_acc_Makefile vavoom/files/patch-utils_acc_Makefile --- /usr/ports/games/vavoom/files/patch-utils_acc_Makefile Thu Jan 1 03:00:00 1970 +++ vavoom/files/patch-utils_acc_Makefile Tue Nov 2 22:15:39 2004 @@ -0,0 +1,21 @@ +--- utils/acc/Makefile.orig ++++ utils/acc/Makefile +@@ -6,7 +6,7 @@ + #LIBS=-lstdc++ + endif + +-CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro ++CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer + + OBJS = \ + acc.o \ +@@ -21,7 +21,7 @@ + all: ../bin/acc$(EXE) + + ../bin/acc$(EXE): $(OBJS) +- gcc -s -o $@ $^ $(LIBS) ++ ${CC} -s -o $@ $^ $(LIBS) + + %.o : %.c *.h +- gcc $(CFLAGS) -c -o $@ $< ++ ${CC} $(CFLAGS) -c -o $@ $< diff -ruN /usr/ports/games/vavoom/files/patch-utils_acc_misc.c vavoom/files/patch-utils_acc_misc.c --- /usr/ports/games/vavoom/files/patch-utils_acc_misc.c Thu Jan 1 03:00:00 1970 +++ vavoom/files/patch-utils_acc_misc.c Tue Nov 2 22:11:00 2004 @@ -0,0 +1,11 @@ +--- utils/acc/misc.c.orig ++++ utils/acc/misc.c +@@ -12,7 +12,7 @@ + #else + #include + #include +-#ifndef __linux__ ++#if !defined(__linux__) && !defined(__FreeBSD__) + #include + #endif + #include diff -ruN /usr/ports/games/vavoom/files/patch-utils_acc_token.c vavoom/files/patch-utils_acc_token.c --- /usr/ports/games/vavoom/files/patch-utils_acc_token.c Thu Jan 1 03:00:00 1970 +++ vavoom/files/patch-utils_acc_token.c Tue Nov 2 22:30:17 2004 @@ -0,0 +1,11 @@ +--- utils/acc/token.c.orig ++++ utils/acc/token.c +@@ -10,7 +10,7 @@ + #ifdef __NeXT__ + #include + #else +-#ifndef __linux__ ++#if !defined(__linux__) && !defined(__FreeBSD__) + #include + #endif + #include diff -ruN /usr/ports/games/vavoom/files/patch-utils_glbsp_Plugin.mak vavoom/files/patch-utils_glbsp_Plugin.mak --- /usr/ports/games/vavoom/files/patch-utils_glbsp_Plugin.mak Thu Jan 1 03:00:00 1970 +++ vavoom/files/patch-utils_glbsp_Plugin.mak Tue Nov 2 22:47:23 2004 @@ -0,0 +1,24 @@ +--- utils/glbsp/Plugin.mak.orig ++++ utils/glbsp/Plugin.mak +@@ -6,9 +6,9 @@ + + OUTNAME=libglbsp.a + +-CC=gcc +-CFLAGS=-O3 -Wall -DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline +-AR=ar rc ++#CC=gcc ++CFLAGS+=-O3 -Wall -DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline ++#AR=ar rc + RANLIB=ranlib + + OBJS=$(MAIN)/analyze.o \ +@@ -31,7 +31,7 @@ + rm -f $(OUTNAME) $(MAIN)/*.o + + $(OUTNAME): $(OBJS) +- $(AR) $(OUTNAME) $(OBJS) ++ $(AR) rc $(OUTNAME) $(OBJS) + $(RANLIB) $(OUTNAME) + + .PHONY: all clean diff -ruN /usr/ports/games/vavoom/files/patch-utils_glvis_Makefile vavoom/files/patch-utils_glvis_Makefile --- /usr/ports/games/vavoom/files/patch-utils_glvis_Makefile Thu Jan 1 03:00:00 1970 +++ vavoom/files/patch-utils_glvis_Makefile Tue Nov 2 22:47:10 2004 @@ -0,0 +1,31 @@ +--- utils/glvis/Makefile.orig ++++ utils/glvis/Makefile +@@ -6,7 +6,7 @@ + LIBS=-lstdc++ + endif + +-CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro ++CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer + LIB_OBJS = cmdlib.o wadlib.o level.o flow.o + OBJS = glvis.o + LIBS += -lm +@@ -14,15 +14,15 @@ + all: ../bin/glvis$(EXE) + + ../bin/glvis$(EXE): $(OBJS) libglvis.a +- gcc -s -o $@ $^ $(LIBS) ++ ${CC} -s -o $@ $^ $(LIBS) + + libglvis.a: $(LIB_OBJS) +- ar rc $@ $^ ++ ${AR} rc $@ $^ + ranlib $@ + + %.o: %.cpp *.h ../common/*.h +- gcc $(CFLAGS) -I../common -c -o $@ $< ++ ${CC} $(CFLAGS) -I../common -c -o $@ $< + + %.o: ../common/%.cpp ../common/*.h +- gcc $(CFLAGS) -c -o $@ $< ++ ${CC} $(CFLAGS) -c -o $@ $< + diff -ruN /usr/ports/games/vavoom/files/patch-utils_vcc_Makefile vavoom/files/patch-utils_vcc_Makefile --- /usr/ports/games/vavoom/files/patch-utils_vcc_Makefile Thu Jan 1 03:00:00 1970 +++ vavoom/files/patch-utils_vcc_Makefile Tue Nov 2 22:51:09 2004 @@ -0,0 +1,41 @@ +--- utils/vcc/Makefile.orig ++++ utils/vcc/Makefile +@@ -6,7 +6,7 @@ + LIBS=-lstdc++ + endif + +-CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro ++CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer + + OBJS = \ + cmdlib.o \ +@@ -35,19 +35,23 @@ + + all: ../bin/vcc$(EXE) + +-../bin/vcc$(EXE): $(OBJS) vcpp/libcpp.a +- gcc -s -o $@ $^ $(LIBS) ++../bin/vcc$(EXE): $(OBJS) clean_libcpp vcpp/libcpp.a ++ ${CC} -s -o $@ $(OBJS) vcpp/libcpp.a $(LIBS) + ++.PHONY: all clean_libcpp ++clean_libcpp: ++ ${RM} -rf vcpp/*.o vcpp/libcpp.a ++ + vcpp/libcpp.a: $(CPP_OBJS) +- ar rc $@ $^ ++ ${AR} rc $@ $^ + ranlib $@ + + %.o : %.cpp vcc.h ../../source/progdefs.h ../common/cmdlib.h +- gcc $(CFLAGS) -I../common -c -o $@ $< ++ ${CC} $(CFLAGS) -I../common -c -o $@ $< + + %.o : ../common/%.cpp ../common/cmdlib.h +- gcc $(CFLAGS) -c -o $@ $< ++ ${CC} $(CFLAGS) -c -o $@ $< + + vcpp/%.o : vcpp/%.cpp vcpp/cpp.h +- gcc $(CFLAGS) -c -o $@ $< ++ ${CC} $(CFLAGS) -c -o $@ $< + diff -ruN /usr/ports/games/vavoom/files/patch-utils_vlumpy_Makefile vavoom/files/patch-utils_vlumpy_Makefile --- /usr/ports/games/vavoom/files/patch-utils_vlumpy_Makefile Thu Jan 1 03:00:00 1970 +++ vavoom/files/patch-utils_vlumpy_Makefile Tue Nov 2 22:30:28 2004 @@ -0,0 +1,24 @@ +--- utils/vlumpy/Makefile.orig ++++ utils/vlumpy/Makefile +@@ -6,17 +6,17 @@ + LIBS=-lm -lstdc++ + endif + +-CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro ++CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer + OBJS = cmdlib.o imglib.o scrlib.o wadlib.o vlumpy.o + + all: ../bin/vlumpy$(EXE) + + ../bin/vlumpy$(EXE): $(OBJS) +- gcc -s -o $@ $(OBJS) $(LIBS) ++ ${CC} -s -o $@ $(OBJS) $(LIBS) + + %.o: %.cpp ../common/*.h +- gcc $(CFLAGS) -I../common -c -o $@ $< ++ ${CC} $(CFLAGS) -I../common -c -o $@ $< + + %.o: ../common/%.cpp ../common/*.h +- gcc $(CFLAGS) -c -o $@ $< ++ ${CC} $(CFLAGS) -c -o $@ $< + diff -ruN /usr/ports/games/vavoom/pkg-descr vavoom/pkg-descr --- /usr/ports/games/vavoom/pkg-descr Fri Jan 23 18:31:15 2004 +++ vavoom/pkg-descr Tue Nov 2 22:54:42 2004 @@ -14,9 +14,6 @@ * Jumping; .... -No music support is available in SDL compiled version at the moment. -Sound effects are 8 bit, 44100KHz, stereo. - WWW: http://www.vavoom-engine.com/ - Igor Pokrovsky --- vavoom.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: