fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 15:31:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

add mikmod to xcode project file. enable several extra codecs for osx and windows builds.

Browse source 
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@919 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2014-06-21 15:50:09 +00:00
parent 85cd1a5c9e
commit ad8d791aca
4 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
quakespasm/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj
View file

@ -18,6 +18,7 @@
4818B0AE12D5B9ED006DD66E /* snd_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0AC12D5B9ED006DD66E /* snd_codec.c */; };
4818B0B712D5BA1A006DD66E /* snd_vorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0B212D5BA1A006DD66E /* snd_vorbis.c */; };
4818B0B812D5BA1A006DD66E /* snd_wave.c in Sources */ = {isa = PBXBuildFile; fileRef = 4818B0B412D5BA1A006DD66E /* snd_wave.c */; };
483A78780D2EEAF000CB2E4C /* snd_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 483A78640D2EEAF000CB2E4C /* snd_mikmod.c */; };
48243B140D33F01A00C29F8F /* main_sdl.c in Sources */ = {isa = PBXBuildFile; fileRef = 48243B130D33F01A00C29F8F /* main_sdl.c */; };
482812FD179C3EF4004E1D61 /* libFLAC.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 482812FC179C3EF4004E1D61 /* libFLAC.dylib */; };
482812FE179C3EFF004E1D61 /* libFLAC.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 482812FC179C3EF4004E1D61 /* libFLAC.dylib */; };
@ -106,6 +107,8 @@
48FE585B0D3A82C8006BB491 /* QuakeArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FE585A0D3A82C8006BB491 /* QuakeArguments.m */; };
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
A4E3AF6205D43FCC000F1B47 /* libmikmod.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5F5DE80017CB4370103A810 /* libmikmod.dylib */; };
A4E3AF2A05D43FCC000F1B47 /* libmikmod.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = F5F5DE80017CB4370103A810 /* libmikmod.dylib */; };
B021C20914A5FF7E003F18D6 /* cfgfile.c in Sources */ = {isa = PBXBuildFile; fileRef = B021C20714A5FF7E003F18D6 /* cfgfile.c */; };
/* End PBXBuildFile section */
@ -143,6 +146,7 @@
48E2EC8715FB516600B8D476 /* libogg.dylib in CopyFiles */,
48E2EC8815FB516600B8D476 /* libvorbis.dylib in CopyFiles */,
48E2EC8915FB516600B8D476 /* libvorbisfile.dylib in CopyFiles */,
A4E3AF2A05D43FCC000F1B47 /* libmikmod.dylib in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -272,6 +276,7 @@
4847CD5E12057F94000B560F /* sys_sdl_unix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sys_sdl_unix.c; path = ../Quake/sys_sdl_unix.c; sourceTree = SOURCE_ROOT; };
484AA4B30D3FF6C0005D917A /* QuakeSpasm.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = QuakeSpasm.icns; sourceTree = "<group>"; };
4854B1B01340C646004C9F45 /* snd_mp3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mp3.c; path = ../Quake/snd_mp3.c; sourceTree = SOURCE_ROOT; };
483A78640D2EEAF000CB2E4C /* snd_mikmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mikmod.c; path = ../Quake/snd_mikmod.c; sourceTree = SOURCE_ROOT; };
486577C80D31A22A00E7920A /* snd_dma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_dma.c; path = ../Quake/snd_dma.c; sourceTree = SOURCE_ROOT; };
486577C90D31A22A00E7920A /* snd_mem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mem.c; path = ../Quake/snd_mem.c; sourceTree = SOURCE_ROOT; };
486577CA0D31A22A00E7920A /* snd_mix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mix.c; path = ../Quake/snd_mix.c; sourceTree = SOURCE_ROOT; };
@ -307,6 +312,7 @@
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; };
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"; path = libmikmod.dylib; path = codecs/lib/libmikmod.dylib; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -321,6 +327,7 @@
48E2EC7E15FB507A00B8D476 /* libogg.dylib in Frameworks */,
48E2EC7F15FB507A00B8D476 /* libvorbis.dylib in Frameworks */,
48E2EC8015FB507A00B8D476 /* libvorbisfile.dylib in Frameworks */,
A4E3AF6205D43FCC000F1B47 /* libmikmod.dylib in Frameworks */,
48E2EC7815FB500400B8D476 /* IOKit.framework in Frameworks */,
002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */,
002F3C6109D0951E00EBEB88 /* GLUT.framework in Frameworks */,
@ -371,6 +378,7 @@
48E2EC7A15FB507A00B8D476 /* libogg.dylib */,
48E2EC7B15FB507A00B8D476 /* libvorbis.dylib */,
48E2EC7C15FB507A00B8D476 /* libvorbisfile.dylib */,
F5F5DE80017CB4370103A810 /* libmikmod.dylib */,
48243B060D33ED0A00C29F8F /* MacOSX */,
483A77D80D2EE8C500CB2E4C /* Quake */,
29B97317FDCFA39411CA2CEA /* Resources */,
@ -516,6 +524,7 @@
483A78540D2EEAC300CB2E4C /* snd_sdl.c */,
4854B1B01340C646004C9F45 /* snd_mp3.c */,
4885A84A179740A0000EC703 /* snd_opus.c */,
483A78640D2EEAF000CB2E4C /* snd_mikmod.c */,
4818B0B212D5BA1A006DD66E /* snd_vorbis.c */,
4818B0B412D5BA1A006DD66E /* snd_wave.c */,
);
@ -774,6 +783,7 @@
4818B0B712D5BA1A006DD66E /* snd_vorbis.c in Sources */,
4818B0B812D5BA1A006DD66E /* snd_wave.c in Sources */,
4854B1B11340C646004C9F45 /* snd_mp3.c in Sources */,
483A78780D2EEAF000CB2E4C /* snd_mikmod.c in Sources */,
B021C20914A5FF7E003F18D6 /* cfgfile.c in Sources */,
48A7C1FC14AA34940011B754 /* strlcat.c in Sources */,
48A7C1FD14AA34940011B754 /* strlcpy.c in Sources */,
@ -864,6 +874,7 @@
USE_CODEC_WAVE,
USE_CODEC_FLAC,
USE_CODEC_OPUS,
USE_CODEC_MIKMOD,
SDL_FRAMEWORK,
);
GCC_VERSION = com.apple.compilers.llvmgcc42;
@ -953,6 +964,7 @@
USE_CODEC_WAVE,
USE_CODEC_FLAC,
USE_CODEC_OPUS,
USE_CODEC_MIKMOD,
SDL_FRAMEWORK,
);
GCC_VERSION = 4.0;

4
quakespasm/Quake/Makefile.darwin
View file

@ -13,9 +13,9 @@ USE_CODEC_MP3=1
USE_CODEC_VORBIS=1
USE_CODEC_OPUS=1
# either mikmod (preferred) or modplug, not both
USE_CODEC_MIKMOD=0
USE_CODEC_MIKMOD=1
USE_CODEC_MODPLUG=0
USE_CODEC_UMX=0
USE_CODEC_UMX=1
# which library to use for mp3 decoding: mad or mpg123
MP3LIB=mad

8
quakespasm/Quake/Makefile.w32
View file

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

8
quakespasm/Quake/Makefile.w64
View file

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