Android fixes

[cadaver]

Fixes Android build issues.

• Check out a fixed Ogre 1.9 version (november 2012) as newer ones do not work with Android-Tundra
• Added missing Ogre RTShader files
• CMake fixes to finding and linking Boost on Android
• Plus misc. minor fixes from StinkFist.

[peterclemenko]

In my opinion if the newer ones don't work, that needs to be fixed.

cadaver notifications@github.com wrote:

Fixes Android build issues.

• Check out a fixed Ogre 1.9 version (november 2012) as newer ones do
  not work with Android-Tundra
• Added missing Ogre RTShader files
• CMake fixes to finding and linking Boost on Android
• Plus misc. minor fixes from StinkFist.

You can merge this Pull Request by running:

git pull https://github.com/LudoCraft/Tundra androidfixes

Or you can view, comment on it, or merge it online at:

#618

-- Commit Summary --

• Fix code copy-paste bug causing wrong global math function to be
  exposed to QtScript.
  • Remove ancient and unused PythonQt-QtScript proto scripts.
  • Remove deprecated/out-of-date dia files.
  • Fix duplicate console print in ConsoleAPI::Print.
  • Remove legacy OpenSim avatar files...
• Remove unnecessary CmpEntityById in ECEditorWindow.cpp as
  Entity's operator < already does this.
• Fix error and warning on freelookcamera.js's OnScriptDestroyed
  when script run in headless mode.
  • Added missing RTShaderLib for Android.
  • Checkout a fixed Ogre revision for Android build
  • Revert back to default x86 ABI.
  • Make sure pthread library is not attempted to be linked on Android.
• Don't look up system boost libraries on Android, since we are
  cross-compiling.
  • Removed outdated information from Android build instructions.
• Merge remote-tracking branch 'remotes/naali/tundra2' into
  tundra2_lc

-- File Changes --

