Merge branch 'master' of github.com:taylor001/crown

src/device.cpp

@@ -79,7 +79,7 @@ void Device::init()
 	profiler_globals::init();
 
 #if CROWN_PLATFORM_ANDROID
-	_bundle_filesystem = CE_NEW(_allocator, ApkFilesystem)(_device_options.asset_manager());
+	_bundle_filesystem = CE_NEW(_allocator, ApkFilesystem)(const_cast<AAssetManager*>(_device_options.asset_manager()));
 #else
 	_bundle_filesystem = CE_NEW(_allocator, DiskFilesystem)(_device_options.bundle_dir());
 #endif // CROWN_PLATFORM_ANDROID

src/device_options.h

@@ -35,7 +35,7 @@ struct DeviceOptions
 	uint16_t window_height() const { return _window_height; }
 
 #if CROWN_PLATFORM_ANDROID
-	AAssetManager* asset_manager();
+	const AAssetManager* asset_manager() const { return _asset_manager; }
 #endif // CROWN_PLATFORM_ANDROID
 
 private: