fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-08 16:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge tag 'quakespasm-0.94.4' into qss

Browse source
This commit is contained in:
Shpoike 2022-07-15 13:24:04 +01:00
commit a3ce19fa74
19 changed files with 95 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
MacOSX/QuakeSpasmPPC.xcodeproj/project.pbxproj
View file

@ -109,8 +109,8 @@
63D6EB5F23A2563B0047028C /* snd_mp3tag.c in Sources */ = {isa = PBXBuildFile; fileRef = 63D6EB5E23A2563B0047028C /* snd_mp3tag.c */; }; 63D6EB5F23A2563B0047028C /* snd_mp3tag.c in Sources */ = {isa = PBXBuildFile; fileRef = 63D6EB5E23A2563B0047028C /* snd_mp3tag.c */; };
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
A4E3AF2A05D43FCC000F1B47 /* libmikmod.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = F5F5DE80017CB4370103A810 /* libmikmod.dylib */; }; A4E3AF2A05D43FCC000F1B47 /* libxmp.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = F5F5DE80017CB4370103A810 /* libxmp.dylib */; };
A4E3AF6205D43FCC000F1B47 /* libmikmod.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5F5DE80017CB4370103A810 /* libmikmod.dylib */; }; A4E3AF6205D43FCC000F1B47 /* libxmp.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5F5DE80017CB4370103A810 /* libxmp.dylib */; };
B021C20914A5FF7E003F18D6 /* cfgfile.c in Sources */ = {isa = PBXBuildFile; fileRef = B021C20714A5FF7E003F18D6 /* cfgfile.c */; }; B021C20914A5FF7E003F18D6 /* cfgfile.c in Sources */ = {isa = PBXBuildFile; fileRef = B021C20714A5FF7E003F18D6 /* cfgfile.c */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@ -139,7 +139,7 @@
48E2EC8715FB516600B8D476 /* libogg.dylib in Copy Libraries */, 48E2EC8715FB516600B8D476 /* libogg.dylib in Copy Libraries */,
48E2EC8815FB516600B8D476 /* libvorbis.dylib in Copy Libraries */, 48E2EC8815FB516600B8D476 /* libvorbis.dylib in Copy Libraries */,
48E2EC8915FB516600B8D476 /* libvorbisfile.dylib in Copy Libraries */, 48E2EC8915FB516600B8D476 /* libvorbisfile.dylib in Copy Libraries */,
A4E3AF2A05D43FCC000F1B47 /* libmikmod.dylib in Copy Libraries */, A4E3AF2A05D43FCC000F1B47 /* libxmp.dylib in Copy Libraries */,
); );
name = "Copy Libraries"; name = "Copy Libraries";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
@ -323,7 +323,7 @@
8D1107320486CEB800E47090 /* QuakeSpasm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QuakeSpasm.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8D1107320486CEB800E47090 /* QuakeSpasm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QuakeSpasm.app; sourceTree = BUILT_PRODUCTS_DIR; };
B021C20714A5FF7E003F18D6 /* cfgfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cfgfile.c; path = ../Quake/cfgfile.c; sourceTree = SOURCE_ROOT; }; B021C20714A5FF7E003F18D6 /* cfgfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cfgfile.c; path = ../Quake/cfgfile.c; sourceTree = SOURCE_ROOT; };
B021C20814A5FF7E003F18D6 /* cfgfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cfgfile.h; path = ../Quake/cfgfile.h; sourceTree = SOURCE_ROOT; }; B021C20814A5FF7E003F18D6 /* cfgfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cfgfile.h; path = ../Quake/cfgfile.h; sourceTree = SOURCE_ROOT; };
F5F5DE80017CB4370103A810 /* libmikmod.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmikmod.dylib; path = codecs/lib/libmikmod.dylib; sourceTree = "<group>"; }; F5F5DE80017CB4370103A810 /* libxmp.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxmp.dylib; path = codecs/lib/libxmp.dylib; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@ -338,7 +338,7 @@
48E2EC7E15FB507A00B8D476 /* libogg.dylib in Frameworks */, 48E2EC7E15FB507A00B8D476 /* libogg.dylib in Frameworks */,
48E2EC7F15FB507A00B8D476 /* libvorbis.dylib in Frameworks */, 48E2EC7F15FB507A00B8D476 /* libvorbis.dylib in Frameworks */,
48E2EC8015FB507A00B8D476 /* libvorbisfile.dylib in Frameworks */, 48E2EC8015FB507A00B8D476 /* libvorbisfile.dylib in Frameworks */,
A4E3AF6205D43FCC000F1B47 /* libmikmod.dylib in Frameworks */, A4E3AF6205D43FCC000F1B47 /* libxmp.dylib in Frameworks */,
48E2EC7815FB500400B8D476 /* IOKit.framework in Frameworks */, 48E2EC7815FB500400B8D476 /* IOKit.framework in Frameworks */,
002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */, 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */,
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
@ -388,7 +388,7 @@
48E2EC7A15FB507A00B8D476 /* libogg.dylib */, 48E2EC7A15FB507A00B8D476 /* libogg.dylib */,
48E2EC7B15FB507A00B8D476 /* libvorbis.dylib */, 48E2EC7B15FB507A00B8D476 /* libvorbis.dylib */,
48E2EC7C15FB507A00B8D476 /* libvorbisfile.dylib */, 48E2EC7C15FB507A00B8D476 /* libvorbisfile.dylib */,
F5F5DE80017CB4370103A810 /* libmikmod.dylib */, F5F5DE80017CB4370103A810 /* libxmp.dylib */,
48243B060D33ED0A00C29F8F /* MacOSX */, 48243B060D33ED0A00C29F8F /* MacOSX */,
483A77D80D2EE8C500CB2E4C /* Quake */, 483A77D80D2EE8C500CB2E4C /* Quake */,
29B97317FDCFA39411CA2CEA /* Resources */, 29B97317FDCFA39411CA2CEA /* Resources */,
@ -866,7 +866,7 @@
USE_CODEC_WAVE, USE_CODEC_WAVE,
USE_CODEC_FLAC, USE_CODEC_FLAC,
USE_CODEC_OPUS, USE_CODEC_OPUS,
USE_CODEC_MIKMOD, USE_CODEC_XMP,
USE_CODEC_UMX, USE_CODEC_UMX,
SDL_FRAMEWORK, SDL_FRAMEWORK,
); );
@ -911,7 +911,7 @@
USE_CODEC_WAVE, USE_CODEC_WAVE,
USE_CODEC_FLAC, USE_CODEC_FLAC,
USE_CODEC_OPUS, USE_CODEC_OPUS,
USE_CODEC_MIKMOD, USE_CODEC_XMP,
USE_CODEC_UMX, USE_CODEC_UMX,
SDL_FRAMEWORK, SDL_FRAMEWORK,
); );
@ -960,7 +960,7 @@
USE_CODEC_WAVE, USE_CODEC_WAVE,
USE_CODEC_FLAC, USE_CODEC_FLAC,
USE_CODEC_OPUS, USE_CODEC_OPUS,
USE_CODEC_MIKMOD, USE_CODEC_XMP,
USE_CODEC_UMX, USE_CODEC_UMX,
SDL_FRAMEWORK, SDL_FRAMEWORK,
); );
@ -1005,7 +1005,7 @@
USE_CODEC_WAVE, USE_CODEC_WAVE,
USE_CODEC_FLAC, USE_CODEC_FLAC,
USE_CODEC_OPUS, USE_CODEC_OPUS,
USE_CODEC_MIKMOD, USE_CODEC_XMP,
USE_CODEC_UMX, USE_CODEC_UMX,
SDL_FRAMEWORK, SDL_FRAMEWORK,
); );

