diff --git a/libs/DLL-README.txt b/libs/DLL-README.txt index 8d388d412..a88bf9938 100644 --- a/libs/DLL-README.txt +++ b/libs/DLL-README.txt @@ -27,7 +27,4 @@ and don't forget to build r_opengl.dll for srb2dd. * libs\dll-binaries\x86_64\discord-rpc.dll * libs\SDL2\x86_64-w64-mingw32\bin\SDL2.dll * libs\SDL2_mixer\x86_64-w64-mingw32\bin\*.dll (get everything) -* libs\libopenmpt\x86_64\bin\mingw\libopenmpt.dll -* libs\libbacktrace\bin\x86_64\libbacktrace-0.dll -* libs\libbacktrace\bin\x86_64\libgcc_s_seh-1.dll -* libs\libbacktrace\bin\x86_64\libwinpthread-1.dll \ No newline at end of file +* libs\libopenmpt\x86_64\bin\mingw\libopenmpt.dll \ No newline at end of file diff --git a/libs/dll-binaries/x86_64/exchndl.dll b/libs/dll-binaries/x86_64/exchndl.dll deleted file mode 100644 index 747d7a3d5..000000000 Binary files a/libs/dll-binaries/x86_64/exchndl.dll and /dev/null differ diff --git a/libs/dll-binaries/x86_64/mgwhelp.dll b/libs/dll-binaries/x86_64/mgwhelp.dll deleted file mode 100644 index 4e30e140e..000000000 Binary files a/libs/dll-binaries/x86_64/mgwhelp.dll and /dev/null differ diff --git a/libs/drmingw/lib/win64/libexchndl.a b/libs/drmingw/lib/win64/libexchndl.a deleted file mode 100644 index ff0bcf1a5..000000000 Binary files a/libs/drmingw/lib/win64/libexchndl.a and /dev/null differ diff --git a/libs/drmingw/lib/win64/libmgwhelp.a b/libs/drmingw/lib/win64/libmgwhelp.a deleted file mode 100644 index 6f5602905..000000000 Binary files a/libs/drmingw/lib/win64/libmgwhelp.a and /dev/null differ diff --git a/libs/libbacktrace/bin/x86_64/libbacktrace-0.dll b/libs/libbacktrace/bin/x86_64/libbacktrace-0.dll deleted file mode 100644 index 14bc20738..000000000 Binary files a/libs/libbacktrace/bin/x86_64/libbacktrace-0.dll and /dev/null differ diff --git a/libs/libbacktrace/bin/x86_64/libgcc_s_seh-1.dll b/libs/libbacktrace/bin/x86_64/libgcc_s_seh-1.dll deleted file mode 100644 index fb2e767ec..000000000 Binary files a/libs/libbacktrace/bin/x86_64/libgcc_s_seh-1.dll and /dev/null differ diff --git a/libs/libbacktrace/bin/x86_64/libwinpthread-1.dll b/libs/libbacktrace/bin/x86_64/libwinpthread-1.dll deleted file mode 100644 index c47b8da54..000000000 Binary files a/libs/libbacktrace/bin/x86_64/libwinpthread-1.dll and /dev/null differ diff --git a/src/sdl/Makefile.cfg b/src/sdl/Makefile.cfg index 4335b58ab..72a94dca8 100644 --- a/src/sdl/Makefile.cfg +++ b/src/sdl/Makefile.cfg @@ -108,6 +108,10 @@ endif ifndef NOLIBBACKTRACE OPTS+=-DHAVE_LIBBACKTRACE +ifdef MINGW64 + CPPFLAGS+=-I../libs/libbacktrace/include + LDFLAGS+=-L../libs/libbacktrace/lib/x86_64 +endif LIBS:=-lbacktrace $(LIBS) endif diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg index d04c6712f..a1dba3c7a 100644 --- a/src/win32/Makefile.cfg +++ b/src/win32/Makefile.cfg @@ -63,11 +63,7 @@ else endif endif -ifdef MINGW64 - CPPFLAGS+=-I../libs/drmingw/include - LDFLAGS+=-L../libs/drmingw/lib/win64 - LIBS+=-lmgwhelp -lexchndl -else +ifndef MINGW64 CPPFLAGS+=-I../libs/drmingw/include LDFLAGS+=-L../libs/drmingw/lib/win32 LIBS+=-lmgwhelp -lexchndl