assimp is now a git submodule!

assimp is now a git submodule!

Discuss the source code and development of Spring Engine in general from a technical point of view. Patches go here too.

Moderator: Moderators

Post Reply
abma
Spring Developer
Posts: 3798
Joined: 01 Jun 2009, 00:08

assimp is now a git submodule!

Post by abma »

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: Select all

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: Select all

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: Select all

rm -rf rts/lib/assimp
and do do the first steps again.
abma
Spring Developer
Posts: 3798
Joined: 01 Jun 2009, 00:08

Re: assimp is now a git submodule!

Post by abma »

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: Select all

rm -rf rts/lib/assimp

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

Aborting
could not detach HEAD
Post Reply

Return to “Engine”