Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Upgrade native. Build the GL UI on Windows too (but don't run it yet).

Browse Source
This commit is contained in:
Henrik Rydgard 2013-03-29 14:41:03 +01:00
parent 23ad4c554a
commit e7989e88d8
4 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Windows/PPSSPP.vcxproj
View File

@ -225,42 +225,13 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\android\jni\EmuScreen.cpp"> <ClCompile Include="..\android\jni\EmuScreen.cpp" />
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ClCompile Include="..\android\jni\GamepadEmu.cpp" />
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ClCompile Include="..\android\jni\MenuScreens.cpp" />
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ClCompile Include="..\android\jni\NativeApp.cpp" />
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ClCompile Include="..\android\jni\TestRunner.cpp" />
</ClCompile> <ClCompile Include="..\android\jni\UIShader.cpp" />
<ClCompile Include="..\android\jni\GamepadEmu.cpp"> <ClCompile Include="..\android\jni\ui_atlas.cpp" />
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\android\jni\MenuScreens.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\android\jni\NativeApp.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\android\jni\TestRunner.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\android\jni\UIShader.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\native\ext\glew\glew.c"> <ClCompile Include="..\native\ext\glew\glew.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -315,6 +286,7 @@
<ClInclude Include="..\android\jni\MenuScreens.h" /> <ClInclude Include="..\android\jni\MenuScreens.h" />
<ClInclude Include="..\android\jni\TestRunner.h" /> <ClInclude Include="..\android\jni\TestRunner.h" />
<ClInclude Include="..\android\jni\UIShader.h" /> <ClInclude Include="..\android\jni\UIShader.h" />
<ClInclude Include="..\android\jni\ui_atlas.h" />
<ClInclude Include="Debugger\CtrlDisAsmView.h" /> <ClInclude Include="Debugger\CtrlDisAsmView.h" />
<ClInclude Include="Debugger\CtrlMemView.h" /> <ClInclude Include="Debugger\CtrlMemView.h" />
<ClInclude Include="Debugger\CtrlRegisterList.h" /> <ClInclude Include="Debugger\CtrlRegisterList.h" />

6
Windows/PPSSPP.vcxproj.filters
View File

@ -110,6 +110,9 @@
<ClCompile Include="..\android\jni\TestRunner.cpp"> <ClCompile Include="..\android\jni\TestRunner.cpp">
<Filter>Android</Filter> <Filter>Android</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\android\jni\ui_atlas.cpp">
<Filter>Android</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Debugger\CtrlDisAsmView.h"> <ClInclude Include="Debugger\CtrlDisAsmView.h">
@ -194,6 +197,9 @@
<ClInclude Include="..\android\jni\TestRunner.h"> <ClInclude Include="..\android\jni\TestRunner.h">
<Filter>Android</Filter> <Filter>Android</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\android\jni\ui_atlas.h">
<Filter>Android</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="icon1.ico"> <None Include="icon1.ico">

5
Windows/main.cpp
View File

@ -17,6 +17,11 @@
#include <windows.h> #include <windows.h>
void LaunchBrowser(const char *url)
{
ShellExecute(NULL, "open", url, NULL, NULL, SW_SHOWNORMAL);
}
#include "file/vfs.h" #include "file/vfs.h"
#include "file/zip_read.h" #include "file/zip_read.h"

2
native

@ -1 +1 @@
Subproject commit 5f000da0e558a95825c87bd0a84a59858099fe8b Subproject commit 75e9af1379753f8654dbe2b22c70ce7481bfd012