06c2986280 
								
							 
						 
						
							
							
								
								Don't duplicate build files  
							
							 
							
							... 
							
							
							
							Turns out keeping files in place, instead of symlinking or hard linking into
build/ means that Xcode can actually break on files in src/. This is cool!
There's still a problem with Xcode not getting appropriate type information
though. 
							
						 
						
							2014-07-20 12:17:55 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								6214413e3e 
								
							 
						 
						
							
							
								
								NDEBUG *removes* asserts -- whoops  
							
							 
							
							
							
						 
						
							2014-07-19 10:11:51 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								56b79c9cfb 
								
							 
						 
						
							
							
								
								Parse test sconscripts before src -- i should probably push this commit up to base  
							
							 
							
							
							
						 
						
							2014-07-17 20:18:20 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								eb0f93f476 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'base/master' into develop  
							
							 
							
							
							
						 
						
							2014-07-13 09:23:57 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								a0edcab26d 
								
							 
						 
						
							
							
								
								Comment about swapping env and build_env in do_sconscript()  
							
							 
							
							
							
						 
						
							2014-07-13 09:22:53 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								9b00e03b2d 
								
							 
						 
						
							
							
								
								Get rid of broken check for lib dir existence  
							
							 
							
							
							
						 
						
							2014-07-13 09:21:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								882f5614ae 
								
							 
						 
						
							
							
								
								Add build_env (as env) to sconscript environment  
							
							 
							
							
							
						 
						
							2014-07-13 09:12:08 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								2b87d5add6 
								
							 
						 
						
							
							
								
								Use -O3 for production  
							
							 
							
							
							
						 
						
							2014-07-13 09:10:41 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								391251940b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'base/master' into develop  
							
							 
							
							... 
							
							
							
							Conflicts:
	.gitignore
	SConstruct
	src/SConscript
	test/SConscript 
							
						 
						
							2014-07-13 08:24:16 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								a2dea2a35f 
								
							 
						 
						
							
							
								
								Add beta environment -- debug, with optimization  
							
							 
							
							
							
						 
						
							2014-07-13 07:42:00 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								fb0f090892 
								
							 
						 
						
							
							
								
								Add succinct build commands, but don't use 'em yet  
							
							 
							
							
							
						 
						
							2014-07-04 11:09:39 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								fea154a058 
								
							 
						 
						
							
							
								
								So much clean up...  
							
							 
							
							... 
							
							
							
							Brought in the SConscript from Late Fish, which is where a lot of these changes
