rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merged 1.3 r1009:1010 into 1.4 and trunk

This commit is contained in:
Nick Bolton 2011-05-21 02:47:10 +00:00
parent 5a315324ca
commit b4918163a7
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

2
src/lib/platform/COSXScreen.cpp
View File

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

25
tools/build/toolchain.py
View File

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