stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
8142 commits 172 branches 41 tags 280 MiB
Commit graph

69 commits

Author SHA1 Message Date
Alam Ed Arias
82cbd953fb Someone wants PNGLCONF_H 2019-12-04 13:42:14 -05:00
Alam Ed Arias
0751f8987a Libs: move pngconf.h out of top level libpng source folder 2019-12-04 10:41:54 -05:00
Alam Ed Arias
19f49b0613 libpng: rebuild 32-bit libpng static lib with GCC 3.4.5 2019-12-02 13:07:12 -05:00
Alam Ed Arias
2fed1274e5 libs: clean up libpng 2019-12-02 12:29:11 -05:00
Steel Titanium
88970f3dac
Update ARM/ARM64 arch of SDL to 2.0.10 2019-10-31 16:27:28 -04:00
Steel Titanium
3dbdbcbe41
Rebuild libpng and zlib using GCC 4.8.1 
Which should resolve those undefined references errors with libpng.
Rebuilt zlib just to be safe.
 2019-10-30 16:10:43 -04:00
Steel Titanium
312b9f76b6 Revert "Merge branch 'revert-eda30fc9' into 'master'" 
This reverts merge request !435
 2019-10-30 10:37:22 +00:00
Steel Titanium
0df7691d30 Revert "Revert "Merge branch 'revert-973ad693' into 'master'"" 
This reverts commit eda30fc995
 2019-10-30 10:09:54 +00:00
Steel Titanium
eda30fc995 Revert "Merge branch 'revert-973ad693' into 'master'" 
This reverts merge request !434
 2019-10-30 09:59:02 +00:00
Steel Titanium
76457663f0 Revert "Merge branch 'update-libs' into 'master'" 
This reverts merge request !433
 2019-10-30 09:07:56 +00:00
Steel Titanium
64e07ac954
Update SDL2 to 2.0.10 2019-10-28 22:48:19 -04:00
Steel Titanium
95a2ef4021
Merge branch 'master' into update-libs 2019-10-27 16:04:56 -04:00
Steel Titanium
cbcb113d8e
Update these files that I forgot to update. 
Better than not updating it at all and having a inconsistency between versions reported from the header and internal lib version.
 2019-10-14 20:41:37 -04:00
Steel Titanium
cf852e7d39
Fix crash if speed is too high 
Also update libopenmpt
 2019-09-27 23:53:19 -04:00
Jaime Passos
a5ff609873 Read user chunks 2019-09-11 20:18:04 -03:00
Steel Titanium
165ade339b
Update libpng and zlib 2019-08-18 13:21:20 -04:00
toaster
384dc0674e Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit 603d5805f7.
 2019-08-04 12:03:57 +01:00
toaster
603d5805f7 Revert "Merge branch 'musicplus-aug2019-b' into 'master'" 
This reverts commit 56bfdb7113, reversing
changes made to c29cfbef9b.
 2019-08-04 11:32:55 +01:00
mazmazz
5b0f7d2850 Merge branch 'master' into musicplus-sdlmixerx 2019-06-29 19:31:01 -04:00
Steel Titanium
58bb05be00 Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt 
# Conflicts:
#	.travis.yml
#	src/m_menu.c
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/sdl/Srb2SDL.props
 2019-06-11 17:48:00 -04: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
Steel Titanium
c8a5597492 Update libopenmpt to 0.4.4 2019-05-23 22:05:28 -04:00
Steel Titanium
91767a7740 Merge branch 'master' into public-musicplus-libopenmpt 2019-05-20 21:33:10 -04: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
mazmazz
2ff946bebc Notes for Ubuntu backporting libopenmpt 2019-01-04 18:43:48 -05:00
mazmazz
c0266e2201 DLL-README update for libopenmpt 2019-01-03 21:19:00 -05:00
Marco Z
6d2ef74b21 Add libopenmpt to VC10 project 2019-01-03 20:28:00 -05:00
mazmazz
d1534257dd Add mingw-compiled libopenmpt 0.4.0 DLLs 2019-01-03 16:07:32 -05:00
mazmazz
7f18433059 Update libopenmpt dev library to 0.4.0 (winold.vs2017) 2019-01-02 02:21:04 -05:00
mazmazz
6166fad045 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 02:14:49 -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
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
mazmazz
6cc6edc137 Changed Mixer X sources to 2.2.0; added x64 gcc support 2018-11-19 20:51:54 -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
mazmazz
4d89beb105 musicplus-libopenmpt 2.2 -> 2.1 backport 2018-09-18 12:31:47 -04:00
mazmazz
80f9e31153 Build notes for SDL Mixer X 2018-09-15 22:20:04 -04:00
mazmazz
76fe4fdb74 Add SDL Mixer X external DLL dependencies 2018-09-15 21:47:03 -04:00
mazmazz
febfa718b4 Compile in modplug (for libopenmpt file detection) 2018-08-31 13:27:02 -04:00
mazmazz
364312cbe3 Revert "Update SDL Windows dependency to 2.0.8" 
This reverts commit 720a1212ae.
 2018-08-31 12:00:33 -04:00