Hi Robert, Thanks for merging them. I'll test it as soon as possible.
Regarding Lua + Android, I now remember a problem building the lua plugin, I'll check it again and see if I can fix it. Cheers, Rafa 2014-11-21 11:40 GMT+01:00 Robert Osfield <[email protected]>: > Hi Rafa, > > Many thanks for the changes, looks much cleaner. I have checked the > changes into svn/trunk. > > I have merged the changes except the disabling of the lua plugin for > Android, and the addition of #defines to Texture.cpp. > > I'd like to get to the root of why this was required, as the lua plugin > now has it's own local sources it should be default be possible to build it > without problems under Android. The #define's in Texture.cpp shouldn't be > required as I checked in similar additions to the include/osg/Texture > yesterday. > > Could you do a checkout of svn/trunk and let me know how you get on. > > Cheers, > Robert. > > Robert. > > On 13 November 2014 07:45, Rafa Gaitan <[email protected]> wrote: > >> Hi Robert, >> >> I finally had some time to change the build system for Android using a >> Toolchain, which, I think, will be easier to maintain and uses cmake >> standard system to build it. >> >> My changes: >> ------------------- >> - I changed the cmake files and added a toolchain for building OSG in >> Android. The toolchain is based on the one used at OpenCV. For building OSG >> for android you just need to do: >> >> mkdir build_android_static_gles2 && cd build_android_static_gles2 >> cmake .. -DANDROID_NDK=<path-to-the-android-ndk> >> >> -DCMAKE_TOOLCHAIN_FILE=../PlatformSpecifics/Android/android.toolchain.cmake >> >> -DOPENGL_PROFILE="GLES2" >> -DDYNAMIC_OPENTHREADS=OFF >> -DDYNAMIC_OPENSCENEGRAPH=OFF >> -DANDROID_NATIVE_API_LEVEL=15 # optional >> -DANDROID_ABI=armeabim #optional >> -DCMAKE_INSTALL_PREFIX=<path-to-the-install-path> >> #optional >> make -j 8 >> make install >> >> The OPENGL_PROFILE works as expected, changing it to "GLES1" it >> builds and links OSG using GLES1. >> The DYNAMIC_OPENTHREADS/DYNAMIC_OPENSCENEGRAPH parameters also allows >> to build the dynamic libraries >> >> - I also added some build fixes for android related to the texture >> formats and added some missing USE_OSG_SERIALIZER_WRAPPER in the osg >> serializer library to support loading osgb files in static. >> ----------- >> >> I haven't updated the android examples yet, I've been using osgAndroid >> library which I'm also adding support to GLES2 to test it. I will send the >> modified examples as soon as possible. >> >> I hope everyone finds this useful! >> >> Regards, >> Rafa. >> >> -- >> Rafael Gaitán Linares >> CTO at Mirage Technologies S.L - http://www.mirage-tech.com >> >> _______________________________________________ >> osg-submissions mailing list >> [email protected] >> >> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >> >> > > _______________________________________________ > osg-submissions mailing list > [email protected] > > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > > -- Rafael Gaitán Linares CTO at Mirage Technologies S.L - http://www.mirage-tech.com
_______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