BIN
MacOSX/SDL.framework/Versions/A/SDL
View file

Binary file not shown.

BIN
MacOSX/codecs/lib/libxmp.dylib
View file

Binary file not shown.

4
Quake/Makefile.darwin
View file

@ -19,8 +19,8 @@ USE_CODEC_MP3=1
USE_CODEC_VORBIS=1 USE_CODEC_VORBIS=1
USE_CODEC_OPUS=1 USE_CODEC_OPUS=1
# either xmp or mikmod (or modplug) # either xmp or mikmod (or modplug)
USE_CODEC_MIKMOD=1 USE_CODEC_MIKMOD=0
USE_CODEC_XMP=0 USE_CODEC_XMP=1
USE_CODEC_MODPLUG=0 USE_CODEC_MODPLUG=0
USE_CODEC_UMX=1 USE_CODEC_UMX=1

4
Quake/Makefile.w32
View file

@ -15,8 +15,8 @@ USE_CODEC_MP3=1
USE_CODEC_VORBIS=1 USE_CODEC_VORBIS=1
USE_CODEC_OPUS=1 USE_CODEC_OPUS=1
# either xmp or mikmod (or modplug) # either xmp or mikmod (or modplug)
USE_CODEC_MIKMOD=1 USE_CODEC_MIKMOD=0
USE_CODEC_XMP=0 USE_CODEC_XMP=1
USE_CODEC_MODPLUG=0 USE_CODEC_MODPLUG=0
USE_CODEC_UMX=1 USE_CODEC_UMX=1

