James R 
								
							 
						 
						
							
							
							
							
								
							
							
								6efedfc756 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into cmake-adjustments  
							
							
							
						 
						
							2020-07-12 16:24:24 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									James R 
								
							 
						 
						
							
							
							
							
								
							
							
								d92afe87a0 
								
							 
						 
						
							
							
								
								Automate VERSION/SUBVERSION; move version related definitions to version.h  
							
							... 
							
							
							
							CMake support. Srb2win.rc still needs touchy, whatever. 
							
						 
						
							2020-07-10 22:20:33 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								b53e6e834d 
								
							 
						 
						
							
							
								
								Update version number  
							
							
							
						 
						
							2020-07-10 17:29:03 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								d53d65b798 
								
							 
						 
						
							
							
								
								Update the version number  
							
							
							
						 
						
							2020-07-06 21:29:02 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								c6c83830e9 
								
							 
						 
						
							
							
								
								CMAKE: Add CCACHE support  
							
							
							
						 
						
							2020-06-08 00:35:31 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								96124286e6 
								
							 
						 
						
							
							
								
								CMAKE: Configurable CPACK generator  
							
							
							
						 
						
							2020-06-08 00:01:15 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								502de28d38 
								
							 
						 
						
							
							
								
								CMAKE improvements: optional asset install; exe.debug for RelWithDebInfo  
							
							
							
						 
						
							2020-06-08 00:01:15 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									James R 
								
							 
						 
						
							
							
							
							
								
							
							
								ffd88746da 
								
							 
						 
						
							
							
								
								Update version names, SUBVERSION, MODVERSION  
							
							
							
						 
						
							2020-05-11 14:41:36 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Monster Iestyn 
								
							 
						 
						
							
							
							
							
								
							
							
								f218920395 
								
							 
						 
						
							
							
								
								Update version number to 2.2.3 in all the usual files, also updated MODVERSION  
							
							
							
						 
						
							2020-05-10 16:02:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								c7778af7d6 
								
							 
						 
						
							
							
								
								Update version number to 2.2.2  
							
							
							
						 
						
							2020-02-22 16:37:13 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Monster Iestyn 
								
							 
						 
						
							
							
							
							
								
							
							
								0a4a879b96 
								
							 
						 
						
							
							
								
								Updated version number to 2.2.1, increment MODVERSION.  
							
							... 
							
							
							
							Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual 
							
						 
						
							2020-02-05 19:55:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eidolon 
								
							 
						 
						
							
							
							
							
								
							
							
								35d262e853 
								
							 
						 
						
							
							
								
								[cmake] Remove srb2dd target  
							
							
							
						 
						
							2019-12-15 00:47:58 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									James R 
								
							 
						 
						
							
							
							
							
								
							
							
								dbf83f90c5 
								
							 
						 
						
							
							
								
								Make the cmake version 2.2.0  
							
							
							
						 
						
							2019-12-07 14:28:03 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Monster Iestyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a20079e410 
								
							 
						 
						
							
							
								
								Update version to 2.1.25  
							
							
							
						 
						
							2019-08-16 20:14:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Monster Iestyn 
								
							 
						 
						
							
							
							
							
								
							
							
								c21b9e632a 
								
							 
						 
						
							
							
								
								Merge branch 'next' into 2.1.24-prep  
							
							... 
							
							
							
							# Conflicts:
#	debian-template/control
#	debian/changelog 
							
						 
						
							2019-06-07 23:18:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								8d5207975d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into travis-deployer  
							
							... 
							
							
							
							# Conflicts:
