From 3af655e29dad489c9de1f859f2e5aa79db7e9654 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Sat, 19 Aug 2023 04:50:59 +0200 Subject: [PATCH] Revert "Add mingw-compiled libopenmpt DLLs" bruh idk why even --- libs/libopenmpt/SRB2NOTE.md | 54 ------------------------------------- src/win32/Makefile.cfg | 4 +-- 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 libs/libopenmpt/SRB2NOTE.md diff --git a/libs/libopenmpt/SRB2NOTE.md b/libs/libopenmpt/SRB2NOTE.md deleted file mode 100644 index 7eac9183b..000000000 --- a/libs/libopenmpt/SRB2NOTE.md +++ /dev/null @@ -1,54 +0,0 @@ -# libopenmpt mingw-w64 binary info - -Current built version as of 2019/09/27 is 0.4.7+r12088.pkg - -* mingw binaries (.dll): `bin/[x86 or x86_64]/mingw` -* mingw import libraries (.dll.a): `lib/[x86 or x86_64]/mingw` - -# Building libopenmpt with mingw-w64 - -libopenmpt must be built from the Makefile / Android dev package in the -[Downloads page](https://lib.openmpt.org/libopenmpt/download/#all-downloads) - -Use the mingw-w64 distributions from -[SourceForge](https://sourceforge.net/projects/mingw-w64/files/#readme). - -You can download the appropriate 7-zip archive, extract to a folder of -your choice, remove any existing mingw directories from your PATH, -then call `mingw32-make.exe` from its direct location. - -FOR LIBOPENMPT, YOU MUST USE A MINGW PACKAGE THAT SUPPORTS THE POSIX -THREADING MODEL! DO NOT COMPILE WITH A WIN32 THREADING MODEL! - -I use GCC 7.3.0: - -* [x86_64-posix-seh](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/7.3.0/threads-posix/seh/x86_64-7.3.0-release-posix-seh-rt_v5-rev0.7z) -* [i686-posix-dwarf](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/7.3.0/threads-posix/dwarf/i686-7.3.0-release-posix-dwarf-rt_v5-rev0.7z) - -## x86 build instructions - -``` -set CFLAGS=-march=pentium -static-libgcc -set CXXFLAGS=-march=pentium -static-libgcc -static-libstdc++ -set LDFLAGS=-Wl,--out-implib,bin/libopenmpt.dll.a -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,-Bdynamic,--no-whole-archive - -cd [libopenmpt-make-src] -[x86-mingw-w64-bin]/mingw32-make.exe CONFIG=mingw64-win32 -``` - -`libopenmpt.dll` and `libopenmpt.dll.a` will be built in the -`bin/` folder. - -## x86_64 build instructions - -``` -set CFLAGS=-march=nocona -static-libgcc -set CXXFLAGS=-march=nocona -static-libgcc -static-libstdc++ -set LDFLAGS=-Wl,--out-implib,bin/libopenmpt.dll.a -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,-Bdynamic,--no-whole-archive - -cd [libopenmpt-make-src] -[x86_64-mingw-w64-bin]/mingw32-make.exe CONFIG=mingw64-win64 -``` - -`libopenmpt.dll` and `libopenmpt.dll.a` will be built in the -`bin/` folder. \ No newline at end of file diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg index 2341a1494..b109aee8e 100644 --- a/src/win32/Makefile.cfg +++ b/src/win32/Makefile.cfg @@ -13,7 +13,7 @@ ifdef MINGW64 ifdef HAVE_OPENMPT LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc - LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86_64/mingw -lopenmpt + LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86_64 -llibopenmpt endif SDL_CFLAGS?=-I../libs/SDL2/x86_64-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2 -Dmain=SDL_main @@ -26,7 +26,7 @@ else ifdef HAVE_OPENMPT LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc - LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86/mingw -lopenmpt + LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86 -llibopenmpt endif SDL_CFLAGS?=-I../libs/SDL2/i686-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/i686-w64-mingw32/include/SDL2 -Dmain=SDL_main