Haven't ever gotten CMake to compile SRB2, so I'm unable to really check if this works

SteelT authored 4 years ago and James R. committed 4 years ago

(cherry picked from commit 6fcc06bf)

(cherry picked just the libcurl stuff)

Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl

Reason for this is because the SDL2 binaries live in libs/ for ease of copying. The DLLs ought to be in one location.

Should fix libgme depending on two DLLs externally.

It's soooo close to being awesome, but so far away. Making game invitations as the host meant that it would redirect to "connect self" for other people, because we can't get the IP address from the host.

If anyone has a solution, you've got my gratitude; this was going so smoothly until it hit that brick wall.

Conflicts:
	libs/fmodex/lib/libfmodex64_vc.a
	libs/fmodex/lib/libfmodexL64_vc.a
	libs/fmodex/lib/libfmodexL_vc.a
	libs/fmodex/lib/libfmodex_vc.a

wolfs authored 10 years ago and Alam Ed Arias committed 10 years ago

Switch the Linux symbolic links with manual copy-pastes, should fix compiling on Windows for most users.

Switch the Linux symbolic links with manual copy-pastes, should fix compiling on Windows for most users.