diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index cddae0fb0a..4a265e9a22 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -226,13 +226,13 @@ void NativeInit(int argc, const char *argv[], #ifdef IOS user_data_path += "/"; #elif defined(__APPLE__) - char program_path[4090]; - uint32_t program_path_size = sizeof(program_path); - _NSGetExecutablePath(program_path,&program_path_size); - *(strrchr(program_path, '/')+1) = '\0'; - char assets_path[4096]; - sprintf(assets_path,"%sassets/",program_path); - VFSRegister("", new DirectoryAssetReader(assets_path)); + char program_path[4090]; + uint32_t program_path_size = sizeof(program_path); + _NSGetExecutablePath(program_path,&program_path_size); + *(strrchr(program_path, '/')+1) = '\0'; + char assets_path[4096]; + sprintf(assets_path,"%sassets/",program_path); + VFSRegister("", new DirectoryAssetReader(assets_path)); #endif // We want this to be FIRST. @@ -383,20 +383,12 @@ void NativeInit(int argc, const char *argv[], if (!boot_filename.empty() && stateToLoad != NULL) SaveState::Load(stateToLoad); - + g_gameInfoCache.Init(); screenManager = new ScreenManager(); - if (boot_filename.empty()) { -#if (defined(_WIN32) && (defined(_M_IX86) || defined(_M_X64))) || defined(ARMEABI) || defined(ARMEABI_V7A) || (defined(MACOSX) && defined(_M_IX64)) - if (Atrac3plus_Decoder::CanAutoInstall()) { - Atrac3plus_Decoder::DoAutoInstall(); - } -#endif - } - if (skipLogo) { screenManager->switchScreen(new EmuScreen(boot_filename)); } else { diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj index 556ef1ba47..e36ee846a7 100644 --- a/UI/UI.vcxproj +++ b/UI/UI.vcxproj @@ -31,7 +31,6 @@ - @@ -47,7 +46,6 @@ - @@ -180,4 +178,4 @@ - \ No newline at end of file + diff --git a/UI/UI.vcxproj.filters b/UI/UI.vcxproj.filters index f1d063aeb3..c328d8b7a3 100644 --- a/UI/UI.vcxproj.filters +++ b/UI/UI.vcxproj.filters @@ -10,9 +10,6 @@ Screens - - Screens - Screens @@ -44,9 +41,6 @@ Screens - - Screens - Screens @@ -74,4 +68,4 @@ {faee5dce-633b-4ba6-b19d-ea70ee3c1c38} - \ No newline at end of file +