M android/Build-instructions.txt (2)
M android/BuildAndroidDeps.bash (2)
M bin/jsmodules/camera/freelookcamera.js (19)
A bin/media/RTShaderLib/FFPLib_Common.cg (248)
A bin/media/RTShaderLib/FFPLib_Common.glsl (248)
A bin/media/RTShaderLib/FFPLib_Common.glsles (231)
A bin/media/RTShaderLib/FFPLib_Common.hlsl (219)
A bin/media/RTShaderLib/FFPLib_Fog.cg (150)
A bin/media/RTShaderLib/FFPLib_Fog.glsl (152)
A bin/media/RTShaderLib/FFPLib_Fog.glsles (153)
A bin/media/RTShaderLib/FFPLib_Fog.hlsl (150)
A bin/media/RTShaderLib/FFPLib_Lighting.cg (225)
A bin/media/RTShaderLib/FFPLib_Lighting.glsl (226)
A bin/media/RTShaderLib/FFPLib_Lighting.glsles (227)
A bin/media/RTShaderLib/FFPLib_Lighting.hlsl (225)
A bin/media/RTShaderLib/FFPLib_Texturing.cg (319)
A bin/media/RTShaderLib/FFPLib_Texturing.glsl (334)
A bin/media/RTShaderLib/FFPLib_Texturing.glsles (355)
A bin/media/RTShaderLib/FFPLib_Texturing.hlsl (319)
A bin/media/RTShaderLib/FFPLib_Transform.cg (78)
A bin/media/RTShaderLib/FFPLib_Transform.glsl (71)
A bin/media/RTShaderLib/FFPLib_Transform.glsles (65)
A bin/media/RTShaderLib/FFPLib_Transform.hlsl (71)
A bin/media/RTShaderLib/SGXLib_DualQuaternion.cg (130)
A bin/media/RTShaderLib/SGXLib_DualQuaternion.glsl (132)
A bin/media/RTShaderLib/SGXLib_IntegratedPSSM.cg (81)
A bin/media/RTShaderLib/SGXLib_IntegratedPSSM.glsl (107)
A bin/media/RTShaderLib/SGXLib_IntegratedPSSM.glsles (112)
A bin/media/RTShaderLib/SGXLib_IntegratedPSSM.hlsl (81)
A bin/media/RTShaderLib/SGXLib_LayeredBlending.cg (728)
A bin/media/RTShaderLib/SGXLib_LayeredBlending.glsl (825)
A bin/media/RTShaderLib/SGXLib_LayeredBlending.glsles (889)
A bin/media/RTShaderLib/SGXLib_LayeredBlending.hlsl (730)
A bin/media/RTShaderLib/SGXLib_NormalMapLighting.cg (257)
A bin/media/RTShaderLib/SGXLib_NormalMapLighting.glsl (269)
A bin/media/RTShaderLib/SGXLib_NormalMapLighting.glsles (264)
A bin/media/RTShaderLib/SGXLib_NormalMapLighting.hlsl (257)
A bin/media/RTShaderLib/SGXLib_PerPixelLighting.cg (226)
A bin/media/RTShaderLib/SGXLib_PerPixelLighting.glsl (228)
A bin/media/RTShaderLib/SGXLib_PerPixelLighting.glsles (223)
A bin/media/RTShaderLib/SGXLib_PerPixelLighting.hlsl (226)
A bin/media/RTShaderLib/SGXLib_TextureAtlas.cg (122)
A bin/media/RTShaderLib/SGXLib_TextureAtlas.glsl (124)
A bin/media/RTShaderLib/SGXLib_TextureAtlas.glsles (122)
A bin/media/RTShaderLib/SGXLib_TextureAtlas.hlsl (122)
A bin/media/RTShaderLib/SGXLib_TriplanarTexturing.cg (45)
A bin/media/RTShaderLib/SGXLib_TriplanarTexturing.glsl (47)
A bin/media/RTShaderLib/SGXLib_TriplanarTexturing.glsles (47)
A bin/media/RTShaderLib/SGXLib_TriplanarTexturing.hlsl (45)
A bin/media/RTShaderLib/SampleLib_InstancedViewports.cg (76)
A bin/media/RTShaderLib/SampleLib_InstancedViewports.glsl (93)
A bin/media/RTShaderLib/SampleLib_InstancedViewports.hlsl (76)
A bin/media/RTShaderLib/SampleLib_ReflectionMap.cg (62)
A bin/media/RTShaderLib/SampleLib_ReflectionMap.glsl (65)
A bin/media/RTShaderLib/SampleLib_ReflectionMap.glsles (67)
A bin/media/RTShaderLib/SampleLib_ReflectionMap.hlsl (62)
A bin/media/RTShaderLib/SegmentedPerPixelLighting.cg (185)
A bin/media/RTShaderLib/cache/dummy.txt (1)
A bin/media/RTShaderLib/materials/DualQuaternionSkinning_Shadow.cg
(292)
A
bin/media/RTShaderLib/materials/DualQuaternionSkinning_Shadow.material
(384)
A
bin/media/RTShaderLib/materials/DualQuaternionSkinning_ShadowFourWeights.glsl
(29)
A
bin/media/RTShaderLib/materials/DualQuaternionSkinning_ShadowOneWeight.glsl
(28)
A
bin/media/RTShaderLib/materials/DualQuaternionSkinning_ShadowPassThrough_ps.glsl
(9)
A
bin/media/RTShaderLib/materials/DualQuaternionSkinning_ShadowPassThrough_vs.glsl
(15)
A
bin/media/RTShaderLib/materials/DualQuaternionSkinning_ShadowThreeWeights.glsl
(29)
A
bin/media/RTShaderLib/materials/DualQuaternionSkinning_ShadowTwoWeights.glsl
(29)
A bin/media/RTShaderLib/materials/HardwareSkinningShadow.cg (111)
A bin/media/RTShaderLib/materials/HardwareSkinningShadow.material (265)
A bin/media/RTShaderLib/materials/HardwareSkinningShadow_Fragment.glsl
(6)
A
bin/media/RTShaderLib/materials/HardwareSkinningShadow_TwoWeights.glsl
(18)
A bin/media/RTShaderLib/materials/RTShaderSystem.material (221)
A bin/media/RTShaderLib/materials/TriplanarTexturing.material (17)
D bin/media/materials/scripts/avatar.material (36)
D bin/media/models/avatar.mesh (0)
D bin/media/models/avatar.skeleton (0)
M cmake/ConfigurePackages.cmake (10)
D doc/dia/NaaliDependencies.dia (0)
D doc/dia/NaaliStructure.dia (0)
D doc/dia/OpenALAudioModule.dia (0)
M src/Application/JavascriptModule/ScriptMetaTypeDefines.cpp (3)
D src/Application/JavascriptModule/proto/customcam.py (123)
D src/Application/JavascriptModule/proto/customcam_activeentity.py
(118)
D src/Application/JavascriptModule/proto/customdialog.py (69)
D src/Application/JavascriptModule/proto/dialog.ui (165)
D src/Application/JavascriptModule/proto/qtscript_test.py (87)
M src/Core/ECEditorModule/ECEditorWindow.cpp (26)
M src/Core/TundraCore/Console/ConsoleAPI.cpp (19)

-- Patch Links --

https://github.com/realXtend/naali/pull/618.patch
https://github.com/realXtend/naali/pull/618.diff

Sent from my Android phone with K-9 Mail. Please excuse my brevity.

[cadaver]

Note that Ogre 1.9 is a branch under development, meaning possibly breaking API's, and even bugs (there was a nasty garbled screen on some Android devices when using a newer revision), so one might have to keep fixing it constantly. After 1.9 is released then we should certainly sync with it.

[peterclemenko]

Understood and agreed.

cadaver notifications@github.com wrote:

Note that Ogre 1.9 is a branch under development, meaning possibly
breaking API's, and even bugs (there was a nasty garbled screen on some
Android devices when using a newer revision), so one might have to keep
fixing it constantly. After 1.9 is released then we should certainly
sync with it.

---

Reply to this email directly or view it on GitHub:
#618 (comment)

Sent from my Android phone with K-9 Mail. Please excuse my brevity.