diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index c6aab5cc7..e320524ef 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -52,7 +52,7 @@ ifneq (0,$(RELEASE)) LIBS=-lm else # Debugging enabled - debug=-ggdb -O0 -DDEBUGGINGAIDS $(F_STACK_PROTECTOR_ALL) + debug=-ggdb -O0 -DDEBUGGINGAIDS LIBS=-lm -rdynamic ifneq (0,$(KRANDDEBUG)) diff --git a/polymer/eduke32/backtrace.dll b/polymer/eduke32/backtrace.dll new file mode 100644 index 000000000..0ff6d6187 Binary files /dev/null and b/polymer/eduke32/backtrace.dll differ diff --git a/polymer/eduke32/build/Makefile b/polymer/eduke32/build/Makefile index a5b9671c5..ba9845b5d 100644 --- a/polymer/eduke32/build/Makefile +++ b/polymer/eduke32/build/Makefile @@ -79,7 +79,7 @@ ifneq ($(RELEASE),0) LIBS=-lm else # Debugging enabled - debug=-ggdb -O0 -DDEBUGGINGAIDS -DNOSDLPARACHUTE $(F_STACK_PROTECTOR_ALL) + debug=-ggdb -O0 -DDEBUGGINGAIDS -DNOSDLPARACHUTE LIBS=-lm $(L_SSP) -Wl,--enable-auto-import -rdynamic ifneq (0,$(KRANDDEBUG)) debug+=-DKRANDDEBUG=1 diff --git a/polymer/eduke32/build/src/winlayer.c b/polymer/eduke32/build/src/winlayer.c index b90fbe922..08f534736 100644 --- a/polymer/eduke32/build/src/winlayer.c +++ b/polymer/eduke32/build/src/winlayer.c @@ -363,6 +363,10 @@ int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, in #endif #endif +#ifdef DEBUGGINGAIDS + LoadLibraryA("backtrace.dll"); +#endif + hdc = GetDC(NULL); r = GetDeviceCaps(hdc, BITSPIXEL); ReleaseDC(NULL, hdc); diff --git a/polymer/eduke32/libiconv2.dll b/polymer/eduke32/libiconv2.dll new file mode 100644 index 000000000..747073f1b Binary files /dev/null and b/polymer/eduke32/libiconv2.dll differ diff --git a/polymer/eduke32/libintl3.dll b/polymer/eduke32/libintl3.dll new file mode 100644 index 000000000..ec11e6b19 Binary files /dev/null and b/polymer/eduke32/libintl3.dll differ diff --git a/polymer/synthesis.sh b/polymer/synthesis.sh index 5cd9d0529..db9bc934e 100755 --- a/polymer/synthesis.sh +++ b/polymer/synthesis.sh @@ -10,7 +10,7 @@ clean=veryclean # the following file paths are relative to $source targets=( eduke32.exe mapster32.exe ) -bin_packaged=( eduke32.exe eduke32.debug.exe mapster32.exe mapster32.debug.exe SEHELP.HLP STHELP.HLP names.h buildlic.txt GNU.TXT m32help.hlp nedmalloc.dll samples/* ) +bin_packaged=( eduke32.exe eduke32.debug.exe mapster32.exe mapster32.debug.exe backtrace.dll libiconv2.dll libintl3.dll SEHELP.HLP STHELP.HLP names.h buildlic.txt GNU.TXT m32help.hlp nedmalloc.dll samples/* ) not_src_packaged=( psd source/jaudiolib/third-party/vorbis.framework/Versions/A/vorbis Apple ) # group that owns the resulting packages