#	.travis.yml 
							
						 
						
							2019-06-07 16:56:19 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Monster Iestyn 
								
							 
						 
						
							
							
							
							
								
							
							
								474b70aa69 
								
							 
						 
						
							
							
								
								Update version to 2.1.24  
							
							
							
						 
						
							2019-06-07 15:48:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								94e29d1bb4 
								
							 
						 
						
							
							
								
								CMake: have funny check for empty CMAKE_SIZEOF_VOID_P  
							
							
							
						 
						
							2019-03-19 09:10:25 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								727d9cae23 
								
							 
						 
						
							
							
								
								CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac?  
							
							
							
						 
						
							2019-03-19 00:04:14 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								4cb71746a7 
								
							 
						 
						
							
							
								
								Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check"  
							
							... 
							
							
							
							This reverts commit 7d14342a8f 
							
						 
						
							2019-03-18 23:58:31 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								7d14342a8f 
								
							 
						 
						
							
							
								
								Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check  
							
							
							
						 
						
							2019-03-18 16:50:17 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								6e2d757219 
								
							 
						 
						
							
							
								
								Implement deployer scripts for Travis -- OSX and Linux package building  
							
							
							
						 
						
							2018-12-30 15:22:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								7deac7e603 
								
							 
						 
						
							
							
								
								Update code versions to 2.1.23  
							
							
							
						 
						
							2018-12-26 16:31:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								8a6031ba01 
								
							 
						 
						
							
							
								
								Update code versions to 2.1.22  
							
							
							
						 
						
							2018-12-20 02:35:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Monster Iestyn 
								
							 
						 
						
							
							
							
							
								
							
							
								b32f5830ed 
								
							 
						 
						
							
							
								
								Merge branch 'next' into 21-version  
							
							
							
						 
						
							2018-12-04 17:19:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steel Titanium 
								
							 
						 
						
							
							
							
							
								
							
							
								2797b1e428 
								
							 
						 
						
							
							
								
								Make this be consistent with non-CMake builds  
							
							
							
						 
						
							2018-12-03 15:42:37 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mazmazz 
								
							 
						 
						
							
							
							
							
								
							
							
								8c845510a4 
								
							 
						 
						
							
							
								
								Update version to 2.1.21  
							
							
							
						 
						
							2018-11-23 06:58:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Monster Iestyn 
								
							 
						 
						
							
							
							
							
								
							
							
								7cb0138293 
								
							 
						 
						
							
							
								
								Change version number to 2.1.20  
							
							
							
						 
						
							2017-11-08 15:06:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								877e9510f7 
								
							 
						 
						
							
							
								
								Update version number to v2.1.19  
							
							
							
						 
						
							2017-05-26 21:38:49 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Monster Iestyn 
								
							 
						 
						
							
							
							
							
								
							
							
								b8ffeeb59f 
								
							 
						 
						
							
							
								
								Update version number to v2.1.18  
							
							... 
							
							
							
							Don't worry, I remembered to update MODVERSION as well this time :) 
							
						 
						
							2017-05-12 16:06:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Monster Iestyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e59fb38802 
								
							 
						 
						
							
							
								
								Update version number  
							
							
							
						 
						
							2017-01-15 18:49:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								b3b5521e1b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into next  
							
							
							
						 
						
							2016-02-25 18:33:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								8a369d969b 
								
							 
						 
						
							
							
								
								whitespace clean  
							
							
							
						 
						
							2016-02-25 18:31:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								6000b5c980 
								
							 
						 
						
							
							
								
								Merge branch 'master' into next  
							
							
							
						 
						
							2016-02-09 14:13:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yukita Mayako 
								
							 
						 
						
							
							
							
							
								
							
							
								914c6c9d98 
								
							 
						 
						
							
							
								
								Whitespace cleanup.  
							
							
							
						 
						
							2016-02-07 21:45:16 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alam Ed Arias 
								
							 
						 
						
							
							
							
							
								
							
							
								07fc74eaf5 
								
							 
						 
						
							
							
								
								clang: fixup a few clang warnings  
							
							
							
						 
						
							2016-02-05 22:38:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Inuyasha 
								
							 
						 
						
							
							
							
							
								
							
							
								420a27ce11 
								
							 
						 
						
							
							
								
								Attempt to play nice to cmake.  
							
							
							
						 
						
							2016-01-14 07:46:28 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								53680903e5 
								
							 
						 
						
							
							
								
								Fix compilation and debugging on Windows.  
							
							... 
							
							
							
							Core code has too many #define dependencies on interface-specific
defines. This means that it's currently not possible to safely
separate the core and interface code into different contexts. The
core code should be refactored to accomadate for this because we
should not have any interface-specific code in core in the first
place.
This reverts the static library SRB2Core from a7135094 
							
						 
						
							2015-03-24 19:32:58 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								2f52a5d34f 
								
							 
						 
						
							
							
								
								Added a fatal error message when attempting an in-source build.  
							
							... 
							
							
							
							In-source builds are pain and suffering and I am going to stop people
from doing them to save them that pain. 
							
						 
						
							2015-03-08 18:47:26 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								3d5d61ee87 
								
							 
						 
						
							
							
								
								Remove MSVC netplay warning.  
							
							
							
						 
						
							2015-03-04 20:37:37 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								f28b050c07 
								
							 
						 
						
							
							
								
								Append current branch name to comp version string.  
							
							
							
						 
						
							2015-03-04 20:15:57 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								e223084982 
								
							 
						 
						
							
							
								
								Use bin output directory.  
							
							
							
						 
						
							2015-03-04 20:07:51 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								e08bd45227 
								
							 
						 
						
							
							
								
								cmake: Separate debug symbols on gcc  
							
							... 
							
							
							
							Only when actually making the debug target though! 
							
						 
						
							2015-02-01 22:14:52 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								ec79756c42 
								
							 
						 
						
							
							
								
								cmake: copy DLLs to build directory in MSVC  
							
							... 
							
							
							
							this is done as a POST_BUILD step 
							
						 
						
							2015-01-31 22:40:36 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								70f046a320 
								
							 
						 
						
							
							
								
								cmake: on mac, check Resources in bundle first.  
							
							... 
							
							
							
							on non debug, check assets folder in src as well 
							
						 
						
							2015-01-28 23:38:40 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								68f8a5b0f9 
								
							 
						 
						
							
							
								
								cmake: build bundle and dmg on install/package  
							
							
							
						 
						
							2015-01-28 19:29:16 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								0909fce2e3 
								
							 
						 
						
							
							
								
								cmake: Configure source via cmake  
							
							... 
							
							
							
							silently fixing a bad malloc here too shhhhhhhhh 
							
						 
						
							2015-01-28 18:03:41 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								53799eb390 
								
							 
						 
						
							
							
								
								cmake: Add CPack Package Generation  
							
							... 
							
							
							
							Generates zips only at the moment 
							
						 
						
							2015-01-28 16:42:05 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								2f1367aab6 
								
							 
						 
						
							
							
								
								cmake: Fixes to allow MSVC to compile  
							
							... 
							
							
							
							running is another story 
							
						 
						
							2015-01-28 02:09:03 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ronald Kinard 
								
							 
						 
						
							
							
							
							
								
							
							
								479ebc3f94 
								
							 
						 
						
							
							
								
								Add Xcode target support  
							
							... 
							
							
							
							It is really messy at the moment. There is no support for copying the
necessary frameworks and dylibs out to the bundle for distribution, and
it is a frankenstein of manual find_library and find_package which can
sometimes pick up Homebrew dylibs. 
							
						 
						
							2015-01-28 00:58:30 -06:00