diff --git a/src/Makefile.d/detect.mk b/src/Makefile.d/detect.mk index 5eb33beb1..dd31d2f3e 100644 --- a/src/Makefile.d/detect.mk +++ b/src/Makefile.d/detect.mk @@ -34,7 +34,6 @@ ifeq ($(OS),Windows_NT) # all windows are Windows_NT... MINGW=1 endif - WINDOWSHELL=1 NOOBJDUMP=1 else # if you on the *nix diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk index 231000b36..ca789dbee 100644 --- a/src/Makefile.d/features.mk +++ b/src/Makefile.d/features.mk @@ -68,6 +68,12 @@ HAVE_MINIUPNPC=1 opts+=-DHAVE_MINIUPNPC endif +ifndef NOLIBBACKTRACE +$(eval $(call Propogate_flags,LIBBACKTRACE)) +libs+=-lbacktrace +opts+=-DHAVE_LIBBACKTRACE +endif + #windoze hack ifdef MINGW ifndef NODISCORDRPC diff --git a/src/Makefile.d/sdl.mk b/src/Makefile.d/sdl.mk index f93c49cdf..3c8b4f256 100644 --- a/src/Makefile.d/sdl.mk +++ b/src/Makefile.d/sdl.mk @@ -62,11 +62,6 @@ SDLMAIN=1 endif endif -ifndef NOLIBBACKTRACE -opts+=-DHAVE_LIBBACKTRACE -libs+=-lbacktrace -endif - ifdef SDLMAIN opts+=-DSDLMAIN else diff --git a/src/Makefile.d/win32.mk b/src/Makefile.d/win32.mk index 22cee7fc1..f761a576e 100644 --- a/src/Makefile.d/win32.mk +++ b/src/Makefile.d/win32.mk @@ -59,19 +59,15 @@ $(1)_CFLAGS?=$($(1)_opts) $(1)_LDFLAGS?=$($(1)_libs) endef -ifdef HAVE_GME lib:=../libs/gme LIBGME_opts:=-I$(lib)/include LIBGME_libs:=-L$(lib)/win$(32) -lgme $(eval $(call _set,LIBGME)) -endif -ifdef HAVE_OPENMPT lib:=../libs/libopenmpt LIBOPENMPT_opts:=-I$(lib)/inc LIBOPENMPT_libs:=-L$(lib)/lib/$(x86)/mingw -lopenmpt $(eval $(call _set,LIBOPENMPT)) -endif lib:=../libs/SDL2_mixer/$(mingw) @@ -87,22 +83,18 @@ SDL_libs:=-L$(lib)/lib $(mixer_libs)\ $(eval $(call _set,SDL)) endif -ifndef MINGW64 +ifdef MINGW64 +lib:=../libs/libbacktrace +LIBBACKTRACE_opts:=-I$(lib)/include +LIBBACKTRACE_libs:=-L$(lib)/lib/x86_64 -lbacktrace +$(eval $(call _set,LIBBACKTRACE)) +else lib:=../libs/drmingw DRMINGW_opts+=-I$(lib)/include DRMINGW_libs+=-L$(lib)/lib/win32 -lmgwhelp -lexchndl $(eval $(call _set,DRMINGW)) endif -ifdef HAVE_LIBBACKTRACE -ifdef MINGW64 -lib:=../libs/libbacktrace -LIBTRACE_opts:=-I$(lib)/include -LIBTRACE_libs:=-L$(lib)/lib/x86_64 -lbacktrace -$(eval $(call _set,LIBTRACE)) -endif -endif - lib:=../libs/zlib ZLIB_opts:=-I$(lib) ZLIB_libs:=-L$(lib)/win32 -l:libz$(32).a @@ -115,23 +107,17 @@ PNG_libs:=-L$(lib)/projects -lpng$(32) $(eval $(call _set,PNG)) endif -ifndef NOCURL lib:=../libs/curl CURL_opts:=-I$(lib)/include CURL_libs:=-L$(lib)/lib$(32) -lcurl $(eval $(call _set,CURL)) -endif -ifdef HAVE_MINIUPNPC lib:=../libs/miniupnpc MINIUPNPC_opts:=-I$(lib)/include -DMINIUPNP_STATICLIB MINIUPNPC_libs:=-L$(lib)/mingw$(32) -lminiupnpc -lws2_32 -liphlpapi $(eval $(call _set,MINIUPNPC)) -endif -ifdef HAVE_DISCORDRPC -lib:=../libs/discord-rpc/win$(32)-dynamic/ -DRPC_opts+=-I$(lib)/include -DRPC_libs+=-L$(lib)/lib -ldiscord-rpc -$(eval $(call _set,DRPC)) -endif +lib:=../libs/discord-rpc/win$(32)-dynamic +DISCORDRPC_opts+=-I$(lib)/include +DISCORDRPC_libs+=-L$(lib)/lib -ldiscord-rpc +$(eval $(call _set,DISCORDRPC)) diff --git a/src/Sourcefile b/src/Sourcefile index d6f535308..4d117111d 100644 --- a/src/Sourcefile +++ b/src/Sourcefile @@ -39,6 +39,7 @@ s_sound.c screen.c sounds.c st_stuff.c +string.c tables.c v_video.c w_wad.c diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index aa04ccb0d..d12662902 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -744,7 +744,7 @@ static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co) break; case VK_RETURN: entering_con_command = false; - // Fall through. + /* FALLTHRU */ default: //event.data1 = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char event.data1 = evt.uChar.AsciiChar;