we need to switch some stuff off for a while

Author: AnastaZIuk

CMakeLists.txt

@@ -8,6 +8,8 @@ cmake_policy(SET CMP0072 OLD) #not yet, would need to get pointers to all OpenGL
 set(OpenGL_GL_PREFERENCE LEGACY)
 #cmake_policy(SET CMP )
 
+set(NBL_BUILD_ANDROID OFF)
+
 include(ExternalProject)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchains/android/build.cmake)
 

cmake/toolchains/android/build.cmake

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(NBL_BUILD_ANDROID OFF)
 if(DEFINED CMAKE_TOOLCHAIN_FILE)
 	if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
 		cmake_path(GET CMAKE_TOOLCHAIN_FILE FILENAME _NBL_CMAKE_TOOLCHAIN_FILENAME_)
@@ -88,13 +87,6 @@ if(NBL_BUILD_ANDROID)
 		message(FATAL_ERROR "Current host OS for Android cross-compiling isn't allowed!")
 	endif()
 
-	# TODO - remove those bellow in future
-	set(_NBL_COMPILE_WITH_OPEN_EXR_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) 		# TODO - check it out
-	set(_NBL_COMPILE_WITH_BAW_LOADER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE)	# TODO - remove when BAW-v4 is done
-	set(_NBL_COMPILE_WITH_BAW_WRITER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE)	# TODO - remove when BAW-v4 is done
-	set(_NBL_COMPILE_WITH_OBJ_LOADER_ ON CACHE BOOL "Off for Android purposes at the moment" FORCE)
-	set(NBL_BUILD_MITSUBA_LOADER OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) 		# TODO - compile/linker errors
-	
 	find_package(Java 1.8)
 
 	if(DEFINED Java_JAVA_EXECUTABLE)

src/nbl/CMakeLists.txt

@@ -121,6 +121,16 @@ option(_NBL_COMPILE_WITH_GLI_WRITER_ "Compile with GLI Writer" ON)
 option(_NBL_COMPILE_WITH_GLTF_LOADER_ "Compile with GLTF Loader" ON)
 option(_NBL_COMPILE_WITH_GLTF_WRITER_ "Compile with GLTF Writer" ON)
 
+if(NBL_BUILD_ANDROID)
+	# TODO - remove those bellow in future
+	set(_NBL_COMPILE_WITH_OPEN_EXR_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) 		# TODO - check it out
+	set(_NBL_COMPILE_WITH_BAW_LOADER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE)	# TODO - remove when BAW-v4 is done
+	set(_NBL_COMPILE_WITH_BAW_WRITER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE)	# TODO - remove when BAW-v4 is done
+	set(_NBL_COMPILE_WITH_OBJ_LOADER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE)
+	set(_NBL_COMPILE_WITH_MTL_LOADER_ OFF CACHE BOOL "Off for Android purposes at the moment" FORCE)
+	set(NBL_BUILD_MITSUBA_LOADER OFF CACHE BOOL "Off for Android purposes at the moment" FORCE) 		# TODO - compile/linker errors
+endif()
+
 nbl_get_conf_dir(NABLA_CONF_DIR_DEBUG Debug)
 nbl_get_conf_dir(NABLA_CONF_DIR_RELEASE Release)
 if(NBL_EMBED_BUILTIN_RESOURCES)	

src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.cpp

@@ -86,7 +86,7 @@ void CGraphicsPipelineLoaderMTL::initialize()
     // default pipelines
     constexpr std::string_view filename = "Nabla default MTL material";
 
-    auto default_mtl_file = core::make_smart_refctd_ptr<system::CFileView<system::CPlainHeapAllocator>>(core::smart_refctd_ptr(m_system), filename, system::IFile::ECF_READ, strlen(DUMMY_MTL_CONTENT));
+    auto default_mtl_file = core::make_smart_refctd_ptr<system::CFileView<system::CPlainHeapAllocator>>(core::smart_refctd_ptr(m_system), filename, system::IFile::ECF_READ_WRITE, strlen(DUMMY_MTL_CONTENT));
 
     system::future<size_t> future;
     default_mtl_file->write(future, DUMMY_MTL_CONTENT, 0, strlen(DUMMY_MTL_CONTENT));
@@ -95,7 +95,6 @@ void CGraphicsPipelineLoaderMTL::initialize()
     SAssetLoadParams assetLoadParams;
     auto bundle = loadAsset(default_mtl_file.get(), assetLoadParams, &dfltOver);
 
-
     insertBuiltinAssetIntoCache(m_assetMgr, bundle, "nbl/builtin/renderpass_independent_pipeline/loader/mtl/missing_material_pipeline");
 }