ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix x64 build due to Android project mappings.

This commit is contained in:
Julio César Rocha 2016-07-11 01:23:18 -07:00
parent 0743240985
commit b67e2c7f28
5 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -52,6 +52,7 @@ Thumbs.db
/Plugin/RSP/RSP_d 1.7.dll /Plugin/RSP/RSP_d 1.7.dll
/Plugin/RSP/RSP-HLE.dll /Plugin/RSP/RSP-HLE.dll
/Plugin/RSP/RSP-HLE_d.dll /Plugin/RSP/RSP-HLE_d.dll
/Plugin64/AndroidAudio
/Plugin64/Audio/AndroidAudio.dll /Plugin64/Audio/AndroidAudio.dll
/Plugin64/Audio/AndroidAudio_d.dll /Plugin64/Audio/AndroidAudio_d.dll
/Plugin64/GFX/lib /Plugin64/GFX/lib
@ -71,6 +72,7 @@ Thumbs.db
/Plugin64/RSP/pdb /Plugin64/RSP/pdb
/Plugin64/RSP/RSP 1.7.dll /Plugin64/RSP/RSP 1.7.dll
/Plugin64/RSP/RSP_d 1.7.dll /Plugin64/RSP/RSP_d 1.7.dll
/Plugin64/RSP/RSP-HLE.dll
/Source/3rdParty/wx/lib/vc_lib/msw/wx/setup.h /Source/3rdParty/wx/lib/vc_lib/msw/wx/setup.h
/Source/3rdParty/wx/lib/vc_lib/mswd/wx/setup.h /Source/3rdParty/wx/lib/vc_lib/mswd/wx/setup.h
/Source/3rdParty/wx/lib/vc_lib/mswu/wx/msw/rcdefs.h /Source/3rdParty/wx/lib/vc_lib/mswu/wx/msw/rcdefs.h

8
Source/Android/Bridge/Bridge.vcxproj
View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{593B00E6-1987-415D-A62C-26533FC3E95C}</ProjectGuid> <ProjectGuid>{593B00E6-1987-415D-A62C-26533FC3E95C}</ProjectGuid>

8
Source/Android/PluginAudio/PluginAudio.vcxproj
View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{D233025A-231F-4A43-92B6-E87193C60ACC}</ProjectGuid> <ProjectGuid>{D233025A-231F-4A43-92B6-E87193C60ACC}</ProjectGuid>

8
Source/Android/PluginInput/PluginInput.vcxproj
View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{1133A1CC-A9E5-4026-B20D-6A2987130D4E}</ProjectGuid> <ProjectGuid>{1133A1CC-A9E5-4026-B20D-6A2987130D4E}</ProjectGuid>

8
Source/Android/PluginRSP/PluginRSP.vcxproj
View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{B685BB34-D700-4FCC-8503-9B6AA1A0C95D}</ProjectGuid> <ProjectGuid>{B685BB34-D700-4FCC-8503-9B6AA1A0C95D}</ProjectGuid>