nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-22 12:01:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small fixups for the hl2 plugin.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6121 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-11-10 01:36:22 +00:00
parent f8e355e990
commit 268f122b23
4 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
build_setup.sh
View file

@ -37,26 +37,26 @@ TARGETS_LINUX="qcc-rel rel dbg plugins-rel plugins-dbg" #gl-rel vk-rel
TARGETS_WINDOWS="sv-rel m-rel qcc-rel qccgui-scintilla qccgui-dbg m-dbg sv-dbg plugins-dbg plugins-rel" #gl-rel vk-rel mingl-rel d3d-rel TARGETS_WINDOWS="sv-rel m-rel qcc-rel qccgui-scintilla qccgui-dbg m-dbg sv-dbg plugins-dbg plugins-rel" #gl-rel vk-rel mingl-rel d3d-rel
PLUGINS_DROID="qi ezhud irc" PLUGINS_DROID="qi ezhud irc hl2"
PLUGINS_LINUXx86="openxr ode qi ezhud xmpp irc" PLUGINS_LINUXx86="openxr ode qi ezhud xmpp irc hl2"
PLUGINS_LINUXx64="openxr ode qi ezhud xmpp irc" PLUGINS_LINUXx64="openxr ode qi ezhud xmpp irc hl2"
PLUGINS_LINUXx32="qi ezhud xmpp irc" PLUGINS_LINUXx32="qi ezhud xmpp irc hl2"
PLUGINS_LINUXarmhf="qi ezhud xmpp irc" PLUGINS_LINUXarmhf="qi ezhud xmpp irc hl2"
if [ "$(uname -m)" != "x86_64" ]; then if [ "$(uname -m)" != "x86_64" ]; then
PLUGINS_LINUXx86="openxr ode qi ezhud xmpp irc" PLUGINS_LINUXx86="openxr ode qi ezhud xmpp irc hl2"
fi fi
if [ "$(uname -m)" == "x86_64" ]; then if [ "$(uname -m)" == "x86_64" ]; then
PLUGINS_LINUX64="openxr ode qi ezhud xmpp irc" PLUGINS_LINUX64="openxr ode qi ezhud xmpp irc hl2"
fi fi
#windows is always cross compiled, so we don't have issues with non-native ffmpeg #windows is always cross compiled, so we don't have issues with non-native ffmpeg
#windows doesn't cross compile, so no system dependancy issues #windows doesn't cross compile, so no system dependancy issues
#skip some dependancies if we're running on cygwin, ode is buggy. #skip some dependancies if we're running on cygwin, ode is buggy.
if [ "$(uname -s)" == "Linux" ]; then if [ "$(uname -s)" == "Linux" ]; then
PLUGINS_WIN32="ode qi ezhud xmpp irc" PLUGINS_WIN32="ode qi ezhud xmpp irc hl2"
PLUGINS_WIN64="ode qi ezhud xmpp irc" PLUGINS_WIN64="ode qi ezhud xmpp irc hl2"
else else
PLUGINS_WIN32="qi ezhud xmpp irc" PLUGINS_WIN32="qi ezhud xmpp irc hl2"
PLUGINS_WIN64="qi ezhud xmpp irc" PLUGINS_WIN64="qi ezhud xmpp irc hl2"
fi fi
echo echo

10
build_wip.sh
View file

@ -20,11 +20,11 @@ BUILD_WIN32=y
BUILD_WIN64=y BUILD_WIN64=y
BUILD_ANDROID=y BUILD_ANDROID=y
BUILD_WEB=y BUILD_WEB=y
PLUGINS_LINUXx86="qi ezhud xmpp irc" PLUGINS_LINUXx86="qi ezhud xmpp irc hl2"
PLUGINS_LINUXx64="qi ezhud xmpp irc" PLUGINS_LINUXx64="qi ezhud xmpp irc hl2"
PLUGINS_LINUXx32="qi ezhud xmpp irc" PLUGINS_LINUXx32="qi ezhud xmpp irc hl2"
PLUGINS_WIN32="ffmpeg ode qi ezhud xmpp irc" PLUGINS_WIN32="ffmpeg ode qi ezhud xmpp irc hl2"
PLUGINS_WIN64="ffmpeg ode qi ezhud xmpp irc" PLUGINS_WIN64="ffmpeg ode qi ezhud xmpp irc hl2"
THREADS="-j 4" THREADS="-j 4"
TARGETS_LINUX="qcc-rel rel dbg vk-rel plugins-rel plugins-dbg" TARGETS_LINUX="qcc-rel rel dbg vk-rel plugins-rel plugins-dbg"

3
plugins/Makefile
View file

@ -417,7 +417,8 @@ $(PLUG_PREFIX)openssl$(PLUG_NATIVE_EXT): net_ssl_openssl.c plugin.c
#for compat with half-life 2's file formats #for compat with half-life 2's file formats
$(PLUG_PREFIX)hl2$(PLUG_NATIVE_EXT): hl2/fs_vpk.c hl2/img_vtf.c hl2/mod_hl2.c hl2/mat_vmt.c hl2/mod_vbsp.c hl2/hl2.c plugin.c $(PLUG_PREFIX)hl2$(PLUG_NATIVE_EXT): hl2/fs_vpk.c hl2/img_vtf.c hl2/mod_hl2.c hl2/mat_vmt.c hl2/mod_vbsp.c hl2/hl2.c plugin.c
$(CC) $(BASE_CFLAGS) $(CFLAGS) -DFTEPLUGIN -DMULTITHREAD -o $@ -shared $(PLUG_CFLAGS) $^ $(PLUG_DEFFILE) $(PLUG_LDFLAGS) $(CC) $(BASE_CFLAGS) $(CFLAGS) -DFTEPLUGIN -DMULTITHREAD -o $@ -shared $(PLUG_CFLAGS) $^ $(PLUG_DEFFILE) $(PLUG_LDFLAGS)
#NATIVE_PLUGINS+=hl2 $(call EMBEDMETA,hl2,$@,HL2 Formats,Provides support for various formats used by Valve's Source engine.)
NATIVE_PLUGINS+=hl2

12
plugins/hl2/mat_vmt.c
View file

@ -519,6 +519,18 @@ static qboolean Shader_LoadVMT(parsestate_t *ps, const char *filename, void (*Lo
static struct sbuiltin_s vmtprograms[] = static struct sbuiltin_s vmtprograms[] =
{ {
//we don't know what renderer the engine will need...
#ifdef FTEPLUGIN
#ifndef GLQUAKE
#define GLQUAKE
#endif
#ifndef VKQUAKE
#define VKQUAKE
#endif
#ifndef D3DQUAKE
#define D3DQUAKE
#endif
#endif
#include "mat_vmt_progs.h" #include "mat_vmt_progs.h"
{QR_NONE} {QR_NONE}
}; };