search

Interrupt / systemshock

Shockolate - A minimalist and cross platform System Shock source port.
GNU General Public License v3.0
806 stars 65 forks source link

Use SDL2_mixer 2.0.2 with backport #244

Closed Manuel-K closed 5 years ago

Manuel-K commented 5 years ago

Apply patch to fix voc magic

This should fix #243, but it might not, as it is untested.

mrikola commented 5 years ago

If this is taken into use, it should IMO also be used for local and AppVeyor builds.

Manuel-K commented 5 years ago

I'm not sure if the AppVeyor is testing any of the changes. It seems to use a cached version of SDL2_mixer.

mrikola commented 5 years ago

Oh yeah. Crap. This happened before when we needed to add GLEW to the Windows build. Basically our current process for updating cached dependencies on AppVeyor is: 1) Create a PR with caching turned off in appveyor.yml to confirm that the non-cached version builds correctly 2) Merge it, and have @Interrupt clear the cache afterwards so it will reset 3) Push a commit to master with caching turned back on

Manuel-K commented 5 years ago

Oh what fun. tar does not work correctly because the archive contains symlinks.

mrikola commented 5 years ago

Would using the zipped source help here?

Manuel-K commented 5 years ago

Possibly.

Manuel-K commented 5 years ago

Do we have unzip on AppVeyor?

mrikola commented 5 years ago

Yeah, 7z is available. It's what used to create the distributable zip file.

Manuel-K commented 5 years ago

Not extracting the Xcode directory fixes the AppVeyor build.

Interrupt commented 5 years ago

This seems ready to go now, checks are passing. Do we want to merge it in now?

Manuel-K commented 5 years ago

I've just booted into Windows. The AppVeyor artifact has digital sounds.

Manuel-K commented 5 years ago

Now we need to clear the AppVeyor cache and re-enable caching.

@Interrupt, as you are the only person that can do the first part, the “we” is technically a “you”. ;-)