From 4a582f949a4eb7ce1f557537e3493e57e5ce624e Mon Sep 17 00:00:00 2001 From: Spoike Date: Tue, 21 Apr 2015 23:11:26 +0000 Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4861 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 7 +++++-- engine/client/in_win.c | 7 +++++-- engine/client/snd_mem.c | 12 ++++++------ engine/client/sys_win.c | 7 +++---- engine/qclib/Makefile | 6 +++--- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 80d51ff2c..197c99dac 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -1010,11 +1010,14 @@ ifeq (win,$(findstring win,$(FTE_TARGET))$(findstring _SDL,$(FTE_TARGET))) BASELDFLAGS= + # Allow 32bit FTE to access beyond the 2GB address space ifeq ($(FTE_TARGET),win32) BASELDFLAGS=-Wl,--large-address-aware endif + BASELDFLAGS+=-lcomctl32 + EXEPOSTFIX=.exe SV_CFLAGS=$(SERVER_ONLY_CFLAGS) $(W32_CFLAGS) @@ -1538,11 +1541,11 @@ _qcc-tmp: $(REQDIR) qcc-rel: @$(MAKE) _qcc-tmp TYPE=_out-rel REQDIR=reldir EXE_NAME="../fteqcc" OUT_DIR="$(RELEASE_DIR)/qcc" SOBJS="qcctui.o" qccgui-rel: - @$(MAKE) _qcc-tmp TYPE=_out-rel REQDIR=reldir EXE_NAME="../fteqccgui" OUT_DIR="$(RELEASE_DIR)/qcc" SOBJS="qccgui.o qccguistuff.o" LDFLAGS="$(LDFLAGS) -lole32 -lcomdlg32 -lcomctl32 -mwindows" + @$(MAKE) _qcc-tmp TYPE=_out-rel REQDIR=reldir EXE_NAME="../fteqccgui" OUT_DIR="$(RELEASE_DIR)/qcc" SOBJS="qccgui.o qccguistuff.o" LDFLAGS="$(LDFLAGS) -lole32 -lcomdlg32 -lcomctl32 -lshlwapi -mwindows" qcc-dbg: @$(MAKE) _qcc-tmp TYPE=_out-dbg REQDIR=debugdir EXE_NAME="../fteqcc" OUT_DIR="$(DEBUG_DIR)/qcc" SOBJS="qcctui.o" qccgui-dbg: - @$(MAKE) _qcc-tmp TYPE=_out-dbg REQDIR=debugdir EXE_NAME="../fteqccgui" OUT_DIR="$(DEBUG_DIR)/qcc" SOBJS="qccgui.o qccguistuff.o" LDFLAGS="$(LDFLAGS) -lole32 -lcomdlg32 -lcomctl32 -mwindows" + @$(MAKE) _qcc-tmp TYPE=_out-dbg REQDIR=debugdir EXE_NAME="../fteqccgui" OUT_DIR="$(DEBUG_DIR)/qcc" SOBJS="qccgui.o qccguistuff.o" LDFLAGS="$(LDFLAGS) -lole32 -lcomdlg32 -lcomctl32 -lshlwapi -mwindows" #scintilla is messy as fuck when building statically. but at least we can strip out the lexers we don't use this way. diff --git a/engine/client/in_win.c b/engine/client/in_win.c index c5c1315bd..310cf36c2 100644 --- a/engine/client/in_win.c +++ b/engine/client/in_win.c @@ -2028,11 +2028,14 @@ void INS_EnumerateDevices(void *ctx, void(*callback)(void *ctx, char *type, char for (idx = 0; idx < rawmicecount; idx++) callback(ctx, "mouse", va("raw%i", idx), &rawmice[idx].qdeviceid); for (idx = 0; idx < rawkbdcount; idx++) - callback(ctx, "keyboard", va("rawi", idx), &rawkbd[idx].qdeviceid); + callback(ctx, "keyboard", va("raw%i", idx), &rawkbd[idx].qdeviceid); +#if (DIRECTINPUT_VERSION >= DINPUT_VERSION_DX7) if (dinput >= DINPUT_VERSION_DX7 && g_pMouse7) callback(ctx, "mouse", "di7", NULL); - else if (dinput && g_pMouse7) + else +#endif + if (dinput && g_pMouse) callback(ctx, "mouse", "di", NULL); callback(ctx, "mouse", "system", NULL); diff --git a/engine/client/snd_mem.c b/engine/client/snd_mem.c index b15173d8f..b45f22a19 100644 --- a/engine/client/snd_mem.c +++ b/engine/client/snd_mem.c @@ -788,7 +788,7 @@ S_LoadSound ============== */ -qboolean S_LoadSoundWorker (void *ctx, void *ctxdata, size_t a, size_t b) +void S_LoadSoundWorker (void *ctx, void *ctxdata, size_t a, size_t b) { sfx_t *s = ctx; char namebuffer[256]; @@ -830,7 +830,7 @@ qboolean S_LoadSoundWorker (void *ctx, void *ctxdata, size_t a, size_t b) { Con_SafePrintf ("Couldn't load %s\n", namebuffer); s->loadstate = SLS_FAILED; - return false; + return; } } else @@ -844,7 +844,7 @@ qboolean S_LoadSoundWorker (void *ctx, void *ctxdata, size_t a, size_t b) { //clq2_parsestartsound detects this also, and should not try playing these sounds. s->loadstate = SLS_FAILED; - return false; + return; } else if (name[0] == '.' && name[1] == '.' && name[2] == '/') { @@ -879,7 +879,7 @@ qboolean S_LoadSoundWorker (void *ctx, void *ctxdata, size_t a, size_t b) //FIXME: check to see if queued for download. Con_DPrintf ("Couldn't load %s\n", namebuffer); s->loadstate = SLS_FAILED; - return false; + return; } for (i = sizeof(AudioInputPlugins)/sizeof(AudioInputPlugins[0])-1; i >= 0; i--) @@ -892,7 +892,7 @@ qboolean S_LoadSoundWorker (void *ctx, void *ctxdata, size_t a, size_t b) //wake up the main thread in case it decided to wait for us. COM_AddWork(0, S_Wakeup, s, NULL, 0, 0); BZ_Free(data); - return true; + return; } } } @@ -902,7 +902,7 @@ qboolean S_LoadSoundWorker (void *ctx, void *ctxdata, size_t a, size_t b) s->loadstate = SLS_FAILED; BZ_Free(data); - return false; + return; } qboolean S_LoadSound (sfx_t *s) diff --git a/engine/client/sys_win.c b/engine/client/sys_win.c index b42860314..1939bdfde 100644 --- a/engine/client/sys_win.c +++ b/engine/client/sys_win.c @@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include "pr_common.h" +#include "fs.h" //#define RESTARTTEST @@ -2695,7 +2696,7 @@ void Update_PromptedDownloaded(void *ctx, int foo) #endif TL_Shutdown(); - CreateProcess(ctx, va("\"%s\" %s", ctx, COM_Parse(GetCommandLineA())), NULL, NULL, TRUE, 0, NULL, NULL, &startinfo, &childinfo); + CreateProcess(ctx, va("\"%s\" %s", (char*)ctx, COM_Parse(GetCommandLineA())), NULL, NULL, TRUE, 0, NULL, NULL, &startinfo, &childinfo); Z_Free(ctx); exit(1); } @@ -2703,7 +2704,6 @@ void Update_PromptedDownloaded(void *ctx, int foo) Z_Free(ctx); } -#include "fs.h" void Update_Version_Updated(struct dl_download *dl) { //happens in a thread, avoid va @@ -3496,7 +3496,7 @@ qboolean Sys_DoInstall(void) { HRESULT hres; IShellLinkW *psl; - hres = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&psl); + hres = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &qIID_IShellLinkW, (LPVOID*)&psl); if (SUCCEEDED(hres)) { char startmenu[MAX_OSPATH]; @@ -3546,7 +3546,6 @@ qboolean Sys_RunInstaller(void) return true; } -#include "fs.h" #define RESLANG MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK) static const char *Sys_FindManifest(void) { diff --git a/engine/qclib/Makefile b/engine/qclib/Makefile index f2b6816e5..6668beb7f 100644 --- a/engine/qclib/Makefile +++ b/engine/qclib/Makefile @@ -32,11 +32,11 @@ DO_CC?=$(CC) $(BASE_CFLAGS) -o $@ -c $< $(CFLAGS) lib: R_win_nocyg: $(QCC_OBJS) $(COMMON_OBJS) $(WIN32GUI_OBJS) - $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 $(BASE_LDFLAGS) $(QCC_OBJS) $(COMMON_OBJS) $(WIN32GUI_OBJS) -mno-cygwin -mwindows -lcomctl32 -lole32 + $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 $(BASE_LDFLAGS) $(QCC_OBJS) $(COMMON_OBJS) $(WIN32GUI_OBJS) -mno-cygwin -mwindows -lcomctl32 -lole32 -lshlwapi R_nocyg: $(QCC_OBJS) $(COMMON_OBJS) $(WIN32GUI_OBJS) - $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 $(BASE_LDFLAGS) $(QCC_OBJS) $(COMMON_OBJS) $(WIN32GUI_OBJS) -mno-cygwin -lcomctl32 -lole32 + $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 $(BASE_LDFLAGS) $(QCC_OBJS) $(COMMON_OBJS) $(WIN32GUI_OBJS) -mno-cygwin -lcomctl32 -lole32 -lshlwapi R_win: $(QCC_OBJS) $(COMMON_OBJS) $(WIN32GUI_OBJS) - $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 $(BASE_LDFLAGS) $(QCC_OBJS) $(COMMON_OBJS) $(WIN32GUI_OBJS) -mwindows -lcomctl32 -lole32 + $(CC) $(BASE_CFLAGS) -o fteqcc.exe -O3 $(BASE_LDFLAGS) $(QCC_OBJS) $(COMMON_OBJS) $(WIN32GUI_OBJS) -mwindows -lcomctl32 -lole32 -lshlwapi win_nocyg: $(MAKE) USEGUI_CFLAGS="-DUSEGUI -DQCCONLY" R_win_nocyg