4
Quake/Makefile.w64
View file

@ -14,8 +14,8 @@ USE_CODEC_MP3=1
USE_CODEC_VORBIS=1 USE_CODEC_VORBIS=1
USE_CODEC_OPUS=1 USE_CODEC_OPUS=1
# either xmp or mikmod (or modplug) # either xmp or mikmod (or modplug)
USE_CODEC_MIKMOD=1 USE_CODEC_MIKMOD=0
USE_CODEC_XMP=0 USE_CODEC_XMP=1
USE_CODEC_MODPLUG=0 USE_CODEC_MODPLUG=0
USE_CODEC_UMX=1 USE_CODEC_UMX=1

8
Quake/Makefile.wat
View file

@ -6,15 +6,15 @@ USE_SDL2=0
### Enable/disable codecs for streaming music support ### Enable/disable codecs for streaming music support
USE_CODEC_WAVE=1 USE_CODEC_WAVE=1
USE_CODEC_FLAC=1 USE_CODEC_FLAC=0
USE_CODEC_MP3=1 USE_CODEC_MP3=1
USE_CODEC_VORBIS=1 USE_CODEC_VORBIS=1
USE_CODEC_OPUS=1 USE_CODEC_OPUS=0
# either xmp or mikmod (or modplug) # either xmp or mikmod (or modplug)
USE_CODEC_MIKMOD=1 USE_CODEC_MIKMOD=0
USE_CODEC_XMP=0 USE_CODEC_XMP=0
USE_CODEC_MODPLUG=0 USE_CODEC_MODPLUG=0
USE_CODEC_UMX=1 USE_CODEC_UMX=0
# which library to use for mp3 decoding: mad or mpg123 # which library to use for mp3 decoding: mad or mpg123
MP3LIB=mad MP3LIB=mad

4
Quake/menu.c
View file

