diff --git a/engine/Makefile b/engine/Makefile index d7bf755a8..9f5a42fa6 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -1305,7 +1305,7 @@ ifeq (win,$(findstring win,$(FTE_TARGET))$(findstring _SDL,$(FTE_TARGET))) QTV_LDFLAGS=-lws2_32 -lwinmm SV_EXE_NAME=../$(EXE_NAME)sv$(BITS)$(EXEPOSTFIX) - SV_LDFLAGS=-lws2_32 -lwinmm + SV_LDFLAGS=-lws2_32 -lwinmm -lole32 SV_DIR=sv_mingw$(BITS) SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) $(WINDOWSSERVERONLY_OBJS) $(BOTLIB_OBJS) fs_win32.o $(LTO_END) resources.o $(LTO_START) SV_CFLAGS=$(SERVER_ONLY_CFLAGS) $(W32_CFLAGS) diff --git a/engine/client/m_download.c b/engine/client/m_download.c index b7fa1bf4b..07eda6897 100644 --- a/engine/client/m_download.c +++ b/engine/client/m_download.c @@ -1815,7 +1815,7 @@ static void PM_ListDownloaded(struct dl_download *dl) } } #endif -#ifndef SERVERONLY +#if defined(HAVE_CLIENT) && defined(WEBCLIENT) static void PM_UpdatePackageList(qboolean autoupdate, int retry); static void PM_AllowPackageListQuery_Callback(void *ctx, int opt) { @@ -1851,9 +1851,7 @@ static void PM_UpdatePackageList(qboolean autoupdate, int retry) #else doautoupdate |= autoupdate; -#ifdef SERVERONLY - allowphonehome = true; //erk. -#else +#ifdef HAVE_CLIENT if (pkg_autoupdate.ival >= 1) allowphonehome = true; else if (allowphonehome == -1) @@ -1861,6 +1859,8 @@ static void PM_UpdatePackageList(qboolean autoupdate, int retry) Menu_Prompt(PM_AllowPackageListQuery_Callback, NULL, "Query updates list?\n", "Okay", NULL, "Nope"); return; } +#else + allowphonehome = true; //erk. #endif //kick off the initial tier of list-downloads. diff --git a/engine/client/pr_csqc.c b/engine/client/pr_csqc.c index fc5c67dd1..d19489e7a 100644 --- a/engine/client/pr_csqc.c +++ b/engine/client/pr_csqc.c @@ -8215,8 +8215,10 @@ qboolean CSQC_DrawView(void) } else { +#ifdef USERBE if (csqc_world.rbe) maxtic = mintic; //physics engines need a fixed tick rate. +#endif while(1) { host_frametime = cl.servertime - csqc_world.physicstime; diff --git a/engine/common/fs.c b/engine/common/fs.c index b1ba89888..85af91e0a 100644 --- a/engine/common/fs.c +++ b/engine/common/fs.c @@ -4345,6 +4345,10 @@ qboolean Sys_FindGameData(const char *poshname, const char *gamename, char *base { return false; } +static qboolean Sys_SteamHasFile(char *basepath, int basepathlen, char *steamdir, char *fname) //returns the base system path +{ + return false; +} #elif defined(_WIN32) && !defined(FTE_SDL) && !defined(WINRT) && !defined(_XBOX) #include "winquake.h" #ifdef MINGW