14 commits

Author	SHA1	Message	Date
Sally Coolatta	63917ffccc	The start of the scary 2.2 merge ... All conflicts are left in-tact. We should be collaborating on solving these files one at a time.	2020-05-29 13:43:38 -04:00
Alam Ed Arias	ed33758b5f	Fix building libpng and zlib with MSVC	2019-12-05 12:33:18 -05:00
Steel Titanium	1f60836eb3	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	77e1c7090f	Revert "Merge branch 'revert-34a41977' into 'master'" ... This reverts merge request !435	2019-10-30 10:37:22 +00:00
Steel Titanium	bdf425adab	Revert "Revert "Merge branch 'revert-55b91940' into 'master'"" ... This reverts commit 34a4197716	2019-10-30 10:09:54 +00:00
Steel Titanium	34a4197716	Revert "Merge branch 'revert-55b91940' into 'master'" ... This reverts merge request !434	2019-10-30 09:59:02 +00:00
Steel Titanium	2cfa7b307d	Revert "Merge branch 'update-libs' into 'master'" ... This reverts merge request !433	2019-10-30 09:07:56 +00:00
Steel Titanium	5fa4954c02	Update libpng and zlib	2019-08-18 13:21:20 -04:00
Alam Ed Arias	7b2a7190dd	Added static library of SDL2 and SDL2_mixer for ARM systems	2018-12-22 20:48:15 -05:00
Alam Ed Arias	e6cf509a84	More work to cleanup the ARM builds	2018-12-22 19:50:32 -05:00
Alam Arias	5765b3e034	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
Alam Ed Arias	57091261d9	MSVC: fixed up MSVC project	2016-05-21 23:53:04 -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	b93cb1b65a	SRB2 2.1 release	2014-03-15 13:11:35 -04:00