Add support for compiling x64 builds. These can not use the optimized x86 assembler code, which is used in the GBA core and several pixel filters.
This commit is contained in:
parent
ca5b2c72a9
commit
42f712395b
|
@ -16,6 +16,7 @@ Known preprocessor switches:
|
|||
- NO_D3D: Exclude Direct3D code
|
||||
- NO_OAL: Exclude OpenAL code
|
||||
- NO_XAUDIO2: Exclude XAudio2 code (the XAudio2 interface is DirectSound's successor)
|
||||
- WIN64: This macro is only defined for 64 bit builds
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -10,17 +10,27 @@ EndProject
|
|||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug|x64 = Debug|x64
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Debug|x64.Build.0 = Debug|x64
|
||||
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|Win32.Build.0 = Release|Win32
|
||||
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|x64.ActiveCfg = Release|x64
|
||||
{6D4C5EC8-933F-4C05-A1BF-498E658576DF}.Release|x64.Build.0 = Release|x64
|
||||
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Debug|x64.Build.0 = Debug|x64
|
||||
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|Win32.Build.0 = Release|Win32
|
||||
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|x64.ActiveCfg = Release|x64
|
||||
{7AEC599C-7C82-4F00-AA60-411E0A359CB0}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -67,10 +67,12 @@ extern void Simple3x16(u8*,u32,u8*,u8*,u32,int,int);
|
|||
extern void Simple3x32(u8*,u32,u8*,u8*,u32,int,int);
|
||||
extern void Simple4x16(u8*,u32,u8*,u8*,u32,int,int);
|
||||
extern void Simple4x32(u8*,u32,u8*,u8*,u32,int,int);
|
||||
#ifndef WIN64
|
||||
extern void hq3x16(u8*,u32,u8*,u8*,u32,int,int);
|
||||
extern void hq4x16(u8*,u32,u8*,u8*,u32,int,int);
|
||||
extern void hq3x32(u8*,u32,u8*,u8*,u32,int,int);
|
||||
extern void hq4x32(u8*,u32,u8*,u8*,u32,int,int);
|
||||
#endif
|
||||
|
||||
extern void SmartIB(u8*,u32,int,int);
|
||||
extern void SmartIB32(u8*,u32,int,int);
|
||||
|
@ -698,6 +700,7 @@ void VBA::updateFilter()
|
|||
filterFunction = Simple4x16;
|
||||
filterMagnification = 4;
|
||||
break;
|
||||
#ifndef WIN64
|
||||
case FILTER_HQ3X:
|
||||
filterFunction = hq3x16;
|
||||
filterMagnification = 3;
|
||||
|
@ -706,6 +709,7 @@ void VBA::updateFilter()
|
|||
filterFunction = hq4x16;
|
||||
filterMagnification = 4;
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -785,6 +789,7 @@ void VBA::updateFilter()
|
|||
filterFunction = Simple4x32;
|
||||
filterMagnification = 4;
|
||||
break;
|
||||
#ifndef WIN64
|
||||
case FILTER_HQ3X:
|
||||
filterFunction = hq3x32;
|
||||
filterMagnification = 3;
|
||||
|
@ -799,6 +804,7 @@ void VBA::updateFilter()
|
|||
b16to32Video=true;
|
||||
#endif
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
#pragma once
|
||||
|
||||
// make windows controls look newer / enable visual styles:
|
||||
#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' ""version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
|
||||
|
||||
#ifndef VC_EXTRALEAN
|
||||
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue