mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2024-11-10 07:21:58 +00:00
updated windows makefiles and visual studio project files after streaming
music changes. git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@376 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero
parent
1b877e7991
commit
b08f283ff5
3 changed files with 132 additions and 28 deletions
|
|
@ -14,6 +14,11 @@ check_gcc = $(shell if echo | $(CC) $(1) -S -o /dev/null -xc - > /dev/null 2>&1;
|
|||
|
||||
# ============================================================================
|
||||
|
||||
# Enable/disable codecs for streaming music support:
|
||||
USE_CODEC_WAVE=yes
|
||||
USE_CODEC_MP3=yes
|
||||
USE_CODEC_VORBIS=yes
|
||||
|
||||
DEBUG ?= 0
|
||||
WINSOCK2 ?= 0
|
||||
SDLNET ?= 0
|
||||
|
|
@ -67,23 +72,43 @@ SDL_LFLAGS := $(shell $(SDL_CONFIG) --libs)
|
|||
|
||||
ifeq ($(WINSOCK2),1)
|
||||
DEFWINSOCK :=-D_USE_WINSOCK2
|
||||
LIBWINSOCK := ws2_32
|
||||
LIBWINSOCK := -lws2_32
|
||||
else
|
||||
DEFWINSOCK :=
|
||||
LIBWINSOCK := wsock32
|
||||
LIBWINSOCK := -lwsock32
|
||||
endif
|
||||
|
||||
ifeq ($(SDLNET),1)
|
||||
NET_LIBS := SDL_net
|
||||
NET_LIBS := -lSDL_net
|
||||
CFLAGS +=-D_USE_SDLNET
|
||||
else
|
||||
CFLAGS += $(DEFWINSOCK)
|
||||
NET_LIBS := $(LIBWINSOCK)
|
||||
endif
|
||||
|
||||
COMMON_LIBS:= m opengl32
|
||||
CODECLIBS :=
|
||||
ifeq ($(USE_CODEC_WAVE),yes)
|
||||
CFLAGS+= -DUSE_CODEC_WAVE
|
||||
CODEC_INC = -I../Windows/codecs/include
|
||||
CODEC_LINK= -L../Windows/codecs/x86
|
||||
endif
|
||||
ifeq ($(USE_CODEC_VORBIS),yes)
|
||||
CFLAGS+= -DUSE_CODEC_VORBIS
|
||||
CODEC_INC = -I../Windows/codecs/include
|
||||
CODEC_LINK= -L../Windows/codecs/x86
|
||||
CODECLIBS+= -lvorbis -lvorbisfile -logg
|
||||
endif
|
||||
ifeq ($(USE_CODEC_MP3),yes)
|
||||
CFLAGS+= -DUSE_CODEC_MP3
|
||||
CODEC_INC = -I../Windows/codecs/include
|
||||
CODEC_LINK= -L../Windows/codecs/x86
|
||||
CODECLIBS+= -lmad
|
||||
endif
|
||||
CFLAGS+= $(CODEC_INC)
|
||||
|
||||
LIBS := $(patsubst %,-l%,$(COMMON_LIBS) $(NET_LIBS))
|
||||
COMMON_LIBS:= -lm -lopengl32
|
||||
|
||||
LIBS := $(COMMON_LIBS) $(NET_LIBS) $(CODEC_LINK) $(CODECLIBS)
|
||||
|
||||
# ---------------------------
|
||||
# targets
|
||||
|
|
@ -106,7 +131,12 @@ DEFAULT_TARGET := quakespasm.exe
|
|||
# objects
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
COMOBJ_SND := snd_dma.o snd_mix.o snd_mem.o
|
||||
MUSIC_OBJS:= bgmusic.o \
|
||||
snd_codec.o \
|
||||
snd_wave.o \
|
||||
snd_vorbis.o \
|
||||
snd_mp3.o
|
||||
COMOBJ_SND := snd_dma.o snd_mix.o snd_mem.o $(MUSIC_OBJS)
|
||||
SYSOBJ_SND := snd_sdl.o
|
||||
SYSOBJ_CDA := cd_sdl.o
|
||||
SYSOBJ_INPUT := in_sdl.o
|
||||
|
|
|
|||
|
|
@ -14,6 +14,11 @@ check_gcc = $(shell if echo | $(CC) $(1) -S -o /dev/null -xc - > /dev/null 2>&1;
|
|||
|
||||
# ============================================================================
|
||||
|
||||
# Enable/disable codecs for streaming music support:
|
||||
USE_CODEC_WAVE=yes
|
||||
USE_CODEC_MP3=yes
|
||||
USE_CODEC_VORBIS=yes
|
||||
|
||||
DEBUG ?= 0
|
||||
WINSOCK2 ?= 1
|
||||
SDLNET ?= 0
|
||||
|
|
@ -67,23 +72,43 @@ SDL_LFLAGS := $(shell $(SDL_CONFIG) --libs)
|
|||
|
||||
ifeq ($(WINSOCK2),1)
|
||||
DEFWINSOCK :=-D_USE_WINSOCK2
|
||||
LIBWINSOCK := ws2_32
|
||||
LIBWINSOCK := -lws2_32
|
||||
else
|
||||
DEFWINSOCK :=
|
||||
LIBWINSOCK := wsock32
|
||||
LIBWINSOCK := -lwsock32
|
||||
endif
|
||||
|
||||
ifeq ($(SDLNET),1)
|
||||
NET_LIBS := SDL_net
|
||||
NET_LIBS := -lSDL_net
|
||||
CFLAGS +=-D_USE_SDLNET
|
||||
else
|
||||
CFLAGS += $(DEFWINSOCK)
|
||||
NET_LIBS := $(LIBWINSOCK)
|
||||
endif
|
||||
|
||||
COMMON_LIBS:= m opengl32
|
||||
CODECLIBS :=
|
||||
ifeq ($(USE_CODEC_WAVE),yes)
|
||||
CFLAGS+= -DUSE_CODEC_WAVE
|
||||
CODEC_INC = -I../Windows/codecs/include
|
||||
CODEC_LINK= -L../Windows/codecs/x64
|
||||
endif
|
||||
ifeq ($(USE_CODEC_VORBIS),yes)
|
||||
CFLAGS+= -DUSE_CODEC_VORBIS
|
||||
CODEC_INC = -I../Windows/codecs/include
|
||||
CODEC_LINK= -L../Windows/codecs/x64
|
||||
CODECLIBS+= -lvorbis -lvorbisfile -logg
|
||||
endif
|
||||
ifeq ($(USE_CODEC_MP3),yes)
|
||||
CFLAGS+= -DUSE_CODEC_MP3
|
||||
CODEC_INC = -I../Windows/codecs/include
|
||||
CODEC_LINK= -L../Windows/codecs/x64
|
||||
CODECLIBS+= -lmad
|
||||
endif
|
||||
CFLAGS+= $(CODEC_INC)
|
||||
|
||||
LIBS := $(patsubst %,-l%,$(COMMON_LIBS) $(NET_LIBS))
|
||||
COMMON_LIBS:= -lm -lopengl32
|
||||
|
||||
LIBS := $(COMMON_LIBS) $(NET_LIBS) $(CODEC_LINK) $(CODECLIBS)
|
||||
|
||||
# ---------------------------
|
||||
# targets
|
||||
|
|
@ -106,7 +131,12 @@ DEFAULT_TARGET := quakespasm.exe
|
|||
# objects
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
COMOBJ_SND := snd_dma.o snd_mix.o snd_mem.o
|
||||
MUSIC_OBJS:= bgmusic.o \
|
||||
snd_codec.o \
|
||||
snd_wave.o \
|
||||
snd_vorbis.o \
|
||||
snd_mp3.o
|
||||
COMOBJ_SND := snd_dma.o snd_mix.o snd_mem.o $(MUSIC_OBJS)
|
||||
SYSOBJ_SND := snd_sdl.o
|
||||
SYSOBJ_CDA := cd_sdl.o
|
||||
SYSOBJ_INPUT := in_sdl.o
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="C:\SDL\include;..\..\Quake;.;.."
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
|
||||
AdditionalIncludeDirectories="C:\SDL\include;..\codecs\include;..\..\Quake;.;.."
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
|
|
@ -64,9 +64,9 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="WSOCK32.lib OPENGL32.lib winmm.lib SDL.lib SDLmain.lib"
|
||||
AdditionalDependencies="libvorbis.lib libvorbisfile.lib libogg.lib libmad.lib WSOCK32.lib OPENGL32.lib winmm.lib SDL.lib SDLmain.lib"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="C:\SDL\lib"
|
||||
AdditionalLibraryDirectories="..\codecs\x86;C:\SDL\lib"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
TargetMachine="1"
|
||||
|
|
@ -118,8 +118,8 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="C:\SDL\include;..\..\Quake;.;.."
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
|
||||
AdditionalIncludeDirectories="C:\SDL\include;..\codecs\include;..\..\Quake;.;.."
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
|
|
@ -138,9 +138,9 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="WSOCK32.lib OPENGL32.lib winmm.lib SDL.lib SDLmain.lib"
|
||||
AdditionalDependencies="libvorbis.lib libvorbisfile.lib libogg.lib libmad.lib WSOCK32.lib OPENGL32.lib winmm.lib SDL.lib SDLmain.lib"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="C:\SDL\lib"
|
||||
AdditionalLibraryDirectories="..\codecs\x86;C:\SDL\lib"
|
||||
IgnoreAllDefaultLibraries="false"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -196,8 +196,8 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="C:\SDL\include;..\..\Quake;.;.."
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
|
||||
AdditionalIncludeDirectories="C:\SDL\include;..\codecs\include;..\..\Quake;.;.."
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
|
|
@ -217,9 +217,9 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="WS2_32.lib OPENGL32.lib winmm.lib SDL.lib SDLmain.lib"
|
||||
AdditionalDependencies="libvorbis.lib libvorbisfile.lib libogg.lib libmad.lib WS2_32.lib OPENGL32.lib winmm.lib SDL.lib SDLmain.lib"
|
||||
LinkIncremental="2"
|
||||
AdditionalLibraryDirectories="C:\SDL\lib64"
|
||||
AdditionalLibraryDirectories="..\codecs\x64;C:\SDL\lib64"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
TargetMachine="17"
|
||||
|
|
@ -272,8 +272,8 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="C:\SDL\include;..\..\Quake;.;.."
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
|
||||
AdditionalIncludeDirectories="C:\SDL\include;..\codecs\include;..\..\Quake;.;.."
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
|
|
@ -292,9 +292,9 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="WS2_32.lib OPENGL32.lib winmm.lib SDL.lib SDLmain.lib"
|
||||
AdditionalDependencies="libvorbis.lib libvorbisfile.lib libogg.lib libmad.lib WS2_32.lib OPENGL32.lib winmm.lib SDL.lib SDLmain.lib"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories="C:\SDL\lib64"
|
||||
AdditionalLibraryDirectories="..\codecs\x64;C:\SDL\lib64"
|
||||
IgnoreAllDefaultLibraries="false"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -333,6 +333,10 @@
|
|||
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\Quake\bgmusic.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\cd_sdl.c"
|
||||
>
|
||||
|
|
@ -537,6 +541,10 @@
|
|||
RelativePath="..\..\Quake\sbar.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\snd_codec.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\snd_dma.c"
|
||||
>
|
||||
|
|
@ -549,10 +557,22 @@
|
|||
RelativePath="..\..\Quake\snd_mix.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\snd_mp3.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\snd_sdl.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\snd_vorbis.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\snd_wave.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\sv_main.c"
|
||||
>
|
||||
|
|
@ -607,6 +627,10 @@
|
|||
RelativePath="..\..\Quake\arch_def.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\bgmusic.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\bspfile.h"
|
||||
>
|
||||
|
|
@ -775,6 +799,26 @@
|
|||
RelativePath="..\..\Quake\q_sound.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\snd_codec.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\snd_codeci.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\snd_mp3.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\snd_vorbis.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\snd_wave.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\Quake\spritegn.h"
|
||||
>
|
||||
|
|
|
|||
Loading…
Reference in a new issue