merged 1.3 r1009:1010 into 1.4 and trunk

CMakeLists.txt

@@ -44,7 +44,7 @@ set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
 
 # for unix, put debug files in a separate bin "debug" dir.
 # release bin files should stay in the root of the bin dir.
-if (UNIX)
+if (CMAKE_GENERATOR STREQUAL "Unix Makefiles")
   if (CMAKE_BUILD_TYPE STREQUAL Debug)
     set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin/debug)
     set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib/debug)

src/lib/platform/COSXScreen.cpp

@@ -1546,7 +1546,7 @@ COSXScreen::handlePowerChangeRequest(natural_t messageType, void* messageArg)
 CEvent::Type
 COSXScreen::getConfirmSleepEvent()
 {
-	return CEvent::registerTypeOnce(s_confirmSleepEvent,
+	return EVENTQUEUE->registerTypeOnce(s_confirmSleepEvent,
 									"COSXScreen::confirmSleep");
 }
 

tools/build/toolchain.py

@@ -162,8 +162,8 @@ class InternalCommands:
 			print 'Defaulting target to: ' + self.defaultTarget
 			target = self.defaultTarget
 
-		# for non-vs always specify a build type (debug, release, etc)
-		if not generator.cmakeName.startswith('Visual Studio'):
+		# for makefiles always specify a build type (debug, release, etc)
+		if generator.cmakeName.find('Unix Makefiles') != -1:
 			cmake_args += ' -DCMAKE_BUILD_TYPE=' + target.capitalize()
 		
 		# if not visual studio, use parent dir
@@ -296,11 +296,10 @@ class InternalCommands:
 					cmd = self.make_cmd
 				elif generator == 'Xcode':
 					print 'Building with Xcode...'
-				cmd = self.xcodebuild_cmd
+					cmd = self.xcodebuild_cmd + ' -configuration ' + target.capitalize()
 				else:
 					raise Exception('Build command not supported with generator: ' + generator)
 				
-			for target in targets:
 				self.try_chdir(self.getBuildDir(target))
 				err = os.system(cmd)
 				self.restore_chdir()