Question about CMake and Boost

Get help with programming issues.

Moderator: PPS-Leaders

User avatar
beni
Baron Vladimir Harkonnen
Posts: 949
Joined: Tue Oct 03, 2006 9:15 am
Location: Zurich
Contact:

Post by beni » Sun Jan 18, 2009 10:18 am

Wow, doesn't seem to be that easy. I would have hoped you'd be more successful with this. Either way it's great work. I would really like Orxonox to run on Mac was well :D.
"I'm Commander Shepard and this is my favorite forum on the internet."

User avatar
1337
Baron Vladimir Harkonnen
Posts: 521
Joined: Wed Oct 10, 2007 7:59 am

Post by 1337 » Sun Jan 18, 2009 11:40 am

Yes of course, you can run ci. I've got tons of local changes though, but it should be quite easy to resolve the conflicts.

About the SignalHandler: The code was mistakenly conditioned with #if ORXONOX_PLATFORM != ORXONOX_PLATFORM_WIN32. I have changed that. Try again.
http://www.xkcd.com/
A webcomic of romance, sarcasm, math, and language.

User avatar
superegg
Human Space Navy Major
Posts: 41
Joined: Mon Oct 08, 2007 2:41 pm

Post by superegg » Sun Jan 18, 2009 3:54 pm

Should I at first run "svn ci" or "svn up" ?

If I run up, I will prob override all my changes?
If I run ci, it wont make any change if I just run up after?
Image

User avatar
x3n
Baron Vladimir Harkonnen
Posts: 810
Joined: Mon Oct 30, 2006 5:40 pm
Contact:

Post by x3n » Sun Jan 18, 2009 4:41 pm

svn up will merge your changes. svn ci isn't possible without updating the files first.
but if you're unsure, create a backup before.
Fabian 'x3n' Landau, Orxonox developer

User avatar
1337
Baron Vladimir Harkonnen
Posts: 521
Joined: Wed Oct 10, 2007 7:59 am

Post by 1337 » Sun Jan 18, 2009 4:46 pm

svn up shouldn't be a problem though. The only commit since your svn co was the SignalHandler fix. So you can easily do svn up.
http://www.xkcd.com/
A webcomic of romance, sarcasm, math, and language.

Post Reply

Who is online

Users browsing this forum: No registered users and 1 guest