were made. Cleaned up a bunch of stuff. Moved repeated code to functions.
Implemented dynamically building libraries in lib/. 
							
						 
						
							2014-07-04 10:55:34 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								98e1fdd4fb 
								
							 
						 
						
							
							
								
								Add test environment  
							
							 
							
							
							
						 
						
							2014-02-28 17:40:49 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								eded4652a7 
								
							 
						 
						
							
							
								
								Redo environments, just a bit...  
							
							 
							
							
							
						 
						
							2014-02-28 17:39:41 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								ccde6a29a1 
								
							 
						 
						
							
							
								
								Add color diagnostics for clang  
							
							 
							
							
							
						 
						
							2014-02-27 22:20:29 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								ff1440b6d6 
								
							 
						 
						
							
							
								
								Add "Shared" COMSTR variants  
							
							 
							
							
							
						 
						
							2014-02-27 21:57:20 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								1a37170b9a 
								
							 
						 
						
							
							
								
								Clean up env creation  
							
							 
							
							
							
						 
						
							2014-01-31 08:42:41 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								b40e4b07d9 
								
							 
						 
						
							
							
								
								Clean build directories -- still doesn't clean build/ though  
							
							 
							
							
							
						 
						
							2014-01-31 08:34:11 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								9540bdd26e 
								
							 
						 
						
							
							
								
								Build only the given mode  
							
							 
							
							
							
						 
						
							2014-01-31 08:27:37 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								d4cf547683 
								
							 
						 
						
							
							
								
								Clean up set_toolchain_binary  
							
							 
							
							
							
						 
						
							2014-01-30 21:01:20 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								4ab61d591a 
								
							 
						 
						
							
							
								
								Fix syntax error in set_compiler  
							
							 
							
							
							
						 
						
							2014-01-30 20:47:24 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								0a5db99852 
								
							 
						 
						
							
							
								
								Add linker override  
							
							 
							
							
							
						 
						
							2014-01-30 20:43:09 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								08880e87ac 
								
							 
						 
						
							
							
								
								More tweaks for setting default compilers  
							
							 
							
							
							
						 
						
							2014-01-30 20:39:56 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								c76f986a86 
								
							 
						 
						
							
							
								
								Add definable overrides for C/C++ compilers and the assembler; add override for CFLAGS  
							
							 
							
							
							
						 
						
							2014-01-30 20:36:38 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								60d0112326 
								
							 
						 
						
							
							
								
								Few more tweaks  
							
							 
							
							
							
						 
						
							2014-01-30 15:42:25 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								ab85d0cd32 
								
							 
						 
						
							
							
								
								Fixing up SConstruct  
							
							 
							
							
							
						 
						
							2014-01-30 15:09:28 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								104fe40661 
								
							 
						 
						
							
							
								
								Add base SConstruct  
							
							 
							
							
							
						 
						
							2014-01-30 14:08:11 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								4eafa294ed 
								
							 
						 
						
							
							
								
								Add /usr/local/{lib,include} to SConstruct  
							
							 
							
							
							
						 
						
							2013-09-21 15:34:12 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								8e0a14cc2f 
								
							 
						 
						
							
							
								
								SCons: LIBS is a list  
							
							 
							
							
							
						 
						
							2013-09-20 09:54:08 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								a5fd16e5b3 
								
							 
						 
						
							
							
								
								Build test with gtest, correctly  
							
							 
							
							
							
						 
						
							2013-09-13 11:09:20 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								6be100e28a 
								
							 
						 
						
							
							
								
								Update testing makefile  
							
							 
							
							
							
						 
						
							2013-09-12 15:54:17 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								d9a8920cdf 
								
							 
						 
						
							
							
								
								Add gtest  
							
							 
							
							
							
						 
						
							2013-09-12 15:50:40 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								86a5055d63 
								
							 
						 
						
							
							
								
								Add CXXCOMSTR; add -std= options to CFLAGS and CXXFLAGS  
							
							 
							
							
							
						 
						
							2013-09-09 22:37:44 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								ebc561e415 
								
							 
						 
						
							
							
								
								Modify SConstruct for C++  
							
							 
							
							
							
						 
						
							2013-09-09 21:45:25 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								ebcb67a0cc 
								
							 
						 
						
							
							
								
								Fixing the build system again  
							
							 
							
							
							
						 
						
							2013-09-08 14:53:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								f81e403b16 
								
							 
						 
						
							
							
								
								Revamp build system: build src and test into libs and link to make binaries  
							
							 
							
							
							
						 
						
							2013-09-08 13:57:05 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								926247002b 
								
							 
						 
						
							
							
								
								Add test directory to SCons  
							
							 
							
							
							
						 
						
							2013-09-08 12:21:24 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								d9d27e2d22 
								
							 
						 
						
							
							
								
								CXXFLAGS != CFLAGS  
							
							 
							
							
							
						 
						
							2013-09-08 11:52:53 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								3ea6073655 
								
							 
						 
						
							
							
								
								Create a build dir for object files  
							
							 
							
							
							
						 
						
							2013-09-08 09:12:15 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								b72a9c8718 
								
							 
						 
						
							
							
								
								Link against libpng  
							
							 
							
							
							
						 
						
							2013-09-06 21:59:49 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								495d3802e2 
								
							 
						 
						
							
							
								
								Some code  
							
							 
							
							... 
							
							
							
							- A main()
- A Scene type
- Some functions on Scenes 
							
						 
						
							2013-09-05 21:58:58 -07:00