@ -2141,6 +2141,8 @@ void M_LanConfig_Draw (void)
basex = (320-p->width)/2; basex = (320-p->width)/2;
M_DrawPic (basex, 4, p); M_DrawPic (basex, 4, p);
basex = 72; /* Arcane Dimensions has an oversized gfx/p_multi.lmp */
if (StartingGame) if (StartingGame)
startJoin = "New Game"; startJoin = "New Game";
else else
@ -3035,8 +3037,6 @@ static struct
//============================================================================= //=============================================================================
/* MenuQC Subsystem */ /* MenuQC Subsystem */
extern builtin_t pr_menubuiltins[];
extern int pr_menunumbuiltins;
#define MENUQC_PROGHEADER_CRC 10020 #define MENUQC_PROGHEADER_CRC 10020
void MQC_End(void) void MQC_End(void)
{ {

13
Quake/pr_cmds.c
View file

@ -1793,7 +1793,7 @@ void PR_spawnfunc_misc_model(edict_t *self)
PF_sv_makestatic(); PF_sv_makestatic();
} }
builtin_t pr_ssqcbuiltins[] = const builtin_t pr_ssqcbuiltins[] =
{ {
PF_Fixme, PF_Fixme,
PF_makevectors, // void(entity e) makevectors = #1 PF_makevectors, // void(entity e) makevectors = #1
@ -1883,7 +1883,7 @@ builtin_t pr_ssqcbuiltins[] =
PF_sv_setspawnparms, PF_sv_setspawnparms,
}; };
int pr_ssqcnumbuiltins = sizeof(pr_ssqcbuiltins)/sizeof(pr_ssqcbuiltins[0]); const int pr_ssqcnumbuiltins = sizeof(pr_ssqcbuiltins)/sizeof(pr_ssqcbuiltins[0]);
@ -2143,7 +2143,7 @@ static void PF_cl_particle (void)
#define PF_NoCSQC PF_Fixme #define PF_NoCSQC PF_Fixme
#define PF_CSQCToDo PF_Fixme #define PF_CSQCToDo PF_Fixme
builtin_t pr_csqcbuiltins[] = const builtin_t pr_csqcbuiltins[] =
{ {
PF_Fixme, PF_Fixme,
PF_makevectors, // void(entity e) makevectors = #1 PF_makevectors, // void(entity e) makevectors = #1
@ -2233,7 +2233,7 @@ builtin_t pr_csqcbuiltins[] =
PF_NoCSQC,//PF_setspawnparms PF_NoCSQC,//PF_setspawnparms
}; };
int pr_csqcnumbuiltins = sizeof(pr_csqcbuiltins)/sizeof(pr_csqcbuiltins[0]); const int pr_csqcnumbuiltins = sizeof(pr_csqcbuiltins)/sizeof(pr_csqcbuiltins[0]);
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
//menuqc //menuqc
@ -2278,7 +2278,7 @@ static void PF_cvar_menuhack (void)
#define PF_MenuQCToDo PF_Fixme #define PF_MenuQCToDo PF_Fixme
#define PF_MenuCQMess PF_Fixme #define PF_MenuCQMess PF_Fixme
#define PF_MenuCQExt PF_Fixme #define PF_MenuCQExt PF_Fixme
builtin_t pr_menubuiltins[] = { const builtin_t pr_menubuiltins[] = {
PF_Fixme, //#0 PF_Fixme, //#0
PF_MenuCQExt, //#1 PF_checkextension PF_MenuCQExt, //#1 PF_checkextension
PF_error, //#2 PF_error, //#2
@ -2373,4 +2373,5 @@ builtin_t pr_menubuiltins[] = {
PF_MenuCQExt, //#89 PF_cvar_defstring, PF_MenuCQExt, //#89 PF_cvar_defstring,
//all other builtins will just have to use the extension system //all other builtins will just have to use the extension system
}; };
int pr_menunumbuiltins = sizeof(pr_menubuiltins)/sizeof(pr_menubuiltins[0]); const int pr_menunumbuiltins = sizeof(pr_menubuiltins)/sizeof(pr_menubuiltins[0]);

2
Quake/pr_edict.c
View file

@ -1232,7 +1232,7 @@ static void PR_MergeEngineFieldDefs (void)
PR_LoadProgs PR_LoadProgs
=============== ===============
*/ */
qboolean PR_LoadProgs (const char *filename, qboolean fatal, unsigned int needcrc, builtin_t *builtins, size_t numbuiltins) qboolean PR_LoadProgs (const char *filename, qboolean fatal, unsigned int needcrc, const builtin_t *builtins, size_t numbuiltins)
{ {
int i; int i;

23
Quake/progs.h
View file

@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#ifndef _QUAKE_PROGS_H #ifndef QUAKE_PROGS_H
#define _QUAKE_PROGS_H #define QUAKE_PROGS_H
#include "pr_comp.h" /* defs shared with qcc */ #include "pr_comp.h" /* defs shared with qcc */
#include "progdefs.h" /* generated by program cdefs */ #include "progdefs.h" /* generated by program cdefs */
@ -67,7 +67,7 @@ void PR_Init (void);
void PR_ExecuteProgram (func_t fnum); void PR_ExecuteProgram (func_t fnum);
void PR_ClearProgs(qcvm_t *vm); void PR_ClearProgs(qcvm_t *vm);
qboolean PR_LoadProgs (const char *filename, qboolean fatal, unsigned int needcrc, builtin_t *builtins, size_t numbuiltins); qboolean PR_LoadProgs (const char *filename, qboolean fatal, unsigned int needcrc, const builtin_t *builtins, size_t numbuiltins);
//from pr_ext.c //from pr_ext.c
void PR_InitExtensions(void); void PR_InitExtensions(void);
@ -113,8 +113,8 @@ void ED_LoadFromFile (const char *data);
#define EDICT_NUM(n) ((edict_t *)(sv.edicts+ (n)*pr_edict_size)) #define EDICT_NUM(n) ((edict_t *)(sv.edicts+ (n)*pr_edict_size))
#define NUM_FOR_EDICT(e) (((byte *)(e) - sv.edicts) / pr_edict_size) #define NUM_FOR_EDICT(e) (((byte *)(e) - sv.edicts) / pr_edict_size)
*/ */
edict_t *EDICT_NUM(int n); edict_t *EDICT_NUM(int);
int NUM_FOR_EDICT(edict_t *e); int NUM_FOR_EDICT(edict_t*);
#define NEXT_EDICT(e) ((edict_t *)( (byte *)e + qcvm->edict_size)) #define NEXT_EDICT(e) ((edict_t *)( (byte *)e + qcvm->edict_size))
@ -425,10 +425,11 @@ extern qcvm_t *qcvm;
void PR_SwitchQCVM(qcvm_t *nvm); void PR_SwitchQCVM(qcvm_t *nvm);
#endif #endif
extern builtin_t pr_ssqcbuiltins[]; extern const builtin_t pr_ssqcbuiltins[];
extern int pr_ssqcnumbuiltins; extern const int pr_ssqcnumbuiltins;
extern builtin_t pr_csqcbuiltins[]; extern const builtin_t pr_csqcbuiltins[];
extern int pr_csqcnumbuiltins; extern const int pr_csqcnumbuiltins;
extern const builtin_t pr_menubuiltins[];
#endif /* _QUAKE_PROGS_H */ extern int const pr_menunumbuiltins;
#endif /* QUAKE_PROGS_H */

34
Quake/snd_xmp.c
View file

@ -43,22 +43,51 @@ static void S_XMP_CodecShutdown (void)
{ {
} }
#if (XMP_VERCODE >= 0x040500)
static unsigned long xmp_fread(void *dest, unsigned long len, unsigned long nmemb, void *f)
{
return FS_fread(dest, len, nmemb, (fshandle_t *)f);
}
static int xmp_fseek(void *f, long offset, int whence)
{
return FS_fseek((fshandle_t *)f, offset, whence);
}
static long xmp_ftell(void *f)
{
return FS_ftell((fshandle_t *)f);
}
#endif
static qboolean S_XMP_CodecOpenStream (snd_stream_t *stream) static qboolean S_XMP_CodecOpenStream (snd_stream_t *stream)
{ {
/* need to load the whole file into memory and pass it to libxmp /* need to load the whole file into memory and pass it to libxmp
* using xmp_load_module_from_memory() which requires libxmp >= 4.2. * using xmp_load_module_from_memory() which requires libxmp >= 4.2.
* libxmp-4.0/4.1 only have xmp_load_module() which accepts a file * libxmp-4.0/4.1 only have xmp_load_module() which accepts a file
* name which isn't good with files in containers like paks, etc. */ * name which isn't good with files in containers like paks, etc.
* On the other hand, libxmp >= 4.5 introduces file callbacks: use
* if available. */
xmp_context c; xmp_context c;
#if (XMP_VERCODE >= 0x040500)
struct xmp_callbacks file_callbacks = {
xmp_fread, xmp_fseek, xmp_ftell, NULL
};
#else
byte *moddata; byte *moddata;
long len; long len;
int fmt;
int mark; int mark;
#endif
int fmt;
c = xmp_create_context(); c = xmp_create_context();
if (c == NULL) if (c == NULL)
return false; return false;
#if (XMP_VERCODE >= 0x040500)
if (xmp_load_module_from_callbacks(c, &stream->fh, file_callbacks) < 0) {
Con_DPrintf("Could not load module %s\n", stream->name);
goto err1;
}
#else
len = FS_filelength (&stream->fh); len = FS_filelength (&stream->fh);
mark = Hunk_LowMark(); mark = Hunk_LowMark();
moddata = (byte *) Hunk_Alloc(len); moddata = (byte *) Hunk_Alloc(len);
@ -68,6 +97,7 @@ static qboolean S_XMP_CodecOpenStream (snd_stream_t *stream)
goto err1; goto err1;
} }
Hunk_FreeToLowMark(mark); /* free original file data */ Hunk_FreeToLowMark(mark); /* free original file data */
#endif
stream->priv = c; stream->priv = c;
if (shm->speed > XMP_MAX_SRATE) if (shm->speed > XMP_MAX_SRATE)

4
Windows/CodeBlocks/QuakeSpasm-SDL2.cbp
View file

@ -38,7 +38,7 @@
<Add option="-DUSE_CODEC_WAVE" /> <Add option="-DUSE_CODEC_WAVE" />
<Add option="-DUSE_CODEC_FLAC" /> <Add option="-DUSE_CODEC_FLAC" />
<Add option="-DUSE_CODEC_OPUS" /> <Add option="-DUSE_CODEC_OPUS" />
<Add option="-DUSE_CODEC_MIKMOD" /> <Add option="-DUSE_CODEC_XMP" />
<Add option="-DUSE_CODEC_UMX" /> <Add option="-DUSE_CODEC_UMX" />
<Add directory="..\codecs\include" /> <Add directory="..\codecs\include" />
<Add directory="..\SDL2\include" /> <Add directory="..\SDL2\include" />
@ -54,7 +54,7 @@
<Add library="FLAC" /> <Add library="FLAC" />
<Add library="ogg" /> <Add library="ogg" />
<Add library="mad" /> <Add library="mad" />
<Add library="mikmod" /> <Add library="xmp" />
<Add library="winmm" /> <Add library="winmm" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="wsock32" /> <Add library="wsock32" />

4
Windows/CodeBlocks/QuakeSpasm.cbp
View file

@ -37,7 +37,7 @@
<Add option="-DUSE_CODEC_WAVE" /> <Add option="-DUSE_CODEC_WAVE" />
<Add option="-DUSE_CODEC_FLAC" /> <Add option="-DUSE_CODEC_FLAC" />
<Add option="-DUSE_CODEC_OPUS" /> <Add option="-DUSE_CODEC_OPUS" />
<Add option="-DUSE_CODEC_MIKMOD" /> <Add option="-DUSE_CODEC_XMP" />
<Add option="-DUSE_CODEC_UMX" /> <Add option="-DUSE_CODEC_UMX" />
<Add directory="..\codecs\include" /> <Add directory="..\codecs\include" />
<Add directory="..\SDL\include" /> <Add directory="..\SDL\include" />
@ -53,7 +53,7 @@
<Add library="FLAC" /> <Add library="FLAC" />
<Add library="ogg" /> <Add library="ogg" />
<Add library="mad" /> <Add library="mad" />
<Add library="mikmod" /> <Add library="xmp" />
<Add library="winmm" /> <Add library="winmm" />
<Add library="opengl32" /> <Add library="opengl32" />
<Add library="wsock32" /> <Add library="wsock32" />

17
Windows/VisualStudio/quakespasm-sdl2.vcproj
View file

@ -41,7 +41,8 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake;$(VC_IncludePath);$(WindowsSDK_IncludePath)" AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake;$(VC_IncludePath);$(WindowsSDK_IncludePath)"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX" AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_XMP;USE_CODEC_UMX"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -61,7 +62,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libmikmod.lib wsock32.lib opengl32.lib winmm.lib SDL2.lib SDL2main.lib Ws2_32.lib" AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libxmp.lib ws2_32.lib opengl32.lib winmm.lib SDL2.lib SDL2main.lib"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\codecs\x86;..\SDL2\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)" AdditionalLibraryDirectories="..\codecs\x86;..\SDL2\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)"
IgnoreDefaultLibraryNames="msvcrt.lib" IgnoreDefaultLibraryNames="msvcrt.lib"
@ -117,7 +118,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake;$(VC_IncludePath);$(WindowsSDK_IncludePath)" AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake;$(VC_IncludePath);$(WindowsSDK_IncludePath)"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_XMP;USE_CODEC_UMX"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -136,7 +137,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libmikmod.lib wsock32.lib opengl32.lib winmm.lib SDL2.lib SDL2main.lib Ws2_32.lib" AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libxmp.lib ws2_32.lib opengl32.lib winmm.lib SDL2.lib SDL2main.lib"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\codecs\x86;..\SDL2\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)" AdditionalLibraryDirectories="..\codecs\x86;..\SDL2\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -192,7 +193,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake;$(VC_IncludePath);$(WindowsSDK_IncludePath)" AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake;$(VC_IncludePath);$(WindowsSDK_IncludePath)"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_XMP;USE_CODEC_UMX"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -212,7 +213,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libmikmod.lib ws2_32.lib opengl32.lib winmm.lib SDL2.lib SDL2main.lib Ws2_32.lib" AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libxmp.lib ws2_32.lib opengl32.lib winmm.lib SDL2.lib SDL2main.lib"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\codecs\x64;..\SDL2\lib64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)" AdditionalLibraryDirectories="..\codecs\x64;..\SDL2\lib64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)"
IgnoreDefaultLibraryNames="msvcrt.lib" IgnoreDefaultLibraryNames="msvcrt.lib"
@ -269,7 +270,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake;$(VC_IncludePath);$(WindowsSDK_IncludePath)" AdditionalIncludeDirectories="..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake;$(VC_IncludePath);$(WindowsSDK_IncludePath)"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_XMP;USE_CODEC_UMX"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -288,7 +289,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libmikmod.lib ws2_32.lib opengl32.lib winmm.lib SDL2.lib SDL2main.lib Ws2_32.lib" AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libxmp.lib ws2_32.lib opengl32.lib winmm.lib SDL2.lib SDL2main.lib"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\codecs\x64;..\SDL2\lib64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)" AdditionalLibraryDirectories="..\codecs\x64;..\SDL2\lib64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)"
GenerateDebugInformation="true" GenerateDebugInformation="true"

