diff --git a/changes.txt b/changes.txt index bed9f929..2f5840a4 100644 --- a/changes.txt +++ b/changes.txt @@ -1,5 +1,7 @@ Changes in 1.8 (??.??.2011) + - The Makefile now creates a symlink from the soname to the binary name during install. Binary compatibility is only confirmed between minor releases, so the only useful symlink is from libIrrlicht.so.1.8 to libIrrlicht.so.1.8.0; others should rightly fail. + - Added SMF mesh loader, loads meshes from 3D World Studio. Originally written by Joseph Ellis - The loader selection process now consistently checks loader lists in reverse order, so new loaders added to Irrlicht override the internal ones. This applies when adding external mesh, image, scene and archive loaders, image writers, plus node, animator and GUI element factories. @@ -884,6 +886,7 @@ Changes in 1.6 (23.09.2009) wrong size of Matrices copy. renamed E_TRANSFORMATION_STATE_2 to E_TRANSFORMATION_STATE_FRUSTUM therefore also changed SViewFrustum::setTransformState to not tap + in the pitfall again of wrong memory... - moved diff --git a/source/Irrlicht/CAnimatedMeshHalfLife.cpp b/source/Irrlicht/CAnimatedMeshHalfLife.cpp index 0b81b3ac..826ec653 100644 --- a/source/Irrlicht/CAnimatedMeshHalfLife.cpp +++ b/source/Irrlicht/CAnimatedMeshHalfLife.cpp @@ -869,8 +869,6 @@ void STextureAtlas::getScale(core::vector2df& scale) */ void STextureAtlas::getTranslation ( const c8 * name, core::vector2di &pos ) { - u32 i = 0; - for ( u32 i = 0; i < atlas.size(); ++i) { if ( atlas[i].name == name ) diff --git a/source/Irrlicht/CSceneLoaderIrr.cpp b/source/Irrlicht/CSceneLoaderIrr.cpp index 717b4620..4a27947c 100644 --- a/source/Irrlicht/CSceneLoaderIrr.cpp +++ b/source/Irrlicht/CSceneLoaderIrr.cpp @@ -221,8 +221,8 @@ void CSceneLoaderIrr::readAnimators(io::IXMLReader* reader, ISceneNode* node) ISceneNodeAnimator* anim = 0; // todo: need a method to add animator by name in the scene manager. This loader and others like it - // have no business messing with the animator factories! - for (s32 i=SceneManager->getRegisteredSceneNodeAnimatorFactoryCount(); i >=0 && !anim; --i) + // have no business messing with the animator factories! + for (s32 i=SceneManager->getRegisteredSceneNodeAnimatorFactoryCount()-1; i >=0 && !anim; --i) anim = SceneManager->getSceneNodeAnimatorFactory(i)->createSceneNodeAnimator(typeName.c_str(), node); if (anim) diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile index d5fc9190..4bbf9100 100644 --- a/source/Irrlicht/Makefile +++ b/source/Irrlicht/Makefile @@ -2,6 +2,7 @@ VERSION_MAJOR = 1 VERSION_MINOR = 8 VERSION_RELEASE = 0-SVN VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) +COMPATIBILITY_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR) # Irrlicht Engine 1.7.0-SVN # Makefile for Linux # @@ -132,7 +133,7 @@ staticlib_win32: $(STATIC_LIB) # Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/MacOSX sharedlib_osx: $(LINKOBJ) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -dynamiclib -Wl,-install_name,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -dynamiclib -Wl,-install_name,$(SHARED_LIB).$(COMPATIBILITY_VERSION) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) cp $(SHARED_LIB).$(VERSION) $(LIB_PATH) # Installs Irrlicht if it was created as shared lib @@ -141,7 +142,8 @@ install install_osx: mkdir -p $(INSTALL_DIR)/../include/irrlicht cp ../../include/*.h $(INSTALL_DIR)/../include/irrlicht/ cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR) - cd $(INSTALL_DIR) && ln -s -f $(SHARED_LIB).$(VERSION) $(SHARED_LIB) + cd $(INSTALL_DIR) && ln -s -f $(SHARED_LIB).$(VERSION) $(COMPATIBILITY_VERSION) + # ldconfig -n $(INSTALL_DIR) TAGS: