From f7aea02266a9533709d0ac52bdc4a6ebd2b66d41 Mon Sep 17 00:00:00 2001 From: Eukara Date: Mon, 10 Dec 2018 12:06:57 +0000 Subject: [PATCH] Updated TW's and FCS's config, as well as made the plugins build properly on mingw git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5362 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/config_freecs.h | 4 ++-- engine/common/config_wastes.h | 2 +- plugins/Makefile | 10 +++++----- plugins/irc/ircclient.c | 9 +++++++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/engine/common/config_freecs.h b/engine/common/config_freecs.h index 8b82aea18..8ad25cd91 100644 --- a/engine/common/config_freecs.h +++ b/engine/common/config_freecs.h @@ -132,7 +132,7 @@ #undef TEXTEDITOR //my funky text editor! its awesome! #undef TCPCONNECT //support for playing over tcp sockets, instead of just udp. compatible with qizmo. #undef IRCCONNECT //lame support for routing game packets via irc server. not a good idea. -#undef PLUGINS //support for external plugins (like huds or fancy menus or whatever) +#define PLUGINS //support for external plugins (like huds or fancy menus or whatever) #undef SUPPORT_ICE //Internet Connectivity Establishment, for use by plugins to establish voice or game connections. #undef PSET_CLASSIC //support the 'classic' particle system, for that classic quake feel. #undef HAVE_CDPLAYER //includes cd playback. actual cds. named/numbered tracks are supported regardless (though you need to use the 'music' command to play them without this). @@ -147,7 +147,7 @@ #undef HLSERVER #undef FTPSERVER //undef CLIENTONLY //leave this up to the makefiles. -#undef HAVE_TCP +#define HAVE_TCP #undef HAVE_GNUTLS //linux tls/dtls support #undef HAVE_WINSSPI //windows tls/dtls support #undef HAVE_JUKEBOX //includes built-in jukebox crap diff --git a/engine/common/config_wastes.h b/engine/common/config_wastes.h index c18053f93..3ab62d28d 100644 --- a/engine/common/config_wastes.h +++ b/engine/common/config_wastes.h @@ -154,7 +154,7 @@ #undef HLSERVER #undef FTPSERVER //undef CLIENTONLY //leave this up to the makefiles. -#undef HAVE_TCP +#define HAVE_TCP #undef HAVE_GNUTLS //linux tls/dtls support #undef HAVE_WINSSPI //windows tls/dtls support #undef HAVE_JUKEBOX //includes built-in jukebox crap diff --git a/plugins/Makefile b/plugins/Makefile index bb708cbf1..b3df2163a 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -2,20 +2,20 @@ #windows is special as always, but we don't support itanium, and microsoft don't support anything else (not even arm with the nt win32 api) ifeq ($(FTE_TARGET),win32) PLUG_NATIVE_EXT=_x86.dll -PLUG_LDFLAGS= +PLUG_LDFLAGS= -static-libgcc PLUG_LDFLAGS_ZLIB=-L../engine/libs/mingw-libs -lzlib BITS=32 PLUG_LDFLAGS_DL= endif ifeq ($(FTE_TARGET),win64) PLUG_NATIVE_EXT=_x64.dll -PLUG_LDFLAGS=-Wl,--support-old-code +PLUG_LDFLAGS=-Wl,--support-old-code -static-libgcc PLUG_LDFLAGS_ZLIB=-L../engine/libs/mingw64-libs -lz BITS=64 PLUG_LDFLAGS_DL= endif -PLUG_LDFLAGS_DL?=-ldl +PLUG_LDFLAGS_DL?=-ldl -static-libgcc PLUG_LDFLAGS?=-L/usr/local/lib -Wl,-R/usr/local/lib -lm PLUG_LDFLAGS_ZLIB?=-lz @@ -70,8 +70,8 @@ endif PLUG_NATIVE_EXT?=_unk.so PLUG_DEFFILE?= -PLUG_CFLAGS?=-fPIC -Wl,--no-undefined -Bsymbolic -fvisibility=hidden -PLUG_CXXFLAGS?=-fPIC -Wl,--no-undefined -Bsymbolic -fvisibility=hidden +PLUG_CFLAGS?=-fPIC -Wl,--no-undefined -Bsymbolic -fvisibility=hidden -static-libgcc +PLUG_CXXFLAGS?=-fPIC -Wl,--no-undefined -Bsymbolic -fvisibility=hidden -static-libgcc PLUG_CMAKE?=-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) PLUG_LDFLAGS_ZLIB?= ARCH:=$(shell $(CC) -dumpmachine) diff --git a/plugins/irc/ircclient.c b/plugins/irc/ircclient.c index de724a004..730e9ad2e 100644 --- a/plugins/irc/ircclient.c +++ b/plugins/irc/ircclient.c @@ -35,6 +35,7 @@ vmcvar_t irc_hostname = {"irc_hostname", "localhost", irccvars, 0}; vmcvar_t irc_ident = {"irc_ident", "FTE", irccvars, 0}; vmcvar_t irc_timestamp = {"irc_timestamp", "0", irccvars, 0}; vmcvar_t irc_quitmessage = {"irc_quitmessage", "", irccvars, 0}; +vmcvar_t irc_config = {"irc_config", "1", irccvars, 0}; #undef irccvars vmcvar_t *cvarlist[] ={ @@ -248,7 +249,7 @@ static void IRC_SetFooter(ircclient_t *irc, const char *subname, const char *for if (BUILTINISVALID(Con_SetConsoleFloat) && pCon_GetConsoleFloat(lwr, "iswindow") < true) { pCon_SetConsoleString(lwr, "title", *channame?channame:irc->server); - pCon_SetConsoleString(lwr, "prompt", "^airc^a] "); + pCon_SetConsoleString(lwr, "prompt", va("[^1%s^7]: ", irc->nick)); pCon_SetConsoleFloat(lwr, "iswindow", 2); pCon_SetConsoleFloat(lwr, "forceutf8", true); pCon_SetConsoleFloat(lwr, "wnd_w", 256); @@ -324,7 +325,7 @@ static void IRC_Printf(ircclient_t *irc, const char *subname, const char *format if (BUILTINISVALID(Con_SetConsoleFloat) && pCon_GetConsoleFloat(lwr, "iswindow") < true) { pCon_SetConsoleString(lwr, "title", *channame?channame:irc->server); - pCon_SetConsoleString(lwr, "prompt", "^airc^a] "); + pCon_SetConsoleString(lwr, "prompt", va("[^1%s^7]: ", irc->nick)); pCon_SetConsoleFloat(lwr, "iswindow", 2); pCon_SetConsoleFloat(lwr, "forceutf8", true); pCon_SetConsoleFloat(lwr, "wnd_w", 256); @@ -642,6 +643,10 @@ static void IRC_ParseConfig(void) static void IRC_WriteConfig(void) { qhandle_t config; + + if (irc_config.value == 0) + return; + pFS_Open("**plugconfig", &config, 2); if (config >= 0) {