Commit Graph

39 Commits

Author SHA1 Message Date
Sally Coolatta 720eced665 Attempt to improve discord-rpc checking in CMake
Haven't ever gotten CMake to compile SRB2, so I'm unable to really check if this works
2020-08-23 06:45:35 -04:00
Sally Coolatta ed58cb5468 Move the .dll's to libs\dll-binaries 2020-08-23 05:58:09 -04:00
Sally Coolatta 175fa43c90 Update win 32 bit libraries, implement win 64 bit libraries 2020-08-23 05:47:55 -04:00
Sally Coolatta c8fa1dcfb5 Merge remote-tracking branch 'public/next' into discord-rpc-support 2020-08-16 20:57:31 -04:00
wolfs dcfaba2cc6 Merge branch 'http-downloads' into 'awful-mix'
Support for http downloads

See merge request SinnamonLat/Kart-Public!1
2020-04-12 21:38:33 -04:00
Steel Titanium 6fcc06bf72 Support for http downloads 2020-04-07 18:22:29 -04:00
Latapostrophe ff04e0c103 chaos conflict 2019-06-11 17:02:47 +02:00
Alam Ed Arias 83b8a98df4 Merge branch 'gme-msvc' into 'master'
Add GME to MSVC 10 solution

See merge request STJr/SRB2!448
2019-06-07 18:06:51 -04:00
Alam Arias 3d8e25e440 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 11:10:57 -05:00
SeventhSentinel 73542c008c merge srb2 next 2019-01-05 15:59:23 -05:00
Marco Z 882355d24b Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC 2019-01-04 21:18:55 -05:00
Marco Z 88c4a54cea Add GME to VC10 SRB2SDL project 2019-01-04 20:43:42 -05:00
Steel Titanium f73501fd11 Update libgme to 0.6.2 2018-12-30 22:49:11 -05:00
Alam Ed Arias 0ed9665a79 Added static library of SDL2 and SDL2_mixer for ARM systems 2018-12-22 20:48:15 -05:00
Alam Ed Arias 102fd11cb4 More work to cleanup the ARM builds 2018-12-22 19:50:32 -05:00
Alam Arias b6a917cda1 Added ARM/ARM64 to whole vc10 sln
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
2018-12-21 16:47:10 -05:00
TehRealSalt 7ab098636b Edited even more things to say "SRB2Kart" 2018-12-05 20:40:58 -05:00
mazmazz 2b336b9f2f Move DLL binaries from bin/Resources to libs/dll-binaries
Reason for this is because the SDL2 binaries live in libs/ for ease of copying. The DLLs ought to be in one location.
2018-12-04 00:57:28 -05:00
Steel Titanium 243f4eedd8 Statically link stdc++ and libgcc into libgme
Should fix libgme depending on two DLLs externally.
2018-11-18 18:09:34 -05:00
Steel Titanium c5a97dcfe6 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit 2018-11-14 17:28:41 -05:00
Monster Iestyn 8c95ef8a1d Merge branch 'public-sdl2mixer-update' into 'master'
Update SDL Mixer to 2.0.4

See merge request STJr/SRB2!322
2018-11-14 12:58:07 -05:00
mazmazz b4c87d585e Add SDL Mixer 2.0.4 VC package 2018-11-13 22:05:05 -05:00
mazmazz 85fc8a1d47 Add SDL 2.0.9 VC package 2018-11-13 22:02:18 -05:00
Steel Titanium 4836e711d3 Fix up 64-bit MINGW 2018-11-13 20:32:18 -05:00
mazmazz 2e39e5ffdd Update SDL Mixer to 2.0.4; remove unnecessary extra lib and include folders 2018-11-13 16:43:16 -05:00
mazmazz ba821056ce Update SDL2 to 2.0.9; remove unnecessary extra lib and include folders 2018-11-13 16:40:43 -05:00
TehRealSalt 4e549532ee Half-done Discord Rich Presence support
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.
2018-10-22 00:34:45 -04:00
Alam Ed Arias 365879d06f libs: Updated SDL2-Mixer to 2.0.2 2017-10-28 18:03:18 -04:00
Alam Ed Arias e1492ae3f0 libs: EOL fun of SDL2 2017-10-28 17:53:15 -04:00
Alam Ed Arias b7d0896c83 libs: updated SDL2 to 2.0.7 2017-10-28 17:50:36 -04:00
Alam Ed Arias b96b999c1e MSVC: Move x86/x64 settings into commons props 2016-05-22 21:55:55 -04:00
Alam Ed Arias 3567555598 MSVC: cleanup and enable SDLCheck 2016-05-22 01:04:21 -04:00
Alam Ed Arias 57091261d9 MSVC: fixed up MSVC project 2016-05-21 23:53:04 -04:00
Alam Ed Arias f3d0ecbe9d gitattributes: do not check whitespace for included libs 2016-05-18 10:38:29 -04:00
Alam Ed Arias b566036661 libs: include SDL2 and SDL2_mixer 2016-05-18 01:53:35 -04:00
Alam Ed Arias 5aa48cf7ca fixed up old VS 2010 project to work with VS 2015, tested with FMOD/DirectX 2016-05-18 01:35:35 -04:00
Alam Ed Arias c59cb553e4 DIE, DIE, DIE 2014-07-21 20:39:31 -04:00
wolfy852 43da4de52f Switch the Linux symbolic links with manual copy-pastes, should fix compiling on Windows for most users. 2014-07-17 20:26:06 -04:00
Alam Ed Arias b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00