diff --git a/common/defaults.h b/common/defaults.h index cb4330bf..c3cb22ef 100644 --- a/common/defaults.h +++ b/common/defaults.h @@ -181,6 +181,10 @@ Default build-depended cvar and constant values #define XASH_INTERNAL_GAMELIBS #endif // XASH_ANDROID || XASH_IOS || XASH_EMSCRIPTEN +#if XASH_ANDROID && XASH_SDL +#define XASH_ANDROID_ASSETS 1 +#endif + // Defaults #ifndef DEFAULT_TOUCH_ENABLE #define DEFAULT_TOUCH_ENABLE "0" diff --git a/filesystem/android.c b/filesystem/android.c index adfde824..703a3ced 100644 --- a/filesystem/android.c +++ b/filesystem/android.c @@ -15,7 +15,7 @@ GNU General Public License for more details. #include "port.h" -#if XASH_ANDROID && XASH_SDL +#if XASH_ANDROID_ASSETS #include #include @@ -324,4 +324,4 @@ void FS_InitAndroid( void ) jni.getAssets = (*jni.env)->GetMethodID( jni.env, jni.activity_class, "getAssets", "(Z)Landroid/content/res/AssetManager;" ); } -#endif // XASH_ANDROID +#endif // XASH_ANDROID_ASSETS diff --git a/filesystem/filesystem.c b/filesystem/filesystem.c index 51417d78..49a1de62 100644 --- a/filesystem/filesystem.c +++ b/filesystem/filesystem.c @@ -72,7 +72,7 @@ const fs_archive_t g_archives[] = static const fs_archive_t g_directory_archive = { NULL, SEARCHPATH_PLAIN, FS_AddDir_Fullpath, false }; -#if XASH_ANDROID && XASH_SDL +#if XASH_ANDROID_ASSETS static const fs_archive_t g_android_archive = { NULL, SEARCHPATH_ANDROID_ASSETS, FS_AddAndroidAssets_Fullpath, false }; #endif @@ -406,7 +406,7 @@ void FS_AddGameDirectory( const char *dir, uint flags ) stringlistfreecontents( &list ); -#if XASH_ANDROID && XASH_SDL +#if XASH_ANDROID_ASSETS FS_AddArchive_Fullpath( &g_android_archive, dir, flags ); #endif @@ -1441,7 +1441,7 @@ qboolean FS_InitStdio( qboolean unused_set_to_true, const char *rootdir, const c FS_InitMemory(); -#if XASH_ANDROID && XASH_SDL +#if XASH_ANDROID_ASSETS FS_InitAndroid(); #endif