Closed carstene1ns closed 3 years ago
Split out the automake update now, since it unbreaks the toolchain build. The actual update here can stay longer as it needs testing.
Sorry, forgot about this PR. I do now a test build and will report back if the Player works, thanks.
@carstene1ns
I'm currently unable to test it because CMake refuses now to find 32-bit fmt o_O. I try to find the problem.
There is another build failure: Could you also add the following lines to the build.cmd please? On the server I added a hack for this months ago because yasm was not found but looks like there is now an upstream fix for this:
CMake Error at installed/x64-windows-static/share/yasm-tool-helper/yasm-tool-helper.cmake:16 (message):
Cross-targetting and x64 ports requiring yasm require the x86-windows
yasm-tool to be available. Please install yasm-tool:x86-windows first.
Call Stack (most recent call first):
ports/mpg123/portfile.cmake:37 (yasm_tool_helper)
scripts/ports.cmake:136 (include)
diff --git a/windows/build.cmd b/windows/build.cmd
index 1103e99..702f9a1 100644
--- a/windows/build.cmd
+++ b/windows/build.cmd
@@ -2,6 +2,10 @@
call helper\prepare.cmd
+:: Install yasm (required for 64 bit mpg123 build)
+vcpkg install --triplet x86-windows^
+ yasm-tool[core]
+
:: Build 32-bit libraries
:: Using [core] everywhere to prevent surprises when new default-features are
:: added to libraries.
The fmt error was just me not reading. CMake requires now for Visual Studio solutions that the architecture is specified via "-A" argument.
This is untested! Brings our custom icu on par with vcpkg upstream. (The easyrpg specific part - custom data file and static data packaging - is retained)
Fixes #94. The actual fix is updating to automake 1.16, if needed, we could apply this without updating the rest as a quick fix. See also: https://github.com/microsoft/vcpkg/pull/13980/files