-- Merging in Jaedyn's updates from p4.
-- Added more awful branching in the gcc toolchain to support OSX/iOS.
-- Fixed up another missed instance of the obj path generation.