16
Windows/VisualStudio/quakespasm.vcproj
View file

@ -41,7 +41,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\SDL\include;..\codecs\include;..\misc\include;..\..\Quake" AdditionalIncludeDirectories="..\SDL\include;..\codecs\include;..\misc\include;..\..\Quake"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_XMP;USE_CODEC_UMX"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -61,7 +61,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libmikmod.lib wsock32.lib opengl32.lib winmm.lib SDL.lib" AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libxmp.lib wsock32.lib opengl32.lib winmm.lib SDL.lib"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\codecs\x86;..\SDL\lib" AdditionalLibraryDirectories="..\codecs\x86;..\SDL\lib"
IgnoreDefaultLibraryNames="msvcrt.lib" IgnoreDefaultLibraryNames="msvcrt.lib"
@ -117,7 +117,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\SDL\include;..\codecs\include;..\misc\include;..\..\Quake" AdditionalIncludeDirectories="..\SDL\include;..\codecs\include;..\misc\include;..\..\Quake"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_XMP;USE_CODEC_UMX"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -136,7 +136,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libmikmod.lib wsock32.lib opengl32.lib winmm.lib SDL.lib" AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libxmp.lib wsock32.lib opengl32.lib winmm.lib SDL.lib"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\codecs\x86;..\SDL\lib" AdditionalLibraryDirectories="..\codecs\x86;..\SDL\lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
@ -192,7 +192,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\SDL\include;..\codecs\include;..\misc\include;..\..\Quake" AdditionalIncludeDirectories="..\SDL\include;..\codecs\include;..\misc\include;..\..\Quake"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_XMP;USE_CODEC_UMX"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -212,7 +212,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libmikmod.lib ws2_32.lib opengl32.lib winmm.lib SDL.lib" AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libxmp.lib ws2_32.lib opengl32.lib winmm.lib SDL.lib"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="..\codecs\x64;..\SDL\lib64" AdditionalLibraryDirectories="..\codecs\x64;..\SDL\lib64"
IgnoreDefaultLibraryNames="msvcrt.lib" IgnoreDefaultLibraryNames="msvcrt.lib"
@ -269,7 +269,7 @@
Optimization="2" Optimization="2"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\SDL\include;..\codecs\include;..\misc\include;..\..\Quake" AdditionalIncludeDirectories="..\SDL\include;..\codecs\include;..\misc\include;..\..\Quake"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_XMP;USE_CODEC_UMX"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
@ -288,7 +288,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libmikmod.lib ws2_32.lib opengl32.lib winmm.lib SDL.lib" AdditionalDependencies="libvorbisfile.lib libvorbis.lib libopusfile.lib libopus.lib libFLAC.lib libogg.lib libmad.lib libxmp.lib ws2_32.lib opengl32.lib winmm.lib SDL.lib"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="..\codecs\x64;..\SDL\lib64" AdditionalLibraryDirectories="..\codecs\x64;..\SDL\lib64"
GenerateDebugInformation="true" GenerateDebugInformation="true"

BIN
Windows/codecs/x64/libxmp.dll
View file

Binary file not shown.

BIN
Windows/codecs/x86-watcom/libxmp.lib
View file

Binary file not shown.

BIN
Windows/codecs/x86/libxmp.dll
View file

Binary file not shown.