View topic - assimp is now a git submodule!



All times are UTC + 1 hour


Post new topic Reply to topic  [ 2 posts ] 
Author Message
PostPosted: 08 Jul 2011, 19:39 
Spring Developer

Joined: 31 May 2009, 23:08
i updated assimp and moved assimp into a git submodule. this should allow easier updates of it in future.

this will force some self-compilers to run:

Code:
git pull --rebase
git submodule init
git submodule sync
git submodule update


the changes made in assimp for spring are at github: https://github.com/spring/assimp/

if you get this error:

Code:
git pull --rebase
Updating 77424f1..c28b8df
error: Updating the following directories would lose untracked files in it:
   rts/lib/assimp

Aborting


you have to remove the directory:
Code:
rm -rf rts/lib/assimp


and do do the first steps again.


Top
 Offline Profile  
 
PostPosted: 11 Jul 2011, 21:05 
Spring Developer

Joined: 31 May 2009, 23:08
now it isn't... sorry for the trouble! (see minutes + https://github.com/spring/spring/commit ... f#comments for details)

maybe you've to do a

Code:
rm -rf rts/lib/assimp



if you get something like this when doing a "git pull --rebase"

Aborting
could not detach HEAD


Top
 Offline Profile  
 
Display posts from previous:  Sort by  
Post new topic Reply to topic  [ 2 posts ] 

All times are UTC + 1 hour


Who is online

Users browsing this forum: Google Feedfetcher and 0 guests


You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot post attachments in this forum

Search for:
Jump to:  
Powered by phpBB® Forum Software © phpBB Group

Site layout created by Roflcopter et al.