From 3fd73565718cb2a3b022964b26cfcf3fc3d65d32 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Thu, 21 Jul 2011 09:03:35 +0000 Subject: [PATCH] fixed vorbisfile link order for static linkage if one chooses to do so. deleted unused vorbisenc.h header. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@472 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/Makefile | 2 +- Quake/Makefile.darwin | 2 +- Quake/Makefile.w32 | 2 +- Quake/Makefile.w64 | 2 +- Windows/CodeBlocks/QuakeSpasm.cbp | 2 +- Windows/VisualStudio/quakespasm.vcproj | 8 +- Windows/codecs/include/vorbis/vorbisenc.h | 436 ---------------------- 7 files changed, 9 insertions(+), 445 deletions(-) delete mode 100644 Windows/codecs/include/vorbis/vorbisenc.h diff --git a/Quake/Makefile b/Quake/Makefile index c58a37a7..0e2b655c 100644 --- a/Quake/Makefile +++ b/Quake/Makefile @@ -141,7 +141,7 @@ CFLAGS+= -DUSE_CODEC_WAVE endif ifeq ($(USE_CODEC_VORBIS),1) CFLAGS+= -DUSE_CODEC_VORBIS -CODECLIBS+= vorbis vorbisfile ogg +CODECLIBS+= vorbisfile vorbis ogg endif ifeq ($(USE_CODEC_MP3),1) CFLAGS+= -DUSE_CODEC_MP3 diff --git a/Quake/Makefile.darwin b/Quake/Makefile.darwin index b8110c85..b064ef71 100644 --- a/Quake/Makefile.darwin +++ b/Quake/Makefile.darwin @@ -158,7 +158,7 @@ CFLAGS+= -DUSE_CODEC_WAVE endif ifeq ($(USE_CODEC_VORBIS),1) CFLAGS+= -DUSE_CODEC_VORBIS -CODECLIBS+= -lvorbis -lvorbisfile -logg +CODECLIBS+= -lvorbisfile -lvorbis -logg endif ifeq ($(USE_CODEC_MP3),1) CFLAGS+= -DUSE_CODEC_MP3 diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32 index ff34b495..63197594 100644 --- a/Quake/Makefile.w32 +++ b/Quake/Makefile.w32 @@ -117,7 +117,7 @@ ifeq ($(USE_CODEC_VORBIS),1) CFLAGS+= -DUSE_CODEC_VORBIS CODEC_INC = -I../Windows/codecs/include CODEC_LINK= -L../Windows/codecs/x86 -CODECLIBS+= -lvorbis -lvorbisfile -logg +CODECLIBS+= -lvorbisfile -lvorbis -logg endif ifeq ($(USE_CODEC_MP3),1) CFLAGS+= -DUSE_CODEC_MP3 diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64 index f59a96f8..7f1fdf38 100644 --- a/Quake/Makefile.w64 +++ b/Quake/Makefile.w64 @@ -117,7 +117,7 @@ ifeq ($(USE_CODEC_VORBIS),1) CFLAGS+= -DUSE_CODEC_VORBIS CODEC_INC = -I../Windows/codecs/include CODEC_LINK= -L../Windows/codecs/x64 -CODECLIBS+= -lvorbis -lvorbisfile -logg +CODECLIBS+= -lvorbisfile -lvorbis -logg endif ifeq ($(USE_CODEC_MP3),1) CFLAGS+= -DUSE_CODEC_MP3 diff --git a/Windows/CodeBlocks/QuakeSpasm.cbp b/Windows/CodeBlocks/QuakeSpasm.cbp index 487f0f5a..56298598 100644 --- a/Windows/CodeBlocks/QuakeSpasm.cbp +++ b/Windows/CodeBlocks/QuakeSpasm.cbp @@ -42,8 +42,8 @@ - + diff --git a/Windows/VisualStudio/quakespasm.vcproj b/Windows/VisualStudio/quakespasm.vcproj index c2b7fa37..ee521012 100644 --- a/Windows/VisualStudio/quakespasm.vcproj +++ b/Windows/VisualStudio/quakespasm.vcproj @@ -61,7 +61,7 @@ /> struct ovectl_ratemanage2_arg * - * - * Used to query the current encoder bitrate management setting. Also used to - * initialize fields of an ovectl_ratemanage2_arg structure for use with - * \ref OV_ECTL_RATEMANAGE2_SET. - */ -#define OV_ECTL_RATEMANAGE2_GET 0x14 - -/** - * Set the current encoder bitrate management settings. - * - * Argument: struct ovectl_ratemanage2_arg * - * - * Used to set the current encoder bitrate management settings to the values - * listed in the ovectl_ratemanage2_arg. Passing a NULL pointer will disable - * bitrate management. -*/ -#define OV_ECTL_RATEMANAGE2_SET 0x15 - -/** - * Returns the current encoder hard-lowpass setting (kHz) in the double - * pointed to by arg. - * - * Argument: double * -*/ -#define OV_ECTL_LOWPASS_GET 0x20 - -/** - * Sets the encoder hard-lowpass to the value (kHz) pointed to by arg. Valid - * lowpass settings range from 2 to 99. - * - * Argument: double * -*/ -#define OV_ECTL_LOWPASS_SET 0x21 - -/** - * Returns the current encoder impulse block setting in the double pointed - * to by arg. - * - * Argument: double * -*/ -#define OV_ECTL_IBLOCK_GET 0x30 - -/** - * Sets the impulse block bias to the the value pointed to by arg. - * - * Argument: double * - * - * Valid range is -15.0 to 0.0 [default]. A negative impulse block bias will - * direct to encoder to use more bits when incoding short blocks that contain - * strong impulses, thus improving the accuracy of impulse encoding. - */ -#define OV_ECTL_IBLOCK_SET 0x31 - -/** - * Returns the current encoder coupling setting in the int pointed - * to by arg. - * - * Argument: int * -*/ -#define OV_ECTL_COUPLING_GET 0x40 - -/** - * Enables/disables channel coupling in multichannel encoding according to arg. - * - * Argument: int * - * - * Zero disables channel coupling for multichannel inputs, nonzer enables - * channel coupling. Setting has no effect on monophonic encoding or - * multichannel counts that do not offer coupling. At present, coupling is - * available for stereo and 5.1 encoding. - */ -#define OV_ECTL_COUPLING_SET 0x41 - - /* deprecated rate management supported only for compatibility */ - -/** - * Old interface to querying bitrate management settings. - * - * Deprecated after move to bit-reservoir style management in 1.1 rendered - * this interface partially obsolete. - - * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_GET instead. - * - * Argument: struct ovectl_ratemanage_arg * - */ -#define OV_ECTL_RATEMANAGE_GET 0x10 -/** - * Old interface to modifying bitrate management settings. - * - * deprecated after move to bit-reservoir style management in 1.1 rendered - * this interface partially obsolete. - * - * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead. - * - * Argument: struct ovectl_ratemanage_arg * - */ -#define OV_ECTL_RATEMANAGE_SET 0x11 -/** - * Old interface to setting average-bitrate encoding mode. - * - * Deprecated after move to bit-reservoir style management in 1.1 rendered - * this interface partially obsolete. - * - * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead. - * - * Argument: struct ovectl_ratemanage_arg * - */ -#define OV_ECTL_RATEMANAGE_AVG 0x12 -/** - * Old interface to setting bounded-bitrate encoding modes. - * - * deprecated after move to bit-reservoir style management in 1.1 rendered - * this interface partially obsolete. - * - * \deprecated Please use \ref OV_ECTL_RATEMANAGE2_SET instead. - * - * Argument: struct ovectl_ratemanage_arg * - */ -#define OV_ECTL_RATEMANAGE_HARD 0x13 - -/*@}*/ - - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif