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

Clean up some of the 64bit projects

This commit is contained in:
zilmar 2015-05-22 06:07:24 +10:00
parent 0c8d500328
commit bc78316504
10 changed files with 105 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config/Project64.cfg.development
View File

@ -4,9 +4,9 @@ Auto Sleep=0
Basic Mode=0
Cheats=..\..\Config\Project64.cht
ExtInfo=..\..\Config\Project64.rdx
Glide64RDB=..\..\Config\Glide64.rdb
Notes=..\..\Config\Project64.rdn
RomDatabase=..\..\Config\Project64.rdb
Glide64RDB=..\..\Config\Glide64.rdb
RomListCache=..\..\Config\Project64.cache3
ShortCuts=..\..\Config\Project64.sc3

14
Source/3rd Party/wx/wx_base.vcxproj
View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>base</ProjectName>
@ -25,14 +33,14 @@
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Project="$(SolutionDir)PropertySheets\Win32.$(Configuration).props" />
</ImportGroup>
<PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup>
<TargetName>wxbase29</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxbase29d</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">wxbase29d</TargetName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
@ -43,7 +51,7 @@
</ClCompile>
<Lib>
<OutputFile>$(OutDir)wxbase29.lib</OutputFile>
<OutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)wxbase29d.lib</OutputFile>
<OutputFile Condition="'$(Configuration)'=='Debug'">$(OutDir)wxbase29d.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>

34
Source/3rd Party/wx/wx_core.vcxproj
View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>core</ProjectName>
@ -25,14 +33,14 @@
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Project="$(SolutionDir)PropertySheets\Win32.$(Configuration).props" />
</ImportGroup>
<PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup>
<TargetName>wxmsw29_core</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29d_core</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">wxmsw29d_core</TargetName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
@ -43,7 +51,7 @@
</ClCompile>
<Lib>
<OutputFile>$(OutDir)wxmsw29_core.lib</OutputFile>
<OutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)wxmsw29d_core.lib</OutputFile>
<OutputFile Condition="'$(Configuration)'=='Debug'">$(OutDir)wxmsw29d_core.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
@ -270,8 +278,12 @@
<ClCompile Include="src\msw\ole\oleutils.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\msw\ownerdrw.cpp" />
<ClCompile Include="src\msw\palette.cpp" />
@ -362,13 +374,21 @@
<ItemGroup>
<CustomBuild Include="include\wx\msw\setup.h">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating lib\vc_lib\mswd\wx\setup.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating lib\vc_lib\mswd\wx\setup.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" lib\vc_lib\mswd\wx\setup.h
</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" lib\vc_lib\mswd\wx\setup.h
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\vc_lib\mswd\wx\setup.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\vc_lib\mswd\wx\setup.h;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating lib\vc_lib\mswu\wx\setup.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating lib\vc_lib\mswu\wx\setup.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h
</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
</CustomBuild>
<ClInclude Include="include\wx\msw\accel.h" />
<ClInclude Include="include\wx\msw\ole\activex.h" />
@ -416,13 +436,21 @@
<ClInclude Include="include\wx\msw\gdiimage.h" />
<CustomBuild Include="include\wx\msw\genrcdefs.h">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswud\wx\msw\rcdefs.h"
</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswud\wx\msw\rcdefs.h"
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswu\wx\msw\rcdefs.h"
</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswu\wx\msw\rcdefs.h"
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
</CustomBuild>
<ClInclude Include="include\wx\msw\headerctrl.h" />
<ClInclude Include="include\wx\msw\helpchm.h" />

4
Source/Glide64/FixedPoint.asm.cpp
View File

@ -41,6 +41,7 @@ typedef signed __int64 int64_t;
#include <stdint.h>
#endif
#ifdef _M_IX86
// (x * y) >> 16
extern "C" int __declspec(naked) imul16(int x, int y)
{
@ -70,6 +71,9 @@ extern "C" int __declspec(naked) imul14(int x, int y)
ret
}
}
#else
DebugBreak();
#endif
int idiv16(int x, int y)
{

16
Source/Glide64/Glide64.vcxproj
View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{A4D13408-A794-4199-8FC7-4A9A32505005}</ProjectGuid>
@ -24,27 +32,29 @@
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Project="$(SolutionDir)PropertySheets\Win32.$(Configuration).props" />
</ImportGroup>
<PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup>
<TargetName>PJ64Glide64</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PJ64Glide64_d</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">PJ64Glide64_d</TargetName>
<OutDir>$(SolutionDir)Plugin\GFX\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(Root)Source/3rd Party/wx/include;$(Root)Source/3rd Party/wx/include/msvc;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__MSC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RDP_LOGGING;RDP_ERROR_LOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">RDP_LOGGING;RDP_ERROR_LOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader />
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(Root)Source\3rd Party\wx\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SubSystem Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Windows</SubSystem>
<SubSystem Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Windows</SubSystem>
<SubSystem Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Windows</SubSystem>
<SubSystem Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemGroup>

10
Source/GlideHQ/GlideHQ.vcxproj
View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{2DADDAA5-0F57-46ED-A974-747908DDC7F3}</ProjectGuid>
@ -24,7 +32,7 @@
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Project="$(SolutionDir)PropertySheets\Win32.$(Configuration).props" />
</ImportGroup>
<PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

25
Source/GlideHQ/TxUtil.cpp
View File

@ -327,7 +327,8 @@ TxUtil::RiceCRC32(const uint8* src, int width, int height, int size, int rowStri
try {
#ifdef WIN32
__asm {
#ifdef _M_IX86
__asm {
push ebx;
push esi;
push edi;
@ -361,6 +362,9 @@ TxUtil::RiceCRC32(const uint8* src, int width, int height, int size, int rowStri
pop esi;
pop ebx;
}
#else
DebugBreak();
#endif
#else
asm volatile(
"pushl %%ebx \n"
@ -422,7 +426,8 @@ TxUtil::RiceCRC32_CI4(const uint8* src, int width, int height, int size, int row
/* 4bit CI */
try {
#ifdef WIN32
__asm {
#ifdef _M_IX86
__asm {
push ebx;
push esi;
push edi;
@ -529,6 +534,9 @@ TxUtil::RiceCRC32_CI4(const uint8* src, int width, int height, int size, int row
pop esi;
pop ebx;
}
#else
DebugBreak();
#endif
#else
asm volatile(
"pushl %%ebx \n"
@ -665,8 +673,9 @@ TxUtil::RiceCRC32_CI8(const uint8* src, int width, int height, int size, int row
/* 8bit CI */
try {
#ifdef _M_IX86
#ifdef WIN32
__asm {
__asm {
push ebx;
push esi;
push edi;
@ -821,7 +830,11 @@ TxUtil::RiceCRC32_CI8(const uint8* src, int width, int height, int size, int row
: "memory", "cc"
);
#endif
} catch(...) {
#else
DebugBreak();
#endif
}
catch (...) {
DBG_INFO(80, L"Error: RiceCRC32 exception!\n");
}
@ -838,6 +851,7 @@ TxUtil::log2(int num)
#if 1
if (!num) return 0;
#ifdef _M_IX86
#ifdef WIN32
__asm {
mov eax, dword ptr [num];
@ -854,6 +868,9 @@ TxUtil::log2(int num)
: "memory", "cc"
);
#endif
#else
DebugBreak();
#endif
#else
switch (num) {
case 1: return 0;

10
Source/Glitch64/Glitch64.vcxproj
View File

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{462C2608-182F-452C-944F-AF201E19300B}</ProjectGuid>
@ -24,7 +32,7 @@
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)PropertySheets\$(Platform).$(Configuration).props" />
<Import Project="$(SolutionDir)PropertySheets\Win32.$(Configuration).props" />
</ImportGroup>
<PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>

11
Source/RSP/RSP.vcxproj
View File

@ -32,19 +32,16 @@
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
<Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
<Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<Import Project="$(SolutionDir)PropertySheets\Win32.$(Configuration).props" />
</ImportGroup>
<PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup>
<TargetName>RSP 1.7</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RSP_d 1.7</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">RSP_d 1.7</TargetName>
<OutDir>$(SolutionDir)Plugin64\RSP\</OutDir>
<TargetName Condition="'$(Configuration)'=='Debug'">RSP_d 1.7</TargetName>
<OutDir>$(SolutionDir)Plugin\RSP\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\RSP\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>

3
Source/nragev20/NRage_Input_V2.vcxproj
View File

@ -41,7 +41,8 @@
<PropertyGroup>
<TargetName>PJ64_NRage</TargetName>
<TargetName Condition="'$(Configuration)'=='Debug'">PJ64_NRage_d</TargetName>
<OutDir>$(SolutionDir)Plugin64\Input\</OutDir>
<OutDir>$(SolutionDir)Plugin\Input\</OutDir>
<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\Input\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>