Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Windows build fixes

Browse source
This commit is contained in:
Henrik Rydgård 2013-10-17 16:44:09 +02:00 • committed by Henrik Rydgard
parent 2c5adc96cf
commit 70783eaa48
3 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
UI/NativeApp.cpp
View file

@ -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 {

4
UI/UI.vcxproj
View file

@ -31,7 +31,6 @@
<ClCompile Include="MiscScreens.cpp" />
<ClCompile Include="NativeApp.cpp" />
<ClCompile Include="OnScreenDisplay.cpp" />
<ClCompile Include="PluginScreen.cpp" />
<ClCompile Include="UIShader.cpp" />
<ClCompile Include="ui_atlas.cpp" />
</ItemGroup>
@ -47,7 +46,6 @@
<ClInclude Include="MainScreen.h" />
<ClInclude Include="MiscScreens.h" />
<ClInclude Include="OnScreenDisplay.h" />
<ClInclude Include="PluginScreen.h" />
<ClInclude Include="UIShader.h" />
<ClInclude Include="ui_atlas.h" />
</ItemGroup>
@ -180,4 +178,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

8
UI/UI.vcxproj.filters
View file

@ -10,9 +10,6 @@
<ClCompile Include="EmuScreen.cpp">
<Filter>Screens</Filter>
</ClCompile>
<ClCompile Include="PluginScreen.cpp">
<Filter>Screens</Filter>
</ClCompile>
<ClCompile Include="GameScreen.cpp">
<Filter>Screens</Filter>
</ClCompile>
@ -44,9 +41,6 @@
<ClInclude Include="EmuScreen.h">
<Filter>Screens</Filter>
</ClInclude>
<ClInclude Include="PluginScreen.h">
<Filter>Screens</Filter>
</ClInclude>
<ClInclude Include="GameScreen.h">
<Filter>Screens</Filter>
</ClInclude>
@ -74,4 +68,4 @@
<UniqueIdentifier>{faee5dce-633b-4ba6-b19d-ea70ee3c1c38}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
</Project>