Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Fix MSVC builds #3516

Merged
merged 2 commits into from Nov 11, 2021
Merged

CI: Fix MSVC builds #3516

merged 2 commits into from Nov 11, 2021

Conversation

@sluicebox
Copy link
Member

@sluicebox sluicebox commented Nov 11, 2021

The MSVC builds have been failing because PCRE changed their download server. microsoft/vcpkg#21201

Fixed by updating vcpkg commit and dropping the "d" from the libjpeg-turbo debug library. There's no longer a suffix on this library when buildling with vcpkg.

I'm doing this as a PR so that someone with access can update the lib filename in http://downloads.scummvm.org/frs/build/scummvm_libs_2015.zip

sluicebox added 2 commits Nov 11, 2021
Required for CI; libjpeg-turbo debug builds no longer have a "d"
suffix when building with vcpkg.
@sluicebox sluicebox requested a review from SupSuper Nov 11, 2021
@sev-
Copy link
Member

@sev- sev- commented Nov 11, 2021

Could you please clarify, which exactly files need to be renamed in the archive and to which? There are 4 files with 'jpegd' in them.

Loading

@sluicebox
Copy link
Member Author

@sluicebox sluicebox commented Nov 11, 2021

lib/x64/Debug/jpegd.lb
lib/x86/Debug/jpegd.lb

Both need to be renamed to jpeg.lib

(These are the only two files with jpegd in their name; I'm not sure how you're seeing four)

Loading

@sev-
Copy link
Member

@sev- sev- commented Nov 11, 2021

I also see turbojpegd.lib.

Anyway, I renamed the file in the archive and merging this. Please test.

Loading

@sev- sev- merged commit 5b5cdbe into scummvm:master Nov 11, 2021
8 checks passed
Loading
@sluicebox
Copy link
Member Author

@sluicebox sluicebox commented Nov 11, 2021

You're right; wow that search screen I used is... not good... =)

Tested with the updated archive and a fresh local build; works great, thanks! I don't see anything that references those "turbo" libs, I guess those are for manually using if you want.

Loading

@lephilousophe
Copy link
Member

@lephilousophe lephilousophe commented Nov 12, 2021

I believe the turbojpeg.lib file is useless for us.
When you build turbo-jpeg, it provides two interfaces: one compatible with original libjpeg (the jpeg.lib, which you invoke on GCC with -ljpeg) and a turbojpeg interface with different API (the turbojpeg.lib file, linked with -lturbojpeg on GCC).
The latter is not used by ScummVM.

Loading

@sluicebox sluicebox deleted the magnum-ci branch Nov 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants