SWIG: fix compilation of Java Component and correct outpath for Android

OGRECave · Aug 5, 2018 · 7de80a7 · 7de80a7
1 parent 7ac8758
commit 7de80a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Components/Java/CMakeLists.txt b/Components/Java/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${OGRE_BINARY_DIR}/java/libs")
 set(CMAKE_SWIG_OUTDIR "${OGRE_BINARY_DIR}/java/src/org/Ogre")
 
 if(ANDROID)
-	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${ANDROID_NDK_OUTPUT_ABI_NAME}")
+	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${ANDROID_NDK_ABI_NAME}")
 	list(APPEND CMAKE_SWIG_FLAGS -D__ANDROID__)
 endif()
 

diff --git a/OgreMain/include/Ogre.i b/OgreMain/include/Ogre.i
@@ -316,7 +316,7 @@ SHARED_PTR(HardwareUniformBuffer);
 %ignore Ogre::ResourceGroupManager::openResource(const String&, const String&, bool, Resource*) const;
 %ignore Ogre::ResourceGroupManager::openResource(const String&, const String&, bool) const;
 %include "OgreResourceGroupManager.h"
-#if SWIG_VERSION < 0x030012
+#if SWIG_VERSION < 0x030012 || defined(SWIGJAVA)
 // conflicts with overloaded versions (GpuProgram, Texture)
 %ignore Ogre::ResourceManager::getResourceByName;
 %ignore Ogre::ResourceManager::createOrRetrieve;