From: Toni Wilen Date: Sat, 2 May 2026 11:24:24 +0000 (+0300) Subject: ARM64 support updates X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=d999649fd7ce9341e4616c716a004119946ea283;p=francis%2Fwinuae.git ARM64 support updates --- diff --git a/.github/workflows/build-winuae-binary.yml b/.github/workflows/build-winuae-binary.yml index abe56d7e..fd973cd4 100644 --- a/.github/workflows/build-winuae-binary.yml +++ b/.github/workflows/build-winuae-binary.yml @@ -106,5 +106,5 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: WinUAE 64-bit + name: WinUAE x64 path: D:\Amiga diff --git a/cd32_fmv.cpp b/cd32_fmv.cpp index a7913022..fc4cbbda 100644 --- a/cd32_fmv.cpp +++ b/cd32_fmv.cpp @@ -24,8 +24,10 @@ #include "cda_play.h" #include "archivers/mp2/kjmp2.h" +#ifdef WITH_LIBMPEG2 #include "mpeg2.h" #include "mpeg2convert.h" +#endif #define FMV_DEBUG 0 static int fmv_audio_debug = 0; @@ -221,7 +223,6 @@ static uae_u16 cl450_pending_interrupts; static uae_u16 cl450_threshold; static int cl450_buffer_offset; static int cl450_buffer_empty_cnt; -static int libmpeg_offset; static uae_sem_t play_sem; static volatile bool fmv_bufon[2]; static float fmv_syncadjust; @@ -264,8 +265,11 @@ static uae_u16 l64111intmask[2], l64111intstatus[2]; static uae_u16 mpeg_io_reg; +#ifdef WITH_LIBMPEG2 +static int libmpeg_offset; static mpeg2dec_t *mpeg_decoder; static const mpeg2_info_t *mpeg_info; +#endif #if FMV_DEBUG static int isdebug(uaecptr addr) @@ -795,6 +799,7 @@ static struct zfile *videodump; static void cl450_parse_frame(void) { +#ifdef WITH_LIBMPEG2 for (;;) { mpeg2_state_t mpeg_state = mpeg2_parse(mpeg_decoder); switch (mpeg_state) @@ -870,6 +875,7 @@ static void cl450_parse_frame(void) break; } } +#endif } static void cl450_reset(void) @@ -882,7 +888,6 @@ static void cl450_reset(void) cl450_threshold = 4096; cl450_buffer_offset = 0; cl450_buffer_empty_cnt = 0; - libmpeg_offset = 0; cl450_newpacket_mode = false; cl450_newpacket_offset_write = 0; cl450_newpacket_offset_read = 0; @@ -890,8 +895,11 @@ static void cl450_reset(void) cl450_videoram_read = 0; cl450_videoram_cnt = 0; memset(cl450_regs, 0, sizeof cl450_regs); +#ifdef WITH_LIBMPEG2 + libmpeg_offset = 0; if (mpeg_decoder) mpeg2_reset(mpeg_decoder, 1); +#endif if (fmv_ram_bank.baseaddr) { memset(fmv_ram_bank.baseaddr, 0, 0x100); write_log(_T("CL450 reset\n")); @@ -1527,9 +1535,11 @@ static void cd32_fmv_free(void) uae_sem_destroy(&play_sem); xfree(pcmaudio); pcmaudio = NULL; +#ifdef WITH_LIBMPEG2 if (mpeg_decoder) mpeg2_close(mpeg_decoder); mpeg_decoder = NULL; +#endif cl450_reset(); l64111_reset(); } @@ -1569,10 +1579,12 @@ addrbank *cd32_fmv_init (struct autoconfig_info *aci) if (!pcmaudio) pcmaudio = xcalloc(struct fmv_pcmaudio, L64111_CHANNEL_BUFFERS); kjmp2_init(&mp2); +#ifdef WITH_LIBMPEG2 if (!mpeg_decoder) { mpeg_decoder = mpeg2_init(); mpeg_info = mpeg2_info(mpeg_decoder); } +#endif memset(&cas, 0, sizeof(cas)); fmv_bank.mask = fmv_board_size - 1; map_banks(&fmv_rom_bank, (fmv_start + ROM_BASE) >> 16, fmv_rom_size >> 16, 0); diff --git a/include/moduleripper.h b/include/moduleripper.h index 6e345723..7a4492a1 100644 --- a/include/moduleripper.h +++ b/include/moduleripper.h @@ -1,7 +1,7 @@ #ifndef UAE_MODULERIPPER_H #define UAE_MODULERIPPER_H -extern "C" int prowizard_search (unsigned char *in_data, int in_size); +extern int prowizard_search (unsigned char *in_data, int in_size); extern void moduleripper (void); #endif /* UAE_MODULERIPPER_H */ diff --git a/moduleripper.cpp b/moduleripper.cpp index a14af12b..e8aab63d 100644 --- a/moduleripper.cpp +++ b/moduleripper.cpp @@ -130,9 +130,6 @@ static void moduleripper_filename(const char *aname, TCHAR *out, bool fullpath) xfree(name); } -extern "C" -{ - FILE *moduleripper_fopen (const char *aname, const char *amode) { TCHAR outname[MAX_DPATH]; @@ -173,7 +170,6 @@ FILE *moduleripper2_fopen (const char *name, const char *mode, const char *aid, void pw_write_log (const char *format,...) { } -} #else diff --git a/od-win32/ahidsound_new.cpp b/od-win32/ahidsound_new.cpp index 45436350..c920b455 100644 --- a/od-win32/ahidsound_new.cpp +++ b/od-win32/ahidsound_new.cpp @@ -8,7 +8,9 @@ #include "sysconfig.h" -#if defined(AHI) +int ahi_debug = 1; + +#if defined(AHI_v2) #include @@ -31,8 +33,6 @@ #define AHI_STRUCT_VERSION 1 -int ahi_debug = 1; - #define UAE_MAXCHANNELS 24 #define UAE_MAXSOUNDS 256 #define UAE_RECORDSAMPLES 2048 diff --git a/od-win32/avioutput.cpp b/od-win32/avioutput.cpp index 01eb168b..78cccb9d 100644 --- a/od-win32/avioutput.cpp +++ b/od-win32/avioutput.cpp @@ -1002,6 +1002,7 @@ static int getFromRenderTarget11(struct avientry *avie, bool renderTarget) return ok; } +#ifdef WITH_DIRECT3D9 static int getFromRenderTarget(struct avientry *avie, bool renderTarget) { int ok = 0; @@ -1057,6 +1058,7 @@ static int getFromRenderTarget(struct avientry *avie, bool renderTarget) } return ok; } +#endif static int getFromDC(struct avientry *avie) { @@ -1241,18 +1243,29 @@ static void AVIOutput_WriteVideo(void) if (avioutput_originalsize) { v = getFromBuffer (ae, 1); if (!v) { +#ifdef WITH_DIRECT3D11 if (D3D_isenabled(0) == 2) { v = getFromRenderTarget11(ae, false); - } else if (D3D_isenabled(0) == 1) { + } +#endif +#ifdef WITH_DIRECT3D9 + if (D3D_isenabled(0) == 1) { v = getFromRenderTarget(ae, false); } +#endif } } else { +#ifdef WITH_DIRECT3D11 if (D3D_isenabled(0) == 2) { v = getFromRenderTarget11(ae, true); - } else if (D3D_isenabled(0) == 1) { + } +#endif +#ifdef WITH_DIRECT3D9 + if (D3D_isenabled(0) == 1) { v = getFromRenderTarget(ae, true); - } else { + } +#endif + if (D3D_isenabled(0) == 0) { v = getFromDC (ae); } } diff --git a/od-win32/build68k_msvc/build68k_msvc.vcxproj b/od-win32/build68k_msvc/build68k_msvc.vcxproj index 7b1b3655..10f96765 100644 --- a/od-win32/build68k_msvc/build68k_msvc.vcxproj +++ b/od-win32/build68k_msvc/build68k_msvc.vcxproj @@ -1,22 +1,42 @@  + + FullRelease + ARM64 + FullRelease Win32 + + ReleaseXP + ARM64 + ReleaseXP Win32 + + Release + ARM64 + Release Win32 + + TestRelease + ARM64 + TestRelease Win32 + + Test + ARM64 + Test Win32 @@ -35,6 +55,13 @@ v145 false + + Application + false + Unicode + v145 + false + Application false @@ -42,6 +69,13 @@ v145 false + + Application + false + Unicode + v145 + false + Application false @@ -49,6 +83,13 @@ v142 false + + Application + false + Unicode + v142 + false + Application false @@ -56,6 +97,13 @@ v145 false + + Application + false + Unicode + v145 + false + Application false @@ -63,6 +111,13 @@ v141_xp false + + Application + false + Unicode + v141_xp + false + Application false @@ -70,27 +125,52 @@ v145 false + + Application + false + Unicode + v145 + false + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 @@ -101,11 +181,15 @@ .\Release\ .\Release\ false + false false + false false + false $(Configuration)\ $(Configuration)\ false + false @@ -148,6 +232,50 @@ creating cpudefs.cpp build68k.exe >..\..\cpudefs.cpp <..\..\table68k + + + + + + .\Release/build68k_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/build68k_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting cpudefs.cpp + del ..\..\cpudefs.cpp + + + /MACHINE:I386 %(AdditionalOptions) + build68k.exe + true + .\Release/build68k.pdb + Console + false + + + + + creating cpudefs.cpp + build68k.exe >..\..\cpudefs.cpp <..\..\table68k @@ -193,6 +321,51 @@ creating cpudefs.cpp build68k.exe >..\..\cpudefs.cpp <..\..\table68k del build68k.exe + + + + + + .\Release/build68k_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/build68k_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting cpudefs.cpp + del ..\..\cpudefs.cpp + + + /MACHINE:I386 %(AdditionalOptions) + build68k.exe + true + .\Release/build68k.pdb + Console + false + + + + + creating cpudefs.cpp + build68k.exe >..\..\cpudefs.cpp <..\..\table68k +del build68k.exe @@ -238,6 +411,51 @@ del build68k.exe creating cpudefs.cpp build68k.exe >..\..\cpudefs.cpp <..\..\table68k + + + + + + .\Release/build68k_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/build68k_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting cpudefs.cpp + del ..\..\cpudefs.cpp + + + /MACHINE:I386 %(AdditionalOptions) + build68k.exe + true + .\Release/build68k.pdb + Console + false + + + + + creating cpudefs.cpp + build68k.exe >..\..\cpudefs.cpp <..\..\table68k + @@ -285,6 +503,50 @@ del build68k.exe build68k.exe >..\..\cpudefs.c <..\..\table68k + + + .\Debug/build68k_msvc.tlb + + + %(AdditionalOptions) + Disabled + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;__STDC__;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + .\Debug/build68k_msvc.pch + .\Debug/ + .\Debug/ + .\Debug/ + Level3 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting cpudefs.c + del ..\..\cpudefs.c + + + /MACHINE:I386 %(AdditionalOptions) + build68k.exe + true + true + .\Debug/build68k.pdb + Console + false + + + + + creating cpudefs.c + build68k.exe >..\..\cpudefs.c <..\..\table68k + + .\Release/build68k_msvc.tlb @@ -328,6 +590,49 @@ del build68k.exe build68k.exe >..\..\cpudefs.c <..\..\table68k + + + .\Release/build68k_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/build68k_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting cpudefs.c + del ..\..\cpudefs.c + + + /MACHINE:I386 %(AdditionalOptions) + build68k.exe + true + .\Release/build68k.pdb + Console + false + + + + + creating cpudefs.c + build68k.exe >..\..\cpudefs.c <..\..\table68k + + .\Release/build68k_msvc.tlb @@ -371,6 +676,49 @@ del build68k.exe build68k.exe >..\..\cpudefs.c <..\..\table68k + + + .\Release/build68k_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/build68k_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting cpudefs.c + del ..\..\cpudefs.c + + + /MACHINE:I386 %(AdditionalOptions) + build68k.exe + true + .\Release/build68k.pdb + Console + false + + + + + creating cpudefs.c + build68k.exe >..\..\cpudefs.c <..\..\table68k + + diff --git a/od-win32/cputester/cputester.vcxproj b/od-win32/cputester/cputester.vcxproj index 07b7580f..b63ac048 100644 --- a/od-win32/cputester/cputester.vcxproj +++ b/od-win32/cputester/cputester.vcxproj @@ -1,6 +1,10 @@ + + Release + ARM64 + Release Win32 @@ -9,6 +13,10 @@ Release x64 + + Test + ARM64 + Test Win32 @@ -45,6 +53,12 @@ v145 Unicode + + Application + true + v145 + Unicode + Application false @@ -52,6 +66,13 @@ true Unicode + + Application + false + v145 + true + Unicode + @@ -66,9 +87,15 @@ + + + + + + c:\dev\include;$(IncludePath) @@ -81,11 +108,19 @@ $(IncludePath) + + $(IncludePath) + c:\dev\include;$(IncludePath) C:\dev\lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) cputestgen64 + + c:\dev\include;$(IncludePath) + C:\dev\lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) + cputestgen64 + Level3 @@ -142,6 +177,22 @@ Console + + + Level3 + Disabled + true + true + ..\..\include;..\..;..\ + 4996 + _MBCS;%(PreprocessorDefinitions);CPUEMU_90;CPUEMU_91;CPUEMU_92;CPUEMU_93;CPUEMU_94;CPUEMU_95;CPU_TESTER + FastCall + CompileAsCpp + + + Console + + Level3 @@ -163,6 +214,27 @@ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);zlibstat.lib + + + Level3 + MaxSpeed + true + true + true + true + ..\..\include;..\..;..\ + 4996 + _MBCS;%(PreprocessorDefinitions);CPUEMU_90;CPUEMU_91;CPUEMU_92;CPUEMU_93;CPUEMU_94;CPUEMU_95;CPU_TESTER + FastCall + CompileAsCpp + + + Console + true + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);zlibstat.lib + + diff --git a/od-win32/cputester_m68k/cputester_m68k.vcxproj b/od-win32/cputester_m68k/cputester_m68k.vcxproj index f4001ebd..e5d244b7 100644 --- a/od-win32/cputester_m68k/cputester_m68k.vcxproj +++ b/od-win32/cputester_m68k/cputester_m68k.vcxproj @@ -1,6 +1,10 @@ + + Release + ARM64 + Release Win32 @@ -31,6 +35,13 @@ true MultiByte + + Application + false + v145 + true + MultiByte + @@ -42,6 +53,9 @@ + + + @@ -75,6 +89,21 @@ true + + + Level3 + MaxSpeed + true + true + true + true + + + Console + true + true + + diff --git a/od-win32/direct3d.cpp b/od-win32/direct3d.cpp index 6968a96a..0f44b270 100644 --- a/od-win32/direct3d.cpp +++ b/od-win32/direct3d.cpp @@ -6,7 +6,10 @@ #include "sysconfig.h" #include "sysdeps.h" -#if defined (D3D) && defined (GFXFILTER) +int forcedframelatency = -1; +int fakemodewaitms; + +#if defined (D3D) && defined (GFXFILTER) && defined(WITH_DIRECT3D9) #define D3DXFX_LARGEADDRESS_HANDLE #ifdef D3DXFX_LARGEADDRESS_HANDLE @@ -35,7 +38,6 @@ #include "threaddep\thread.h" extern int D3DEX, shaderon, d3ddebug; -int forcedframelatency = -1; #include #include @@ -51,8 +53,6 @@ static bool debugcolors; static bool noclear; static bool cannoclear; -int fakemodewaitms; - static int leds[LED_MAX]; static const TCHAR *overlayleds[] = { @@ -3992,19 +3992,6 @@ static void xD3D_refresh (int monid) } } -void D3D_getpixelformat (int *rb, int *gb, int *bb, int *rs, int *gs, int *bs, int *ab, int *as, int *a) -{ - *rb = 8; - *gb = 8; - *bb = 8; - *ab = 8; - *rs = 16; - *gs = 8; - *bs = 0; - *as = 24; - *a = 0; -} - static float xD3D_getrefreshrate(int monid) { struct d3dstruct *d3d = &d3ddata[monid]; diff --git a/od-win32/direct3d11.cpp b/od-win32/direct3d11.cpp index 7fc9562d..5416e9b7 100644 --- a/od-win32/direct3d11.cpp +++ b/od-win32/direct3d11.cpp @@ -3,6 +3,11 @@ #include +#include "sysconfig.h" +#include "sysdeps.h" + +#ifdef WITH_DIRECT3D11 + #include #include #include @@ -11,9 +16,6 @@ #include using Microsoft::WRL::ComPtr; -#include "sysconfig.h" -#include "sysdeps.h" - #include "options.h" #include "xwin.h" #include "render.h" @@ -5686,15 +5688,37 @@ void d3d11_select(void) D3D_paint = NULL; } +#endif + +void D3D_getpixelformat(int *rb, int *gb, int *bb, int *rs, int *gs, int *bs, int *ab, int *as, int *a) +{ + *rb = 8; + *gb = 8; + *bb = 8; + *ab = 8; + *rs = 16; + *gs = 8; + *bs = 0; + *as = 24; + *a = 0; +} + void d3d_select(struct uae_prefs *p) { + bool selected = false; + for (int i = 0; i < MAX_AMIGAMONITORS; i++) { d3d11data[i].num = i; } - if (p->gfx_api == 0) + if (p->gfx_api == 0) { gdi_select(); - else if (p->gfx_api >= 2) + } else if (p->gfx_api >= 2) { +#ifdef WITH_DIRECT3D11 d3d11_select(); - else +#endif + } else { +#ifdef WITH_DIRECT3D9 d3d9_select(); +#endif + } } diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj index 487e791c..8253c0c8 100644 --- a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj +++ b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj @@ -1,22 +1,42 @@  + + FullRelease + ARM64 + FullRelease Win32 + + ReleaseXP + ARM64 + ReleaseXP Win32 + + Release + ARM64 + Release Win32 + + TestRelease + ARM64 + TestRelease Win32 + + Test + ARM64 + Test Win32 @@ -35,6 +55,13 @@ v145 false + + Application + false + MultiByte + v145 + false + Application false @@ -42,6 +69,13 @@ v145 false + + Application + false + MultiByte + v145 + false + Application false @@ -49,6 +83,13 @@ v145 false + + Application + false + Unicode + v145 + false + Application false @@ -56,6 +97,13 @@ v141_xp false + + Application + false + Unicode + v141_xp + false + Application false @@ -63,24 +111,46 @@ v145 false + + Application + false + Unicode + v145 + false + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 @@ -91,14 +161,19 @@ .\Release\ .\Release\ false + false false + false false + false $(Configuration)\ $(Configuration)\ false + false $(Configuration)\ $(Configuration)\ false + false @@ -148,6 +223,57 @@ genblitter.exe f >..\..\blitfunc.cpp genblitter.exe h >..\..\blitfunc.h genblitter.exe t >..\..\blittable.cpp del genblitter.exe + + + + + + .\Release/genblitter_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/genblitter_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting blitter files + del ..\..\blit.h +del ..\..\blitfunc.cpp +del ..\..\blitfunc.h +del ..\..\blittable.cpp + + + /MACHINE:I386 %(AdditionalOptions) + genblitter.exe + true + .\Release/genblitter.pdb + Console + false + + + + + generating blitter files + genblitter.exe i >..\..\blit.h +genblitter.exe f >..\..\blitfunc.cpp +genblitter.exe h >..\..\blitfunc.h +genblitter.exe t >..\..\blittable.cpp +del genblitter.exe @@ -199,6 +325,57 @@ genblitter.exe f >..\..\blitfunc.cpp genblitter.exe h >..\..\blitfunc.h genblitter.exe t >..\..\blittable.cpp del genblitter.exe + + + + + + .\Release/genblitter_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/genblitter_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting blitter files + del ..\..\blit.h +del ..\..\blitfunc.cpp +del ..\..\blitfunc.h +del ..\..\blittable.cpp + + + /MACHINE:I386 %(AdditionalOptions) + genblitter.exe + true + .\Release/genblitter.pdb + Console + false + + + + + generating blitter files + genblitter.exe i >..\..\blit.h +genblitter.exe f >..\..\blitfunc.cpp +genblitter.exe h >..\..\blitfunc.h +genblitter.exe t >..\..\blittable.cpp +del genblitter.exe @@ -250,6 +427,57 @@ genblitter.exe f >..\..\blitfunc.cpp genblitter.exe h >..\..\blitfunc.h genblitter.exe t >..\..\blittable.cpp del genblitter.exe + + + + + + .\Release/genblitter_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/genblitter_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting blitter files + del ..\..\blit.h +del ..\..\blitfunc.cpp +del ..\..\blitfunc.h +del ..\..\blittable.cpp + + + /MACHINE:I386 %(AdditionalOptions) + genblitter.exe + true + .\Release/genblitter.pdb + Console + false + + + + + generating blitter files + genblitter.exe i >..\..\blit.h +genblitter.exe f >..\..\blitfunc.cpp +genblitter.exe h >..\..\blitfunc.h +genblitter.exe t >..\..\blittable.cpp +del genblitter.exe @@ -301,6 +529,57 @@ del ..\..\blittable.c genblitter.exe f >..\..\blitfunc.c genblitter.exe h >..\..\blitfunc.h genblitter.exe t >..\..\blittable.c + + + + + + .\Release/genblitter_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/genblitter_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + deleting blitter files + del ..\..\blit.h +del ..\..\blitfunc.c +del ..\..\blitfunc.h +del ..\..\blittable.c + + + + /MACHINE:I386 %(AdditionalOptions) + genblitter.exe + true + .\Release/genblitter.pdb + Console + false + + + + + generating blitter files + genblitter.exe i >..\..\blit.h +genblitter.exe f >..\..\blitfunc.c +genblitter.exe h >..\..\blitfunc.h +genblitter.exe t >..\..\blittable.c @@ -309,6 +588,11 @@ genblitter.exe t >..\..\blittable.c ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + + + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + + diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj index e0a948e0..82e5317f 100644 --- a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj +++ b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj @@ -1,18 +1,34 @@  + + FullRelease + ARM64 + FullRelease Win32 + + ReleaseXP + ARM64 + ReleaseXP Win32 + + Release + ARM64 + Release Win32 + + Test + ARM64 + Test Win32 @@ -31,6 +47,13 @@ v145 false + + Application + false + Unicode + v145 + false + Application false @@ -39,6 +62,14 @@ v145 false + + Application + false + false + Unicode + v145 + false + Application false @@ -47,6 +78,14 @@ v141_xp false + + Application + false + false + Unicode + v141_xp + false + Application false @@ -55,21 +94,41 @@ v145 false + + Application + false + false + Unicode + v145 + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 @@ -80,11 +139,15 @@ .\Release\ .\Release\ false + false false + false false + false $(Configuration)\ $(Configuration)\ false + false @@ -126,6 +189,49 @@ od-win32\gencomp_msvc\gencomp.exe del od-win32\gencomp_msvc\gencomp.exe + + + + + + .\Release/gencomp_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + UAE;WINUAE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/gencomp_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + gencomp.exe + true + .\Release/gencomp.pdb + Console + false + + + + + generating gencomp files + cd ..\.. +od-win32\gencomp_msvc\gencomp.exe +del od-win32\gencomp_msvc\gencomp.exe + @@ -169,6 +275,49 @@ del od-win32\gencomp_msvc\gencomp.exe od-win32\gencomp_msvc\gencomp.exe del od-win32\gencomp_msvc\gencomp.exe + + + + + + .\Release/gencomp_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + UAE;WINUAE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/gencomp_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + gencomp.exe + true + .\Release/gencomp.pdb + Console + false + + + + + generating gencomp files + cd ..\.. +od-win32\gencomp_msvc\gencomp.exe +del od-win32\gencomp_msvc\gencomp.exe + @@ -212,6 +361,49 @@ del od-win32\gencomp_msvc\gencomp.exe od-win32\gencomp_msvc\gencomp.exe del od-win32\gencomp_msvc\gencomp.exe + + + + + + .\Release/gencomp_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + UAE;WINUAE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/gencomp_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + gencomp.exe + true + .\Release/gencomp.pdb + Console + false + + + + + generating gencomp files + cd ..\.. +od-win32\gencomp_msvc\gencomp.exe +del od-win32\gencomp_msvc\gencomp.exe + @@ -253,6 +445,47 @@ del od-win32\gencomp_msvc\gencomp.exe generating gencomp files cd ..\.. od-win32\gencomp_msvc\gencomp.exe + + + + + + .\Release/gencomp_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + UAE;WINUAE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/gencomp_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /MACHINE:I386 %(AdditionalOptions) + gencomp.exe + true + .\Release/gencomp.pdb + Console + false + + + + + generating gencomp files + cd ..\.. +od-win32\gencomp_msvc\gencomp.exe diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj index 2ea3e319..3d441c4e 100644 --- a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj +++ b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj @@ -1,18 +1,34 @@  + + FullRelease + ARM64 + FullRelease Win32 + + ReleaseXP + ARM64 + ReleaseXP Win32 + + Release + ARM64 + Release Win32 + + Test + ARM64 + Test Win32 @@ -31,6 +47,13 @@ v145 false + + Application + false + Unicode + v145 + false + Application false @@ -38,6 +61,13 @@ v145 false + + Application + false + Unicode + v145 + false + Application false @@ -45,6 +75,13 @@ v141_xp false + + Application + false + Unicode + v141_xp + false + Application false @@ -52,21 +89,40 @@ v145 false + + Application + false + Unicode + v145 + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 @@ -77,27 +133,46 @@ .\Release\ .\Release\ false + false false + false false + false false + false false + false false + false $(Configuration)\ $(Configuration)\ false + false false + + false + false + + false + false + + false + false + + false + .\Release/gencpu_msvc.tlb @@ -142,6 +217,53 @@ generating gencpu files cd ..\..\ +.\od-win32\gencpu_msvc\gencpu.exe + + + + + .\Release/gencpu_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/gencpu_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + Cdecl + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + /MACHINE:I386 %(AdditionalOptions) + gencpu.exe + true + .\Release/gencpu.pdb + Console + false + + + + + generating gencpu files + cd ..\..\ .\od-win32\gencpu_msvc\gencpu.exe @@ -189,6 +311,53 @@ generating gencpu files cd ..\..\ +.\od-win32\gencpu_msvc\gencpu.exe + + + + + .\Release/gencpu_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/gencpu_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + Cdecl + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + /MACHINE:I386 %(AdditionalOptions) + gencpu.exe + true + .\Release/gencpu.pdb + Console + false + + + + + generating gencpu files + cd ..\..\ .\od-win32\gencpu_msvc\gencpu.exe @@ -237,6 +406,54 @@ generating gencpu files cd ..\..\ +.\od-win32\gencpu_msvc\gencpu.exe + + + + + .\Release/gencpu_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/gencpu_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + Cdecl + Disabled + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + /MACHINE:I386 %(AdditionalOptions) + gencpu.exe + true + .\Release/gencpu.pdb + Console + false + + + + + generating gencpu files + cd ..\..\ .\od-win32\gencpu_msvc\gencpu.exe @@ -283,6 +500,52 @@ generating gencpu files cd ..\..\ +.\od-win32\gencpu_msvc\gencpu.exe + + + + + .\Release/gencpu_msvc.tlb + + + %(AdditionalOptions) + OnlyExplicitInline + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + MultiThreaded + true + .\Release/gencpu_msvc.pch + .\Release/ + .\Release/ + .\Release/ + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + /MACHINE:I386 %(AdditionalOptions) + gencpu.exe + true + .\Release/gencpu.pdb + Console + false + + + + + generating gencpu files + cd ..\..\ .\od-win32\gencpu_msvc\gencpu.exe diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj index 2f0dc8c4..0a4c18e1 100644 --- a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj +++ b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj @@ -1,18 +1,34 @@  + + FullRelease + ARM64 + FullRelease Win32 + + ReleaseXP + ARM64 + ReleaseXP Win32 + + Release + ARM64 + Release Win32 + + Test + ARM64 + Test Win32 @@ -33,6 +49,13 @@ v145 false + + Application + Unicode + true + v145 + false + Application Unicode @@ -40,6 +63,13 @@ v145 false + + Application + Unicode + true + v145 + false + Application Unicode @@ -47,6 +77,13 @@ v141_xp false + + Application + Unicode + true + v141_xp + false + Application Unicode @@ -54,21 +91,40 @@ v145 false + + Application + Unicode + true + v145 + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 @@ -79,11 +135,15 @@ $(Configuration)\ $(Configuration)\ false + false false + false false + false $(SolutionDir)$(Configuration)\ $(Configuration)\ false + false @@ -119,6 +179,42 @@ generating linetoscr.cpp genlinetoscr.exe del genlinetoscr.exe + + + + + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + ..\..\include;..\..;..\ + + + deleteing linetoscr.cpp + del ..\..\linetoscr.cpp + + + + genlinetoscr.exe + true + Console + true + true + false + + + + + generating linetoscr.cpp + genlinetoscr.exe +del genlinetoscr.exe @@ -156,6 +252,42 @@ del genlinetoscr.exe generating linetoscr.c genlinetoscr.exe >..\..\linetoscr.cpp del genlinetoscr.exe + + + + + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + ..\..\include;..\..;..\ + + + deleteing linetoscr.cpp + del ..\..\linetoscr.cpp + + + + genlinetoscr.exe + true + Console + true + true + false + + + + + generating linetoscr.c + genlinetoscr.exe >..\..\linetoscr.cpp +del genlinetoscr.exe @@ -193,6 +325,42 @@ del genlinetoscr.exe generating linetoscr.cpp genlinetoscr.exe del genlinetoscr.exe + + + + + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + ..\..\include;..\..;..\ + + + deleteing linetoscr.cpp + del ..\..\linetoscr.cpp + + + + genlinetoscr.exe + true + Console + true + true + false + + + + + generating linetoscr.cpp + genlinetoscr.exe +del genlinetoscr.exe @@ -229,6 +397,41 @@ del genlinetoscr.exe generating linetoscr.cpp genlinetoscr.exe del genlinetoscr.exe + + + + + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + ..\..\include;..\..;..\ + + + deleteing linetoscr.c + del ..\..\linetoscr.c + + + genlinetoscr.exe + true + Console + true + true + false + + + + + generating linetoscr.cpp + genlinetoscr.exe +del genlinetoscr.exe diff --git a/od-win32/parser.cpp b/od-win32/parser.cpp index 8d9ff4fc..cb167703 100644 --- a/od-win32/parser.cpp +++ b/od-win32/parser.cpp @@ -1461,7 +1461,9 @@ void initparallel (void) calltrap (deftrapres (ahi_demux, 0, _T("ahi_winuae"))); dw (RTS); org (a); +#ifdef AHI_v2 init_ahi_v2 (); +#endif } } diff --git a/od-win32/prowizard/prowizard.vcxproj b/od-win32/prowizard/prowizard.vcxproj index 1849e2f4..4b24ce8c 100644 --- a/od-win32/prowizard/prowizard.vcxproj +++ b/od-win32/prowizard/prowizard.vcxproj @@ -1,13 +1,13 @@  - - ReleaseXP - Win32 + + Release + ARM64 - - ReleaseXP - x64 + + Release + ARM64EC Release @@ -17,6 +17,14 @@ Release x64 + + Test + ARM64 + + + Test + ARM64EC + Test Win32 @@ -40,33 +48,44 @@ v145 false - + StaticLibrary Unicode false v145 false - + StaticLibrary Unicode false v145 - false - + + StaticLibrary + Unicode + false + v145 + + + StaticLibrary + Unicode + false + v145 + + StaticLibrary Unicode true v145 - + StaticLibrary Unicode true - v141_xp + v145 - + StaticLibrary Unicode true @@ -78,38 +97,53 @@ - - - - + + + + + + + + + + - $(SolutionDir)$(Configuration)\..\..\lib\ - $(SolutionDir)$(Configuration)\..\..\lib\ + c:\dev\lib\x86 $(SolutionDir)$(Configuration)\..\..\lib\ $(Configuration)\ - $(Configuration)\ $(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ - $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ + c:\dev\lib\x64 + c:\dev\lib\arm64ec $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ + $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ + $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ $(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(ProjectName)_x64 - $(ProjectName)_x64 + $(ProjectName)_arm64 + $(ProjectName)_arm64ec $(ProjectName)_x64 + $(ProjectName)_x64 + $(ProjectName)_x64 + + + c:\dev\lib\arm64\ @@ -126,19 +160,19 @@ Level3 ProgramDatabase FastCall - Default + CompileAsCpp 4996;%(DisableSpecificWarnings) + Sync $(OutDir)$(TargetName)$(TargetExt) - - + %(ExportNamedFunctions);prowizard_search false - + MaxSpeed true @@ -152,7 +186,7 @@ Level3 ProgramDatabase - FastCall + StdCall Default 4996;%(DisableSpecificWarnings) @@ -165,7 +199,10 @@ false - + + + X64 + MaxSpeed true @@ -179,23 +216,20 @@ Level3 ProgramDatabase - StdCall - Default + FastCall + CompileAsCpp 4996;%(DisableSpecificWarnings) $(OutDir)$(TargetName)$(TargetExt) - - + %(ExportNamedFunctions);prowizard_search false - - - X64 - + + MaxSpeed true @@ -210,21 +244,19 @@ Level3 ProgramDatabase FastCall - Default + CompileAsCpp 4996;%(DisableSpecificWarnings) $(OutDir)$(TargetName)$(TargetExt) - prowizard_search;%(ExportNamedFunctions) + %(ExportNamedFunctions);prowizard_search false - - - X64 - + + MaxSpeed true @@ -239,14 +271,14 @@ Level3 ProgramDatabase FastCall - Default + CompileAsCpp 4996;%(DisableSpecificWarnings) $(OutDir)$(TargetName)$(TargetExt) - prowizard_search;%(ExportNamedFunctions) + %(ExportNamedFunctions);prowizard_search false @@ -279,6 +311,60 @@ false + + + + MaxSpeed + true + false + ..\..\prowizard\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + + + Level3 + ProgramDatabase + StdCall + Default + 4996;%(DisableSpecificWarnings) + + + $(OutDir)$(TargetName)$(TargetExt) + + + prowizard_search;%(ExportNamedFunctions) + false + + + + + + MaxSpeed + true + false + ..\..\prowizard\include;..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + false + true + + + Level3 + ProgramDatabase + StdCall + Default + 4996;%(DisableSpecificWarnings) + + + $(OutDir)$(TargetName)$(TargetExt) + + + prowizard_search;%(ExportNamedFunctions) + false + + diff --git a/od-win32/screenshot.cpp b/od-win32/screenshot.cpp index eac426f5..fe194268 100644 --- a/od-win32/screenshot.cpp +++ b/od-win32/screenshot.cpp @@ -424,6 +424,7 @@ donormal: width = state->Width; height = state->Height; } +#ifdef WITH_DIRECT3D11 if (D3D_isenabled(0) == 2) { int w, h, bits, pitch; void *data; @@ -466,8 +467,10 @@ donormal: if (got) D3D11_capture(monid, NULL, NULL, NULL, NULL, NULL, renderTarget); d3dcaptured = true; - - } else if (D3D_isenabled(0) == 1) { + } +#endif +#ifdef WITH_DIRECT3D9 + if (D3D_isenabled(0) == 1) { int w, h, bits; HRESULT hr; D3DLOCKED_RECT l; @@ -513,8 +516,8 @@ donormal: d3dcaptured = true; } } - } +#endif if (!d3dcaptured) { surface_dc = gethdc(monid); surface_dc_monid = monid; diff --git a/od-win32/sounddep/sound.cpp b/od-win32/sounddep/sound.cpp index ffb60310..8f904369 100644 --- a/od-win32/sounddep/sound.cpp +++ b/od-win32/sounddep/sound.cpp @@ -34,14 +34,17 @@ #include #include #include + +#ifdef WITH_OPENAL #include #include - +#endif +#ifdef WITH_PORTAUDIO #include +#endif #include "sounddep/sound.h" -#define USE_XAUDIO 0 #define WASAPI_SESSION_NOTIFICATION 0 struct sound_dp @@ -60,6 +63,7 @@ struct sound_dp int max_sndbufsize; int snd_configsize; +#ifdef WITH_OPENAL // openal #define AL_BUFFERS 2 @@ -72,8 +76,9 @@ struct sound_dp DWORD al_format; uae_u8 *al_bigbuffer; int al_bufsize, al_offset; +#endif - +#ifdef WITH_PORTAUDIO // portaudio #define PA_BUFFERSIZE (262144 * 4) @@ -84,6 +89,7 @@ struct sound_dp int paframesperbuffer; PaStream *pastream; int pavolume; +#endif // wasapi @@ -112,7 +118,7 @@ struct sound_dp int pullbuffermaxlen; bool gotpullevent; -#if USE_XAUDIO +#ifdef WITH_XAUDIO // xaudio2 #define XA_BUFFERS 8 @@ -316,7 +322,7 @@ static void clearbuffer (struct sound_data *sd) } } -#if USE_XAUDIO +#ifdef WITH_XAUDIO static void pause_audio_xaudio2 (struct sound_data *sd) { struct sound_dp *s = sd->data; @@ -448,6 +454,7 @@ static void resume_audio_ds (struct sound_data *sd) s->avg_correct = 0; s->cnt_correct = 0; } +#ifdef WITH_PORTAUDIO static void pause_audio_pa (struct sound_data *sd) { struct sound_dp *s = sd->data; @@ -466,6 +473,8 @@ static void resume_audio_pa (struct sound_data *sd) write_log (_T("PASOUND: Pa_StartStream() error %d (%s)\n"), err, Pa_GetErrorText (err)); sd->paused = 0; } +#endif +#ifdef WITH_OPENAL static void pause_audio_al (struct sound_data *sd) { struct sound_dp *s = sd->data; @@ -478,7 +487,7 @@ static void resume_audio_al (struct sound_data *sd) sd->waiting_for_buffer = 1; s->al_offset = 0; } - +#endif static int restore_ds (struct sound_data *sd, DWORD hr) { struct sound_dp *s = sd->data; @@ -523,12 +532,16 @@ void set_volume_sound_device (struct sound_data *sd, int volume, int mute) if (!s) { return; } +#ifdef WITH_OPENAL if (sd->devicetype == SOUND_DEVICE_AL) { float vol = 0.0f; if (volume < 100.0f && !mute) vol = (100.0f - volume) / 100.0f; alSourcef (s->al_Source, AL_GAIN, vol); - } else if (sd->devicetype == SOUND_DEVICE_DS) { + + } +#endif + if (sd->devicetype == SOUND_DEVICE_DS) { LONG vol = DSBVOLUME_MIN; if (volume < 100 && !mute) vol = (LONG)((DSBVOLUME_MIN / 2) + (-DSBVOLUME_MIN / 2) * log (1 + (2.718281828 - 1) * (1 - volume / 100.0))); @@ -549,13 +562,17 @@ void set_volume_sound_device (struct sound_data *sd, int volume, int mute) write_log (_T("pAudioVolume->SetMute(%d) failed: %08Xs\n"), mute, hr); } #endif - } else if (sd->devicetype == SOUND_DEVICE_PA) { + } +#ifdef WITH_PORTAUDIO + if (sd->devicetype == SOUND_DEVICE_PA) { s->pavolume = volume; -#if USE_XAUDIO - } else if (sd->devicetype == SOUND_DEVICE_XAUDIO2) { + } +#endif +#ifdef WITH_XAUDIO + if (sd->devicetype == SOUND_DEVICE_XAUDIO2) { s->xmaster->SetVolume (mute ? 0.0 : (float)(100 - volume) / 100.0); #endif - } else if (sd->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE || sd->devicetype == SOUND_DEVICE_WASAPI) { + if (sd->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE || sd->devicetype == SOUND_DEVICE_WASAPI) { sd->softvolume = -1; hr = s->pAudioVolume->SetMasterVolume (1.0, NULL); wasapi_check_state(sd, hr); @@ -685,6 +702,7 @@ static void finish_sound_buffer_pull(struct sound_data *sd, uae_u16 *sndbuffer) s->pullbufferlen += sd->sndbufsize; } +#ifdef WITH_PORTAUDIO static void finish_sound_buffer_pa (struct sound_data *sd, uae_u16 *sndbuffer) { struct sound_dp *s = sd->data; @@ -698,7 +716,9 @@ static void finish_sound_buffer_pa (struct sound_data *sd, uae_u16 *sndbuffer) } finish_sound_buffer_pull(sd, sndbuffer); } +#endif +#ifdef WITH_PORTAUDIO static int _cdecl portAudioCallback (const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo* timeInfo, @@ -852,7 +872,9 @@ end: close_audio_pa (sd); return 0; } +#endif +#ifdef WITH_OPENAL static void close_audio_al (struct sound_data *sd) { struct sound_dp *s = sd->data; @@ -935,6 +957,7 @@ error: close_audio_al (sd); return 0; } +#endif static void setwavfmt (WAVEFORMATEXTENSIBLE *wavfmt, struct sound_data *sd, DWORD channelmask) { @@ -951,7 +974,7 @@ static void setwavfmt (WAVEFORMATEXTENSIBLE *wavfmt, struct sound_data *sd, DWOR wavfmt->Format.nAvgBytesPerSec = wavfmt->Format.nBlockAlign * wavfmt->Format.nSamplesPerSec; } -#if USE_XAUDIO +#ifdef WITH_XAUDIO static void close_audio_xaudio2 (struct sound_data *sd) { struct sound_dp *s = sd->data; @@ -1890,17 +1913,26 @@ int open_sound_device (struct sound_data *sd, int index, int bufsize, int freq, sd->channels = channels; sd->paused = 1; sd->index = index; - if (type == SOUND_DEVICE_AL) +#ifdef WITH_OPENAL + if (type == SOUND_DEVICE_AL) { ret = open_audio_al (sd, index); - else if (type == SOUND_DEVICE_DS) + } +#endif + if (type == SOUND_DEVICE_DS) { ret = open_audio_ds (sd, index); - else if (type == SOUND_DEVICE_PA) + } +#ifdef WITH_PORTAUDIO + if (type == SOUND_DEVICE_PA) { ret = open_audio_pa (sd, index); - else if (type == SOUND_DEVICE_WASAPI || type == SOUND_DEVICE_WASAPI_EXCLUSIVE) + } +#endif + if (type == SOUND_DEVICE_WASAPI || type == SOUND_DEVICE_WASAPI_EXCLUSIVE) { ret = open_audio_wasapi (sd, index, type == SOUND_DEVICE_WASAPI_EXCLUSIVE); -#if USE_XAUDIO - else if (type == SOUND_DEVICE_XAUDIO2) + } +#ifdef WITH_XAUDIO + if (type == SOUND_DEVICE_XAUDIO2) { ret = open_audio_xaudio2 (sd, index); + } #endif sd->samplesize = sd->channels * 2; sd->sndbufframes = sd->sndbufsize / sd->samplesize; @@ -1909,17 +1941,26 @@ int open_sound_device (struct sound_data *sd, int index, int bufsize, int freq, void close_sound_device (struct sound_data *sd) { pause_sound_device (sd); - if (sd->devicetype == SOUND_DEVICE_AL) +#ifdef WITH_OPENAL + if (sd->devicetype == SOUND_DEVICE_AL) { close_audio_al (sd); - else if (sd->devicetype == SOUND_DEVICE_DS) + } +#endif + if (sd->devicetype == SOUND_DEVICE_DS) { close_audio_ds (sd); - else if (sd->devicetype == SOUND_DEVICE_PA) + } +#ifdef WITH_PORTAUDIO + if (sd->devicetype == SOUND_DEVICE_PA) { close_audio_pa (sd); - else if (sd->devicetype == SOUND_DEVICE_WASAPI || sd->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE) + } +#endif + if (sd->devicetype == SOUND_DEVICE_WASAPI || sd->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE) { close_audio_wasapi (sd); -#if USE_XAUDIO - else if (sd->devicetype == SOUND_DEVICE_XAUDIO2) + } +#ifdef WITH_XAUDIO + if (sd->devicetype == SOUND_DEVICE_XAUDIO2) { close_audio_xaudio2 (sd); + } #endif xfree (sd->data); sd->data = NULL; @@ -1931,17 +1972,26 @@ void pause_sound_device (struct sound_data *sd) sd->paused = 1; gui_data.sndbuf_status = 0; gui_data.sndbuf = 0; - if (sd->devicetype == SOUND_DEVICE_AL) +#ifdef WITH_OPENAL + if (sd->devicetype == SOUND_DEVICE_AL) { pause_audio_al (sd); - else if (sd->devicetype == SOUND_DEVICE_DS) + } +#endif + if (sd->devicetype == SOUND_DEVICE_DS) { pause_audio_ds (sd); - else if (sd->devicetype == SOUND_DEVICE_PA) + } +#ifdef WITH_PORTAUDIO + if (sd->devicetype == SOUND_DEVICE_PA) { pause_audio_pa (sd); - else if (sd->devicetype == SOUND_DEVICE_WASAPI || sd->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE) + } +#endif + if (sd->devicetype == SOUND_DEVICE_WASAPI || sd->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE) { pause_audio_wasapi (sd); -#if USE_XAUDIO - else if (sd->devicetype == SOUND_DEVICE_XAUDIO2) + } +#ifdef WITH_XAUDIO + if (sd->devicetype == SOUND_DEVICE_XAUDIO2) { pause_audio_xaudio2 (sd); + } #endif if (s->pullevent) ResetEvent(s->pullevent); @@ -1951,17 +2001,26 @@ void pause_sound_device (struct sound_data *sd) void resume_sound_device (struct sound_data *sd) { struct sound_dp *s = sd->data; - if (sd->devicetype == SOUND_DEVICE_AL) +#ifdef WITH_OPENAL + if (sd->devicetype == SOUND_DEVICE_AL) { resume_audio_al (sd); - else if (sd->devicetype == SOUND_DEVICE_DS) + } +#endif + if (sd->devicetype == SOUND_DEVICE_DS) { resume_audio_ds (sd); - else if (sd->devicetype == SOUND_DEVICE_PA) + } +#ifdef WITH_PORTAUDIO + if (sd->devicetype == SOUND_DEVICE_PA) { resume_audio_pa (sd); - else if (sd->devicetype == SOUND_DEVICE_WASAPI || sd->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE) + } +#endif + if (sd->devicetype == SOUND_DEVICE_WASAPI || sd->devicetype == SOUND_DEVICE_WASAPI_EXCLUSIVE) { resume_audio_wasapi (sd); -#if USE_XAUDIO - else if (sd->devicetype == SOUND_DEVICE_XAUDIO2) + } +#ifdef WITH_XAUDIO + if (sd->devicetype == SOUND_DEVICE_XAUDIO2) { resume_audio_xaudio2 (sd); + } #endif if (s->pullevent) ResetEvent(s->pullevent); @@ -2144,6 +2203,7 @@ void restart_sound_buffer (void) restart_sound_buffer2 (sdp); } +#if WITH_OPENAL static int alcheck (struct sound_data *sd, int v) { struct sound_dp *s = sd->data; @@ -2270,8 +2330,9 @@ static void finish_sound_buffer_al (struct sound_data *sd, uae_u16 *sndbuffer) alcheck (sd, 0); } +#endif -#if USE_XAUDIO +#ifdef WITH_XAUDIO static void finish_sound_buffer_xaudio2 (struct sound_data *sd, uae_u16 *sndbuffer) { struct sound_dp *s = sd->data; @@ -2672,17 +2733,26 @@ static void send_sound (struct sound_data *sd, uae_u16 *sndbuffer) p[i] = p[i] * sd->softvolume / 32768; } } - if (type == SOUND_DEVICE_AL) +#ifdef WITH_OPENAL + if (type == SOUND_DEVICE_AL) { finish_sound_buffer_al (sd, sndbuffer); - else if (type == SOUND_DEVICE_DS) + } +#endif + if (type == SOUND_DEVICE_DS) { finish_sound_buffer_ds (sd, sndbuffer); - else if (type == SOUND_DEVICE_PA) + } +#ifdef WITH_PORTAUDIO + if (type == SOUND_DEVICE_PA) { finish_sound_buffer_pa (sd, sndbuffer); - else if (type == SOUND_DEVICE_WASAPI || type == SOUND_DEVICE_WASAPI_EXCLUSIVE) + } +#endif + if (type == SOUND_DEVICE_WASAPI || type == SOUND_DEVICE_WASAPI_EXCLUSIVE) { finish_sound_buffer_wasapi (sd, sndbuffer); -#if USE_XAUDIO - else if (type == SOUND_DEVICE_XAUDIO2) + } +#ifdef WITH_XAUDIO + if (type == SOUND_DEVICE_XAUDIO2) { finish_sound_buffer_xaudio2 (sd, sndbuffer); + } #endif } @@ -3024,6 +3094,7 @@ static void wasapi_enum (struct sound_device **sdp) } +#if WITH_OPENAL static void OpenALEnumerate (struct sound_device **sds, const char *pDeviceNames, const char *ppDefaultDevice, int skipdetect) { while (pDeviceNames && *pDeviceNames) { @@ -3086,8 +3157,9 @@ static void OpenALEnumerate (struct sound_device **sds, const char *pDeviceNames pDeviceNames += strlen (pDeviceNames) + 1; } } +#endif -#if USE_XAUDIO +#ifdef WITH_XAUDIO static void xaudioenumerate (struct sound_device **sds) { IXAudio2 *xaudio2 = NULL; @@ -3124,8 +3196,7 @@ static void xaudioenumerate (struct sound_device **sds) } #endif -#define PORTAUDIO 1 -#if PORTAUDIO +#ifdef WITH_PORTAUDIO static void PortAudioEnumerate (struct sound_device **sds) { int num; @@ -3190,10 +3261,11 @@ int enumerate_sound_devices (void) DirectSoundEnumerate ((LPDSENUMCALLBACK)DSEnumProc, sound_devices); DirectSoundCaptureEnumerate((LPDSENUMCALLBACK)DSEnumProc, record_devices); } -#if USE_XAUDIO +#ifdef WITH_XAUDIO if (sounddrivermask & SOUNDDRIVE_XAUDIO2) xaudioenumerate (sound_devices); #endif +#if WITH_OPENAL if (sounddrivermask & SOUNDDRIVER_OPENAL) { __try { if (isdllversion (_T("openal32.dll"), 6, 14, 357, 22)) { @@ -3216,7 +3288,8 @@ int enumerate_sound_devices (void) flush_log (); } } -#if PORTAUDIO +#endif +#ifdef WITH_PORTAUDIO if (sounddrivermask & SOUNDDRIVER_PORTAUDIO) { __try { #ifdef CPU_64_BIT diff --git a/od-win32/sysconfig.h b/od-win32/sysconfig.h index 074d10ca..7cdc3d02 100644 --- a/od-win32/sysconfig.h +++ b/od-win32/sysconfig.h @@ -24,7 +24,7 @@ #endif #endif #define WINDOWS -#define ZLIB_WINAPI +#define ZEXPORT _cdecl #define PACKAGE_STRING "WinUAE" #ifndef UAE_MINI @@ -121,6 +121,11 @@ #define WITH_DSP #define WITH_DRACO #define WITH_MIDI +#define WITH_PORTAUDIO +#define WITH_AL +#define WITH_LIBMPEG2 +#define WITH_DIRECT3D11 +#define WITH_DIRECT3D9 #else @@ -138,6 +143,15 @@ #define CPUEMU_13 #define CPUEMU_11 +#endif + +#ifdef ARM64 + +#undef SERIAL_ENET +#undef WITH_PORTAUDIO +#undef WITH_AL +#undef WITH_LUA +#undef WITH_DIRECT3D9 #endif diff --git a/od-win32/uaeunp/uaeunp.vcxproj b/od-win32/uaeunp/uaeunp.vcxproj index 97b6f9ac..11b39394 100644 --- a/od-win32/uaeunp/uaeunp.vcxproj +++ b/od-win32/uaeunp/uaeunp.vcxproj @@ -1,14 +1,26 @@  + + ReleaseXP + ARM64 + ReleaseXP Win32 + + Release + ARM64 + Release Win32 + + Test + ARM64 + Test Win32 @@ -28,6 +40,13 @@ v145 false + + Application + Unicode + true + v145 + false + Application Unicode @@ -35,6 +54,13 @@ v145 false + + Application + Unicode + true + v145 + false + Application Unicode @@ -42,18 +68,34 @@ v145 false + + Application + Unicode + true + v145 + false + + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 @@ -64,14 +106,23 @@ $(Configuration)\ $(Configuration)\ false + false false + false false + false C:\dev\include;$(IncludePath) + C:\dev\include;$(IncludePath) C:\dev\include;$(IncludePath) + C:\dev\include;$(IncludePath) C:\dev\include;$(IncludePath) + C:\dev\include;$(IncludePath) C:\dev\lib;$(LibraryPath) + C:\dev\lib;$(LibraryPath) C:\dev\lib;$(LibraryPath) + C:\dev\lib;$(LibraryPath) C:\dev\lib;$(LibraryPath) + C:\dev\lib;$(LibraryPath) @@ -101,6 +152,33 @@ $(SolutionDir)\..\lib\ + + + MaxSpeed + true + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\tun;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;WIN32_IE=0x0700;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + true + + + Level3 + ProgramDatabase + StdCall + true + Sync + false + + + Shlwapi.lib;zlibstat.lib;wininet.lib;lzmalib.lib;%(AdditionalDependencies) + wininet.dll;%(DelayLoadDLLs) + true + Console + true + true + $(SolutionDir)\..\lib\ + + MaxSpeed @@ -129,6 +207,33 @@ $(SolutionDir)\..\lib\ + + + MaxSpeed + true + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\tun;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;WIN32_IE=0x0700;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + true + + + Level3 + ProgramDatabase + StdCall + true + Sync + false + + + Shlwapi.lib;zlibstat.lib;wininet.lib;lzmalib.lib;%(AdditionalDependencies) + wininet.dll;%(DelayLoadDLLs) + true + Console + true + true + $(SolutionDir)\..\lib\ + + MaxSpeed @@ -157,6 +262,33 @@ $(SolutionDir)\..\lib\ + + + MaxSpeed + true + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\tun;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;WIN32_IE=0x0700;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + true + + + Level3 + ProgramDatabase + StdCall + true + Sync + false + + + zlibstat.lib;wininet.lib;lzmalib.lib;%(AdditionalDependencies) + wininet.dll;%(DelayLoadDLLs) + true + Console + true + true + $(SolutionDir)\..\lib\ + + diff --git a/od-win32/unpackers/unpackers.vcxproj b/od-win32/unpackers/unpackers.vcxproj index d863ed4f..0aebed55 100644 --- a/od-win32/unpackers/unpackers.vcxproj +++ b/od-win32/unpackers/unpackers.vcxproj @@ -1,6 +1,10 @@  + + ReleaseXP + ARM64 + ReleaseXP Win32 @@ -9,6 +13,10 @@ ReleaseXP x64 + + Release + ARM64 + Release Win32 @@ -17,6 +25,10 @@ Release x64 + + Test + ARM64 + Test Win32 @@ -61,6 +73,13 @@ Unicode v145 + + StaticLibrary + false + true + Unicode + v145 + StaticLibrary false @@ -68,6 +87,13 @@ Unicode v141_xp + + StaticLibrary + false + true + Unicode + v141_xp + StaticLibrary false @@ -75,6 +101,13 @@ Unicode v145 + + StaticLibrary + false + true + Unicode + v145 + @@ -90,12 +123,21 @@ + + + + + + + + + $(SolutionDir)$(Configuration)\..\..\lib\ @@ -110,14 +152,26 @@ $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ $(ProjectName)_x64 + + $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ + $(ProjectName)_x64 + $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ $(ProjectName)_x64 + + $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ + $(ProjectName)_x64 + $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ $(ProjectName)_x64 + + $(SolutionDir)$(Platform)\$(Configuration)\..\..\..\lib\ + $(ProjectName)_x64 + Level3 @@ -209,6 +263,25 @@ true + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + StdCall + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + Level3 @@ -228,6 +301,25 @@ true + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + StdCall + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + Level3 @@ -247,6 +339,25 @@ true + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + StdCall + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp index 1f10c08b..cbe387ff 100644 --- a/od-win32/win32.cpp +++ b/od-win32/win32.cpp @@ -375,7 +375,7 @@ void target_calibrate_spin(void) uae_u64 v1; int vp2; for (;;) { - v1 = __rdtsc(); + v1 = read_processor_time_rdtsc(); vp2 = target_get_display_scanline(-1); if (vp2 <= -10) goto fail; @@ -389,7 +389,7 @@ void target_calibrate_spin(void) if (vp2 <= -10) goto fail; if (vp2 == vp + cntlines * 2) { - uae_u64 scd = (__rdtsc() - v1) / cntlines; + uae_u64 scd = (read_processor_time_rdtsc() - v1) / cntlines; if (sc > scd) sc = scd; } @@ -703,6 +703,8 @@ void resumesoundpaused (void) resume_sound (); #ifdef AHI ahi_open_sound (); +#endif +#ifdef AHI_V2 ahi2_pause_sound (0); #endif } @@ -711,6 +713,8 @@ void setsoundpaused (void) pause_sound (); #ifdef AHI ahi_close_sound (); +#endif +#ifdef AHI_V2 ahi2_pause_sound (1); #endif } @@ -6633,16 +6637,20 @@ static void makeverstr (TCHAR *s) _stprintf (BetaStr, _T(" (%sBeta %s, %d.%02d.%02d)"), WINUAEPUBLICBETA > 0 ? _T("Public ") : _T(""), WINUAEBETA, GETBDY(WINUAEDATE), GETBDM(WINUAEDATE), GETBDD(WINUAEDATE)); } -#ifdef _WIN64 - _tcscat (BetaStr, _T(" 64-bit")); +#if defined _M_ARM64 + _tcscat(BetaStr, _T(" ARM64")); +#elif defined _WIN64 + _tcscat (BetaStr, _T(" x64")); #endif _stprintf (s, _T("WinUAE %d.%d.%d%s%s"), UAEMAJOR, UAEMINOR, UAESUBREV, WINUAEREV, BetaStr); } else { _stprintf (s, _T("WinUAE %d.%d.%d%s (%d.%02d.%02d)"), UAEMAJOR, UAEMINOR, UAESUBREV, WINUAEREV, GETBDY(WINUAEDATE), GETBDM(WINUAEDATE), GETBDD(WINUAEDATE)); -#ifdef _WIN64 - _tcscat (s, _T(" 64-bit")); +#if defined _M_ARM64 + _tcscat(s, _T(" ARM64")); +#elif defined _WIN64 + _tcscat(s, _T(" x64")); #endif } if (_tcslen (WINUAEEXTRA) > 0) { @@ -7744,8 +7752,10 @@ static void create_dump (struct _EXCEPTION_POINTERS *pExceptionPointers) if (WINUAEPUBLICBETA > 0) _stprintf (beta, _T("b%s"), WINUAEBETA); _stprintf (dumpfilename, _T("winuae%s_%d.%d.%d_%s_%d.%02d.%02d_%02d.%02d.%02d.dmp"), -#ifdef _WIN64 +#if defined __amd64__ _T("_x64"), +#elif defined _M_ARM64 + _T("_ARM64"), #else _T(""), #endif @@ -8120,14 +8130,22 @@ HMODULE WIN32_LoadLibrary_2 (const TCHAR *name, int expand) case 1: p = _tcschr (newname, '.'); if (p) { +#ifdef _M_ARM64 + _tcscpy(p, _T("_arm64")); +#else _tcscpy(p, _T("_x64")); +#endif _tcscat(p, _tcschr(name, '.')); } break; case 2: p = _tcschr (newname, '.'); if (p) { +#ifdef _M_ARM64 + _tcscpy(p, _T("arm64")); +#else _tcscpy(p, _T("x64")); +#endif _tcscat(p, _tcschr(name, '.')); } break; diff --git a/od-win32/win32.h b/od-win32/win32.h index c1393083..3203b8d3 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -25,7 +25,7 @@ #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2026, 4, 30) +#define WINUAEDATE MAKEBD(2026, 5, 2) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp index 6cc48607..4a196fa3 100644 --- a/od-win32/win32gfx.cpp +++ b/od-win32/win32gfx.cpp @@ -891,6 +891,7 @@ void reenumeratemonitors(void) static void getd3dmonitornames (void) { +#ifdef WITH_DIRECT3D9 // XP does not support hybrid displays, don't load Direct3D // Windows 10+ seems to use same names by default if (os_win10) @@ -927,6 +928,7 @@ static void getd3dmonitornames (void) md++; } d3d->Release (); +#endif } static bool enumeratedisplays2 (bool selectall) @@ -3774,6 +3776,20 @@ retry: if (wasfs[1] == 0) regqueryint(NULL, wasfsname[1], &wasfs[1]); +#if !defined WITH_DIRECT3D9 && defined WITH_DIRECT3D11 + if (currprefs.gfx_api == 1) { + changed_prefs.gfx_api = currprefs.gfx_api = 2; + } +#endif +#if defined WITH_DIRECT3D9 && !defined WITH_DIRECT3D11 + if (currprefs.gfx_api == 2) { + changed_prefs.gfx_api = currprefs.gfx_api = 1; + } +#endif +#if !defined WITH_DIRECT3D9 && !defined WITH_DIRECT3D11 + changed_prefs.gfx_api = currprefs.gfx_api = 0; +#endif + d3d_select(&currprefs); for (;;) { diff --git a/od-win32/winuae_msvc15/winuae_msvc.sln b/od-win32/winuae_msvc15/winuae_msvc.sln index e08710ab..308331a3 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.sln +++ b/od-win32/winuae_msvc15/winuae_msvc.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.4.33205.214 +# Visual Studio Version 18 +VisualStudioVersion = 18.5.11723.231 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winuae", "winuae_msvc.vcxproj", "{4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}" EndProject @@ -28,216 +28,316 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cputester_m68k", "..\cputes EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 Debug|ARM64EC = Debug|ARM64EC Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + FullRelease|ARM64 = FullRelease|ARM64 FullRelease|ARM64EC = FullRelease|ARM64EC FullRelease|Win32 = FullRelease|Win32 FullRelease|x64 = FullRelease|x64 + Release|ARM64 = Release|ARM64 Release|ARM64EC = Release|ARM64EC Release|Win32 = Release|Win32 Release|x64 = Release|x64 + Test|ARM64 = Test|ARM64 Test|ARM64EC = Test|ARM64EC Test|Win32 = Test|Win32 Test|x64 = Test|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|ARM64.ActiveCfg = FullRelease|ARM64 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|ARM64.Build.0 = FullRelease|ARM64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|ARM64EC.ActiveCfg = Test|ARM64EC {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|ARM64EC.Build.0 = Test|ARM64EC {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Win32.ActiveCfg = Test|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|Win32.Build.0 = Test|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x64.ActiveCfg = Test|x64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Debug|x64.Build.0 = Test|x64 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|ARM64.ActiveCfg = FullRelease|ARM64 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|ARM64.Build.0 = FullRelease|ARM64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|ARM64EC.ActiveCfg = FullRelease|ARM64EC {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|ARM64EC.Build.0 = FullRelease|ARM64EC {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|Win32.Build.0 = FullRelease|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|x64.ActiveCfg = FullRelease|x64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.FullRelease|x64.Build.0 = FullRelease|x64 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|ARM64.ActiveCfg = Release|ARM64 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|ARM64.Build.0 = Release|ARM64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|ARM64EC.ActiveCfg = Release|ARM64EC {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|ARM64EC.Build.0 = Release|ARM64EC {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Win32.ActiveCfg = Release|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|Win32.Build.0 = Release|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x64.ActiveCfg = Release|x64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Release|x64.Build.0 = Release|x64 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|ARM64.ActiveCfg = Test|ARM64 + {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|ARM64.Build.0 = Test|ARM64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|ARM64EC.ActiveCfg = Test|ARM64EC {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|ARM64EC.Build.0 = Test|ARM64EC {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Win32.ActiveCfg = Test|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|Win32.Build.0 = Test|Win32 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|x64.ActiveCfg = Test|x64 {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}.Test|x64.Build.0 = Test|x64 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|ARM64EC.ActiveCfg = ReleaseXP|Win32 - {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|ARM64EC.Build.0 = ReleaseXP|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|ARM64.ActiveCfg = ReleaseXP|ARM64 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|ARM64.Build.0 = ReleaseXP|ARM64 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|ARM64EC.ActiveCfg = Test|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|ARM64EC.Build.0 = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Win32.ActiveCfg = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|Win32.Build.0 = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x64.ActiveCfg = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Debug|x64.Build.0 = Test|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|ARM64.ActiveCfg = FullRelease|ARM64 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|ARM64.Build.0 = FullRelease|ARM64 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|ARM64EC.ActiveCfg = FullRelease|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.FullRelease|x64.ActiveCfg = FullRelease|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|ARM64.ActiveCfg = Release|ARM64 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|ARM64.Build.0 = Release|ARM64 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|ARM64EC.ActiveCfg = Release|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|Win32.ActiveCfg = Release|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Release|x64.ActiveCfg = Release|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|ARM64.ActiveCfg = Test|Win32 + {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|ARM64.Build.0 = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|ARM64EC.ActiveCfg = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|ARM64EC.Build.0 = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|Win32.ActiveCfg = Test|Win32 {DEF7ACF7-050E-4069-BB99-5B5D93F60521}.Test|x64.ActiveCfg = Test|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|ARM64EC.ActiveCfg = ReleaseXP|Win32 - {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|ARM64EC.Build.0 = ReleaseXP|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|ARM64.ActiveCfg = ReleaseXP|ARM64 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|ARM64.Build.0 = ReleaseXP|ARM64 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|ARM64EC.ActiveCfg = Test|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|ARM64EC.Build.0 = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Win32.ActiveCfg = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|Win32.Build.0 = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x64.ActiveCfg = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Debug|x64.Build.0 = Test|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|ARM64.ActiveCfg = FullRelease|ARM64 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|ARM64.Build.0 = FullRelease|ARM64 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|ARM64EC.ActiveCfg = FullRelease|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.FullRelease|x64.ActiveCfg = FullRelease|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|ARM64.ActiveCfg = Release|ARM64 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|ARM64.Build.0 = Release|ARM64 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|ARM64EC.ActiveCfg = Release|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|Win32.ActiveCfg = Release|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Release|x64.ActiveCfg = Release|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|ARM64.ActiveCfg = Test|Win32 + {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|ARM64.Build.0 = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|ARM64EC.ActiveCfg = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|ARM64EC.Build.0 = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|Win32.ActiveCfg = Test|Win32 {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}.Test|x64.ActiveCfg = Test|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|ARM64EC.ActiveCfg = ReleaseXP|Win32 - {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|ARM64EC.Build.0 = ReleaseXP|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|ARM64.ActiveCfg = ReleaseXP|ARM64 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|ARM64.Build.0 = ReleaseXP|ARM64 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|ARM64EC.ActiveCfg = TestRelease|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|ARM64EC.Build.0 = TestRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Win32.ActiveCfg = TestRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|Win32.Build.0 = TestRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x64.ActiveCfg = TestRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Debug|x64.Build.0 = TestRelease|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|ARM64.ActiveCfg = FullRelease|ARM64 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|ARM64.Build.0 = FullRelease|ARM64 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|ARM64EC.ActiveCfg = FullRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.FullRelease|x64.ActiveCfg = FullRelease|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|ARM64.ActiveCfg = Release|ARM64 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|ARM64.Build.0 = Release|ARM64 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|ARM64EC.ActiveCfg = Release|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|Win32.ActiveCfg = Release|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Release|x64.ActiveCfg = Release|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|ARM64.ActiveCfg = Test|Win32 + {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|ARM64.Build.0 = Test|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|ARM64EC.ActiveCfg = Test|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|ARM64EC.Build.0 = Test|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|Win32.ActiveCfg = Test|Win32 {765B0AF0-B8D3-4998-89AF-D6F939E1CD18}.Test|x64.ActiveCfg = Test|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|ARM64EC.ActiveCfg = ReleaseXP|Win32 - {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|ARM64EC.Build.0 = ReleaseXP|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|ARM64.ActiveCfg = ReleaseXP|ARM64 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|ARM64.Build.0 = ReleaseXP|ARM64 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|ARM64EC.ActiveCfg = TestRelease|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|ARM64EC.Build.0 = TestRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Win32.ActiveCfg = TestRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|Win32.Build.0 = TestRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x64.ActiveCfg = TestRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Debug|x64.Build.0 = TestRelease|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|ARM64.ActiveCfg = FullRelease|ARM64 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|ARM64.Build.0 = FullRelease|ARM64 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|ARM64EC.ActiveCfg = FullRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.FullRelease|x64.ActiveCfg = FullRelease|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|ARM64.ActiveCfg = Release|ARM64 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|ARM64.Build.0 = Release|ARM64 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|ARM64EC.ActiveCfg = Release|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|Win32.ActiveCfg = Release|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Release|x64.ActiveCfg = Release|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|ARM64.ActiveCfg = Test|Win32 + {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|ARM64.Build.0 = Test|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|ARM64EC.ActiveCfg = Test|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|ARM64EC.Build.0 = Test|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|Win32.ActiveCfg = Test|Win32 {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}.Test|x64.ActiveCfg = Test|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|ARM64EC.ActiveCfg = ReleaseXP|Win32 - {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|ARM64EC.Build.0 = ReleaseXP|Win32 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|ARM64.ActiveCfg = ReleaseXP|ARM64 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|ARM64.Build.0 = ReleaseXP|ARM64 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|ARM64EC.ActiveCfg = TestRelease|Win32 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|ARM64EC.Build.0 = TestRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Win32.ActiveCfg = TestRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Win32.Build.0 = TestRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x64.ActiveCfg = TestRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x64.Build.0 = TestRelease|Win32 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|ARM64.ActiveCfg = FullRelease|ARM64 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|ARM64.Build.0 = FullRelease|ARM64 {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|ARM64EC.ActiveCfg = FullRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|x64.ActiveCfg = FullRelease|Win32 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|ARM64.ActiveCfg = Release|ARM64 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|ARM64.Build.0 = Release|ARM64 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|ARM64EC.ActiveCfg = Release|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Win32.ActiveCfg = Release|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|x64.ActiveCfg = Release|Win32 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|ARM64.ActiveCfg = Test|Win32 + {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|ARM64.Build.0 = Test|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|ARM64EC.ActiveCfg = Test|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|ARM64EC.Build.0 = Test|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Win32.ActiveCfg = Test|Win32 {C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|x64.ActiveCfg = Test|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|ARM64EC.ActiveCfg = ReleaseXP|Win32 - {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|ARM64EC.Build.0 = ReleaseXP|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|ARM64.ActiveCfg = ReleaseXP|ARM64 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|ARM64.Build.0 = ReleaseXP|ARM64 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|ARM64EC.ActiveCfg = Test|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|ARM64EC.Build.0 = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Win32.ActiveCfg = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|Win32.Build.0 = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x64.ActiveCfg = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Debug|x64.Build.0 = Test|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|ARM64.ActiveCfg = FullRelease|ARM64 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|ARM64.Build.0 = FullRelease|ARM64 {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|ARM64EC.ActiveCfg = FullRelease|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|Win32.ActiveCfg = FullRelease|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.FullRelease|x64.ActiveCfg = FullRelease|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|ARM64.ActiveCfg = Release|ARM64 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|ARM64.Build.0 = Release|ARM64 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|ARM64EC.ActiveCfg = Release|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|Win32.ActiveCfg = Release|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Release|x64.ActiveCfg = Release|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|ARM64.ActiveCfg = Test|Win32 + {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|ARM64.Build.0 = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|ARM64EC.ActiveCfg = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|ARM64EC.Build.0 = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|Win32.ActiveCfg = Test|Win32 {E9F73E11-A463-45C6-A733-2BED75852BA1}.Test|x64.ActiveCfg = Test|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|ARM64EC.ActiveCfg = ReleaseXP|Win32 - {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|ARM64EC.Build.0 = ReleaseXP|Win32 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|ARM64.ActiveCfg = ReleaseXP|ARM64 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|ARM64.Build.0 = ReleaseXP|ARM64 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|ARM64EC.ActiveCfg = Test|Win32 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|ARM64EC.Build.0 = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|Win32.ActiveCfg = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|Win32.Build.0 = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|x64.ActiveCfg = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Debug|x64.Build.0 = Test|Win32 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|ARM64.ActiveCfg = Release|ARM64 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|ARM64.Build.0 = Release|ARM64 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|ARM64EC.ActiveCfg = Release|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|Win32.ActiveCfg = Release|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|x64.ActiveCfg = Release|Win32 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|ARM64.ActiveCfg = Release|ARM64 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|ARM64.Build.0 = Release|ARM64 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|ARM64EC.ActiveCfg = Release|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|Win32.ActiveCfg = Release|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|x64.ActiveCfg = Release|Win32 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|ARM64.ActiveCfg = Test|Win32 + {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|ARM64.Build.0 = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|ARM64EC.ActiveCfg = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|ARM64EC.Build.0 = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|Win32.ActiveCfg = Test|Win32 {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Test|x64.ActiveCfg = Test|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|ARM64EC.ActiveCfg = ReleaseXP|x64 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|ARM64EC.Build.0 = ReleaseXP|x64 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|ARM64.ActiveCfg = Release|ARM64 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|ARM64.Build.0 = Release|ARM64 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|ARM64EC.ActiveCfg = Test|x64 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|ARM64EC.Build.0 = Test|x64 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|Win32.ActiveCfg = Test|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|Win32.Build.0 = Test|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|x64.ActiveCfg = Test|x64 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Debug|x64.Build.0 = Test|x64 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|ARM64.ActiveCfg = Release|ARM64 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|ARM64.Build.0 = Release|ARM64 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|ARM64EC.ActiveCfg = Release|x64 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|Win32.ActiveCfg = Release|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.FullRelease|x64.ActiveCfg = Release|Win32 - {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|ARM64EC.ActiveCfg = Release|x64 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|ARM64.ActiveCfg = Release|ARM64 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|ARM64.Build.0 = Release|ARM64 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|ARM64EC.ActiveCfg = Release|ARM64EC {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|Win32.ActiveCfg = Release|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Release|x64.ActiveCfg = Release|x64 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|ARM64.ActiveCfg = Test|ARM64 + {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|ARM64.Build.0 = Test|ARM64 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|ARM64EC.ActiveCfg = Test|x64 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|ARM64EC.Build.0 = Test|x64 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|Win32.ActiveCfg = Test|Win32 {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}.Test|x64.ActiveCfg = Test|x64 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|ARM64EC.ActiveCfg = ReleaseXP|x64 - {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|ARM64EC.Build.0 = ReleaseXP|x64 + {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|ARM64.ActiveCfg = ReleaseXP|ARM64 + {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|ARM64.Build.0 = ReleaseXP|ARM64 + {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|ARM64EC.ActiveCfg = Test|x64 + {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|ARM64EC.Build.0 = Test|x64 {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|Win32.ActiveCfg = Test|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|Win32.Build.0 = Test|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|x64.ActiveCfg = Test|x64 {98BA115B-829F-4085-9729-ABD0D779A60A}.Debug|x64.Build.0 = Test|x64 + {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|ARM64.ActiveCfg = Release|ARM64 + {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|ARM64.Build.0 = Release|ARM64 {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|ARM64EC.ActiveCfg = Release|x64 {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|Win32.ActiveCfg = Release|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.FullRelease|x64.ActiveCfg = Release|Win32 + {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|ARM64.ActiveCfg = Release|ARM64 + {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|ARM64.Build.0 = Release|ARM64 {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|ARM64EC.ActiveCfg = Release|x64 {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|Win32.ActiveCfg = Release|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.Release|x64.ActiveCfg = Release|x64 + {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|ARM64.ActiveCfg = Test|ARM64 + {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|ARM64.Build.0 = Test|ARM64 {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|ARM64EC.ActiveCfg = Test|x64 {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|ARM64EC.Build.0 = Test|x64 {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|Win32.ActiveCfg = Test|Win32 {98BA115B-829F-4085-9729-ABD0D779A60A}.Test|x64.ActiveCfg = Test|x64 + {EDD28611-EAD9-4EB5-A873-18160AC44434}.Debug|ARM64.ActiveCfg = Release|ARM64 + {EDD28611-EAD9-4EB5-A873-18160AC44434}.Debug|ARM64.Build.0 = Release|ARM64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Debug|ARM64EC.ActiveCfg = Release|x64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Debug|ARM64EC.Build.0 = Release|x64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Debug|Win32.ActiveCfg = Test|Win32 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Debug|Win32.Build.0 = Test|Win32 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Debug|x64.ActiveCfg = Test|x64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Debug|x64.Build.0 = Test|x64 + {EDD28611-EAD9-4EB5-A873-18160AC44434}.FullRelease|ARM64.ActiveCfg = Release|ARM64 + {EDD28611-EAD9-4EB5-A873-18160AC44434}.FullRelease|ARM64.Build.0 = Release|ARM64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.FullRelease|ARM64EC.ActiveCfg = Release|x64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.FullRelease|Win32.ActiveCfg = Release|Win32 {EDD28611-EAD9-4EB5-A873-18160AC44434}.FullRelease|x64.ActiveCfg = Release|x64 + {EDD28611-EAD9-4EB5-A873-18160AC44434}.Release|ARM64.ActiveCfg = Release|ARM64 + {EDD28611-EAD9-4EB5-A873-18160AC44434}.Release|ARM64.Build.0 = Release|ARM64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Release|ARM64EC.ActiveCfg = Release|x64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Release|Win32.ActiveCfg = Release|Win32 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Release|x64.ActiveCfg = Release|x64 + {EDD28611-EAD9-4EB5-A873-18160AC44434}.Test|ARM64.ActiveCfg = Test|Win32 + {EDD28611-EAD9-4EB5-A873-18160AC44434}.Test|ARM64.Build.0 = Test|Win32 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Test|ARM64EC.ActiveCfg = Test|x64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Test|ARM64EC.Build.0 = Test|x64 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Test|Win32.ActiveCfg = Test|Win32 {EDD28611-EAD9-4EB5-A873-18160AC44434}.Test|x64.ActiveCfg = Release|x64 + {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Debug|ARM64.ActiveCfg = Release|ARM64 + {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Debug|ARM64.Build.0 = Release|ARM64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Debug|ARM64EC.ActiveCfg = Release|x64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Debug|ARM64EC.Build.0 = Release|x64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Debug|Win32.ActiveCfg = Release|Win32 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Debug|Win32.Build.0 = Release|Win32 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Debug|x64.ActiveCfg = Release|x64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Debug|x64.Build.0 = Release|x64 + {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.FullRelease|ARM64.ActiveCfg = Release|ARM64 + {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.FullRelease|ARM64.Build.0 = Release|ARM64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.FullRelease|ARM64EC.ActiveCfg = Release|x64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.FullRelease|Win32.ActiveCfg = Release|Win32 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.FullRelease|x64.ActiveCfg = Release|x64 + {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Release|ARM64.ActiveCfg = Release|ARM64 + {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Release|ARM64.Build.0 = Release|ARM64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Release|ARM64EC.ActiveCfg = Release|x64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Release|Win32.ActiveCfg = Release|Win32 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Release|x64.ActiveCfg = Release|x64 + {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Test|ARM64.ActiveCfg = Release|Win32 + {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Test|ARM64.Build.0 = Release|Win32 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Test|ARM64EC.ActiveCfg = Release|x64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Test|ARM64EC.Build.0 = Release|x64 {07609D0D-FE6B-4A84-8C87-F914A4566F6F}.Test|Win32.ActiveCfg = Release|Win32 diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj index e2fcd053..13b73e59 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj @@ -1,6 +1,10 @@  + + FullRelease + ARM64 + FullRelease ARM64EC @@ -13,6 +17,10 @@ FullRelease x64 + + Release + ARM64 + Release ARM64EC @@ -25,6 +33,10 @@ Release x64 + + Test + ARM64 + Test ARM64EC @@ -84,6 +96,14 @@ v145 false + + Application + false + Unicode + true + v145 + false + Application false @@ -98,6 +118,13 @@ v145 false + + Application + false + Unicode + v145 + false + Application false @@ -112,7 +139,15 @@ Unicode v145 false - true + false + + + Application + false + Unicode + v145 + false + false @@ -132,18 +167,27 @@ + + + + + + + + + <_ProjectFileVersion>10.0.30128.1 @@ -157,16 +201,22 @@ d:\amiga\ $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false false + false false false + false true true + true true true + true d:\amiga\ $(Configuration)\ false @@ -174,38 +224,50 @@ d:\amiga\ $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false false + false true true + true winuae64 winuaeARM64EC + winuaeARM64 winuae64 winuaeARM64EC + winuaeARM64 winuae64 winuaeARM64EC + winuaeARM64 $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) - C:\dev\lib;$(LibraryPath) - C:\dev\lib;$(LibraryPath) + C:\dev\lib\x86;$(LibraryPath) + C:\dev\lib\x86;$(LibraryPath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) $(VC_ReferencesPath_x86); - C:\dev\lib;$(LibraryPath) + C:\dev\lib\x86;$(LibraryPath) true true true $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) C:\dev\lib\x64;$(LibraryPath) - C:\dev\lib\x64;$(LibraryPath) + C:\dev\lib\arm64ec;C:\dev\lib\x64;$(LibraryPath) + C:\dev\lib\arm64;$(LibraryPath) C:\dev\lib\x64;$(LibraryPath) - C:\dev\lib\x64;$(LibraryPath) + C:\dev\lib\arm64ec;C:\dev\lib\x64;$(LibraryPath) + C:\dev\lib\arm64;$(LibraryPath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) + $(MSBuildProgramFiles32)\Windows Kits\10\Include\10.0.18362.0\km;c:\dev\include;$(IncludePath) C:\dev\lib\x64;$(LibraryPath) - C:\dev\lib\x64;$(LibraryPath) + C:\dev\lib\arm64ec;C:\dev\lib\x64;$(LibraryPath) + C:\dev\lib\arm64;$(LibraryPath) @@ -217,6 +279,10 @@ $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) d:\amiga\ + + + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x86;$(ExecutablePath) $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x86); @@ -236,6 +302,10 @@ $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) d:\amiga\ + + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) + d:\amiga\ + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) NativeMinimumRules.ruleset @@ -245,6 +315,10 @@ NativeMinimumRules.ruleset d:\amiga\ + + $(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.17763.0\x64;$(ExecutablePath) + NativeMinimumRules.ruleset + false @@ -300,7 +374,7 @@ 0x0409 - ws2_32.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;shlwapi.lib;libpng16.lib;lglcd.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;libFLAC_static.lib;hid.lib;zlibstat.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;shlwapi.lib;libpng16.lib;lglcd.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;FLAC.lib;hid.lib;zs.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) true %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ @@ -384,12 +458,12 @@ 0x0409 - ws2_32.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;shlwapi.lib;libpng16.lib;lglcd.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;libFLAC_static.lib;hid.lib;zlibstat.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;shlwapi.lib;libpng16.lib;lglcd.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;FLAC.lib;hid.lib;zs.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) true %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ %(AdditionalManifestDependencies) - %(IgnoreSpecificDefaultLibraries) + %(IgnoreSpecificDefaultLibraries);MSCVRT.lib d3dx9_43.dll;openal32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;Iphlpapi.dll;gdiplus.dll;Msimg32.dll;d3dcompiler_47.dll;%(DelayLoadDLLs) true .\Test/winuae.pdb @@ -468,7 +542,7 @@ 0x0409 - ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zs.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet.lib;prowizard.lib;lzmalib.lib;FLAC.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) NotSet $(OutDir)$(TargetName)$(TargetExt) true @@ -546,7 +620,7 @@ 0x0409 - ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zs.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet.lib;prowizard.lib;lzmalib.lib;FLAC.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) NotSet $(OutDir)$(TargetName)$(TargetExt) true @@ -576,6 +650,83 @@ PerMonitorHighDPIAware + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/winuae_msvc.tlb + + + Full + AnySuitable + true + Speed + true + false + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;ARM64;PTR64;UAE;WINUAE;_HAS_STD_BYTE=0;SAHF_SETO_PROFITABLE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + true + CPUExtensionRequirementsARMv82 + Fast + false + false + NotUsing + $(Platform)\$(Configuration)/winuae_msvc.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Level3 + true + FastCall + Default + 4996;%(DisableSpecificWarnings) + %(ForcedIncludeFiles) + true + stdcpplatest + /Zc:strictStrings- %(AdditionalOptions) + stdclatest + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;setupapi.lib;wininet.lib;shlwapi.lib;zs.lib;libpng16.lib;wtsapi32.lib;prowizard.lib;lzmalib.lib;FLAC.lib;hid.lib;Iphlpapi.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) + NotSet + $(OutDir)$(TargetName)$(TargetExt) + true + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + MSVCRT.lib;%(IgnoreSpecificDefaultLibraries);MSVCRT + ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;Iphlpapi.dll;%(DelayLoadDLLs) + true + $(Platform)\$(Configuration)\winuae.pdb + Windows + + + + + true + true + + + true + true + + + /ignore:4099 %(AdditionalOptions) + false + + + ..\resources\winuae64.exe.manifest + PerMonitorHighDPIAware + + NDEBUG;%(PreprocessorDefinitions) @@ -610,7 +761,7 @@ $(Platform)\$(Configuration)\ Level3 true - Cdecl + FastCall Default 4996;%(DisableSpecificWarnings) %(ForcedIncludeFiles) @@ -623,7 +774,7 @@ 0x0409 - ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zs.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet.lib;prowizard.lib;lzmalib.lib;FLAC.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) NotSet $(OutDir)$(TargetName)$(TargetExt) true @@ -685,7 +836,7 @@ $(Platform)\$(Configuration)\ Level3 true - Cdecl + FastCall Default 4996;%(DisableSpecificWarnings) %(ForcedIncludeFiles) @@ -699,7 +850,7 @@ 0x0409 - ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zs.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet.lib;prowizard.lib;lzmalib.lib;FLAC.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) NotSet $(OutDir)$(TargetName)$(TargetExt) true @@ -729,6 +880,82 @@ PerMonitorHighDPIAware + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/winuae_msvc.tlb + + + Disabled + OnlyExplicitInline + true + Neither + false + false + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;ARM64;PTR64;UAE;WINUAE;_HAS_STD_BYTE=0;SAHF_SETO_PROFITABLE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + CPUExtensionRequirementsARMv82 + Fast + false + false + NotUsing + $(Platform)\$(Configuration)/winuae_msvc.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Level3 + true + FastCall + Default + 4996;%(DisableSpecificWarnings) + %(ForcedIncludeFiles) + true + stdcpplatest + /Zc:strictStrings- %(AdditionalOptions) + stdclatest + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;setupapi.lib;wininet.lib;shlwapi.lib;zs.lib;libpng16.lib;wtsapi32.lib;prowizard.lib;lzmalib.lib;FLAC.lib;hid.lib;Iphlpapi.lib;libmpeg2_ff.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) + NotSet + $(OutDir)$(TargetName)$(TargetExt) + true + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + %(IgnoreSpecificDefaultLibraries);MSVCRT + ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;Iphlpapi.dll;%(DelayLoadDLLs) + true + $(Platform)\$(Configuration)\winuae.pdb + Windows + + + + + true + true + + + true + false + true + + + /ignore:4099 %(AdditionalOptions) + + + ..\resources\winuae64.exe.manifest + PerMonitorHighDPIAware + + NDEBUG;%(PreprocessorDefinitions) @@ -778,7 +1005,7 @@ 0x0409 - ws2_32.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;shlwapi.lib;libpng16.lib;lglcd.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;libFLAC_static.lib;hid.lib;zlibstat.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;shlwapi.lib;libpng16.lib;lglcd.lib;openal32.lib;portaudio_x86.lib;vfw32.lib;wtsapi32.lib;enet.lib;lzmalib.lib;prowizard.lib;FLAC.lib;hid.lib;zs.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) true %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ @@ -860,7 +1087,7 @@ 0x0409 - ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zs.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet.lib;prowizard.lib;lzmalib.lib;FLAC.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) NotSet $(OutDir)$(TargetName)$(TargetExt) true @@ -938,7 +1165,7 @@ 0x0409 - ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;softfloat.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;shlwapi.lib;zs.lib;portaudio_x64.lib;openal32.lib;libpng16.lib;lglcd.lib;wtsapi32.lib;enet.lib;prowizard.lib;lzmalib.lib;FLAC.lib;hid.lib;Iphlpapi.lib;luastatic.lib;libmpeg2_ff.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) NotSet $(OutDir)$(TargetName)$(TargetExt) true @@ -968,6 +1195,84 @@ PerMonitorHighDPIAware + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/winuae_msvc.tlb + + + MaxSpeed + AnySuitable + true + Speed + true + true + ..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories) + WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;ARM64;PTR64;UAE;WINUAE;_HAS_STD_BYTE=0;SAHF_SETO_PROFITABLE;FX11;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + true + CPUExtensionRequirementsARMv82 + Fast + false + false + + + $(Platform)\$(Configuration)\winuae_msvc.pch + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Level3 + true + FastCall + Default + 4996;%(DisableSpecificWarnings) + %(ForcedIncludeFiles) + true + stdcpplatest + /Zc:strictStrings- %(AdditionalOptions) + stdclatest + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;setupapi.lib;wininet.lib;shlwapi.lib;zs.lib;libpng16.lib;wtsapi32.lib;prowizard.lib;lzmalib.lib;FLAC.lib;hid.lib;Iphlpapi.lib;libmpeg2_ff.lib;gdiplus.lib;effects11.lib;Msimg32.lib;Dwmapi.lib;mt32emu.lib;XINPUT9_1_0.lib;%(AdditionalDependencies) + NotSet + $(OutDir)$(TargetName)$(TargetExt) + true + %(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\ + %(IgnoreSpecificDefaultLibraries);MSVCRT + ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;Iphlpapi.dll;%(DelayLoadDLLs) + true + .\arm64\FullRelease/winuae.pdb + Windows + + + + + true + true + UseLinkTimeCodeGeneration + true + false + true + + + /ignore:4099 %(AdditionalOptions) + true + + + ..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles) + PerMonitorHighDPIAware + + @@ -1296,29 +1601,41 @@ false true + true Document false true + true false true + true nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj + nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj + nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj + nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj $(IntDir)%(filename).obj $(IntDir)%(filename).obj + $(IntDir)%(filename).obj $(IntDir)%(filename).obj $(IntDir)%(filename).obj + $(IntDir)%(filename).obj $(IntDir)%(filename).obj $(IntDir)%(filename).obj + $(IntDir)%(filename).obj Assembling %(filename) Assembling %(filename) + Assembling %(filename) Assembling %(filename) Assembling %(filename) + Assembling %(filename) Assembling %(filename) Assembling %(filename) + Assembling %(filename) nasm -f win32 %(FullPath) -o $(IntDir)%(filename).obj nasm -f win32 %(FullPath) -o $(IntDir)%(filename).obj Assembling %(filename) @@ -1347,10 +1664,13 @@ $(IntDir)%(filename).obj true true + true true true + true true true + true @@ -1398,10 +1718,13 @@ true true true + true true true + true true true + true PS_PostAlpha @@ -1434,60 +1757,88 @@ 4.0_level_9_1 PS_PostAlpha PS_PostAlpha + PS_PostAlpha Pixel Pixel + Pixel 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 PS_PostAlpha PS_PostAlpha + PS_PostAlpha Pixel Pixel + Pixel 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 PS_PostAlpha PS_PostAlpha + PS_PostAlpha Pixel Pixel + Pixel 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 PS_PostAlpha PS_PostAlpha + PS_PostAlpha Pixel Pixel + Pixel 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 PS_PostAlpha PS_PostAlpha + PS_PostAlpha ../Shaders/PixelShaderAlpha.h ../Shaders/PixelShaderAlpha.h + ../Shaders/PixelShaderAlpha.h + + PS_PostAlpha PS_PostAlpha + PS_PostAlpha ../Shaders/PixelShaderAlpha.h ../Shaders/PixelShaderAlpha.h + ../Shaders/PixelShaderAlpha.h + + PS_PostAlpha PS_PostAlpha + PS_PostAlpha ../Shaders/PixelShaderAlpha.h ../Shaders/PixelShaderAlpha.h + ../Shaders/PixelShaderAlpha.h + + PS_PostAlpha PS_PostAlpha + PS_PostAlpha ../Shaders/PixelShaderAlpha.h ../Shaders/PixelShaderAlpha.h + ../Shaders/PixelShaderAlpha.h + + 4.0_level_9_3 @@ -1501,10 +1852,13 @@ PS_PostAlpha_HDR PS_PostAlpha_HDR PS_PostAlpha_HDR + PS_PostAlpha_HDR PS_PostAlpha_HDR PS_PostAlpha_HDR + PS_PostAlpha_HDR PS_PostAlpha_HDR PS_PostAlpha_HDR + PS_PostAlpha_HDR ../Shaders/PixelShaderAlpha_HDR.h @@ -1513,46 +1867,64 @@ ../Shaders/PixelShaderAlpha_HDR.h ../Shaders/PixelShaderAlpha_HDR.h + ../Shaders/PixelShaderAlpha_HDR.h + + ../Shaders/PixelShaderAlpha_HDR.h ../Shaders/PixelShaderAlpha_HDR.h + ../Shaders/PixelShaderAlpha_HDR.h + + ../Shaders/PixelShaderAlpha_HDR.h ../Shaders/PixelShaderAlpha_HDR.h + ../Shaders/PixelShaderAlpha_HDR.h + + Pixel 4.0_level_9_3 Pixel 4.0_level_9_3 Pixel Pixel + Pixel 4.0_level_9_3 4.0_level_9_3 + 4.0_level_9_3 Pixel Pixel + Pixel 4.0_level_9_3 4.0_level_9_3 + 4.0_level_9_3 Pixel Pixel + Pixel 4.0_level_9_3 4.0_level_9_3 + 4.0_level_9_3 PS_PostAlpha_HDR PS_PostAlpha_HDR PS_PostAlpha_HDR PS_PostAlpha_HDR + PS_PostAlpha_HDR PS_PostAlpha_HDR PS_PostAlpha_HDR + PS_PostAlpha_HDR PS_PostAlpha_HDR PS_PostAlpha_HDR + PS_PostAlpha_HDR PS_PostMask @@ -1582,63 +1954,91 @@ PS_PostMask PS_PostMask + PS_PostMask ../Shaders/PixelShaderMask.h ../Shaders/PixelShaderMask.h + ../Shaders/PixelShaderMask.h + + PS_PostMask PS_PostMask + PS_PostMask ../Shaders/PixelShaderMask.h ../Shaders/PixelShaderMask.h + ../Shaders/PixelShaderMask.h + + PS_PostMask PS_PostMask + PS_PostMask ../Shaders/PixelShaderMask.h ../Shaders/PixelShaderMask.h + ../Shaders/PixelShaderMask.h + + PS_PostMask PS_PostMask + PS_PostMask ../Shaders/PixelShaderMask.h ../Shaders/PixelShaderMask.h + ../Shaders/PixelShaderMask.h + + PS_PostMask PS_PostMask PS_PostMask PS_PostMask PS_PostMask + PS_PostMask Pixel Pixel + Pixel 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 PS_PostMask PS_PostMask + PS_PostMask Pixel Pixel + Pixel 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 PS_PostMask PS_PostMask + PS_PostMask Pixel Pixel + Pixel 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 PS_PostMask PS_PostMask + PS_PostMask Pixel Pixel + Pixel 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 PS_PostMask_HDR @@ -1656,22 +2056,31 @@ 4.0_level_9_3 PS_PostMask_HDR PS_PostMask_HDR + PS_PostMask_HDR Pixel Pixel + Pixel 4.0_level_9_3 4.0_level_9_3 + 4.0_level_9_3 PS_PostMask_HDR PS_PostMask_HDR + PS_PostMask_HDR Pixel Pixel + Pixel 4.0_level_9_3 4.0_level_9_3 + 4.0_level_9_3 PS_PostMask_HDR PS_PostMask_HDR + PS_PostMask_HDR Pixel Pixel + Pixel 4.0_level_9_3 4.0_level_9_3 + 4.0_level_9_3 PS_PostMask_HDR @@ -1680,30 +2089,42 @@ PS_PostMask_HDR PS_PostMask_HDR + PS_PostMask_HDR + + PS_PostMask_HDR PS_PostMask_HDR + PS_PostMask_HDR + + PS_PostMask_HDR PS_PostMask_HDR + PS_PostMask_HDR + + ../Shaders/PixelShaderMask_HDR.h ../Shaders/PixelShaderMask_HDR.h ../Shaders/PixelShaderMask_HDR.h ../Shaders/PixelShaderMask_HDR.h + ../Shaders/PixelShaderMask_HDR.h ../Shaders/PixelShaderMask_HDR.h ../Shaders/PixelShaderMask_HDR.h + ../Shaders/PixelShaderMask_HDR.h ../Shaders/PixelShaderMask_HDR.h ../Shaders/PixelShaderMask_HDR.h + ../Shaders/PixelShaderMask_HDR.h Pixel @@ -1736,60 +2157,88 @@ PS_PostPlain PS_PostPlain PS_PostPlain + PS_PostPlain Pixel Pixel + Pixel 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 PS_PostPlain PS_PostPlain + PS_PostPlain Pixel Pixel + Pixel 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 PS_PostPlain PS_PostPlain + PS_PostPlain Pixel Pixel + Pixel 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 PS_PostPlain PS_PostPlain + PS_PostPlain Pixel Pixel + Pixel 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 PS_PostPlain PS_PostPlain + PS_PostPlain ../Shaders/PixelShaderPlain.h ../Shaders/PixelShaderPlain.h + ../Shaders/PixelShaderPlain.h + + PS_PostPlain PS_PostPlain + PS_PostPlain ../Shaders/PixelShaderPlain.h ../Shaders/PixelShaderPlain.h + ../Shaders/PixelShaderPlain.h + + PS_PostPlain PS_PostPlain + PS_PostPlain ../Shaders/PixelShaderPlain.h ../Shaders/PixelShaderPlain.h + ../Shaders/PixelShaderPlain.h + + PS_PostPlain PS_PostPlain + PS_PostPlain ../Shaders/PixelShaderPlain.h ../Shaders/PixelShaderPlain.h + ../Shaders/PixelShaderPlain.h + + PS_PostPlain_HDR @@ -1807,54 +2256,75 @@ PS_PostPlain_HDR PS_PostPlain_HDR + PS_PostPlain_HDR + + PS_PostPlain_HDR PS_PostPlain_HDR + PS_PostPlain_HDR + + PS_PostPlain_HDR PS_PostPlain_HDR + PS_PostPlain_HDR + + Pixel 4.0_level_9_3 Pixel 4.0_level_9_3 Pixel Pixel + Pixel 4.0_level_9_3 4.0_level_9_3 + 4.0_level_9_3 Pixel Pixel + Pixel 4.0_level_9_3 4.0_level_9_3 + 4.0_level_9_3 Pixel Pixel + Pixel 4.0_level_9_3 4.0_level_9_3 + 4.0_level_9_3 ../Shaders/PixelShaderPlain_HDR.h ../Shaders/PixelShaderPlain_HDR.h ../Shaders/PixelShaderPlain_HDR.h ../Shaders/PixelShaderPlain_HDR.h + ../Shaders/PixelShaderPlain_HDR.h ../Shaders/PixelShaderPlain_HDR.h ../Shaders/PixelShaderPlain_HDR.h + ../Shaders/PixelShaderPlain_HDR.h ../Shaders/PixelShaderPlain_HDR.h ../Shaders/PixelShaderPlain_HDR.h + ../Shaders/PixelShaderPlain_HDR.h PS_PostPlain_HDR PS_PostPlain_HDR PS_PostPlain_HDR PS_PostPlain_HDR + PS_PostPlain_HDR PS_PostPlain_HDR PS_PostPlain_HDR + PS_PostPlain_HDR PS_PostPlain_HDR PS_PostPlain_HDR + PS_PostPlain_HDR 4.0_level_9_3 @@ -1863,18 +2333,24 @@ 4.0_level_9_3 4.0_level_9_3 4.0_level_9_3 + 4.0_level_9_3 4.0_level_9_3 4.0_level_9_3 + 4.0_level_9_3 4.0_level_9_3 4.0_level_9_3 + 4.0_level_9_3 true true true true + true true true + true true true + true Vertex @@ -1904,63 +2380,91 @@ VertexShader VertexShader + VertexShader ../Shaders/VertexShader.h ../Shaders/VertexShader.h + ../Shaders/VertexShader.h + + VertexShader VertexShader + VertexShader ../Shaders/VertexShader.h ../Shaders/VertexShader.h + ../Shaders/VertexShader.h + + VertexShader VertexShader + VertexShader ../Shaders/VertexShader.h ../Shaders/VertexShader.h + ../Shaders/VertexShader.h + + VertexShader VertexShader + VertexShader ../Shaders/VertexShader.h ../Shaders/VertexShader.h + ../Shaders/VertexShader.h + + TextureVertexShader TextureVertexShader TextureVertexShader TextureVertexShader TextureVertexShader + TextureVertexShader Vertex Vertex + Vertex 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 TextureVertexShader TextureVertexShader + TextureVertexShader Vertex Vertex + Vertex 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 TextureVertexShader TextureVertexShader + TextureVertexShader Vertex Vertex + Vertex 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 TextureVertexShader TextureVertexShader + TextureVertexShader Vertex Vertex + Vertex 4.0_level_9_1 4.0_level_9_1 + 4.0_level_9_1 diff --git a/pcem/vid_voodoo.cpp b/pcem/vid_voodoo.cpp index 5895726c..19c49fd0 100644 --- a/pcem/vid_voodoo.cpp +++ b/pcem/vid_voodoo.cpp @@ -1085,7 +1085,7 @@ void *voodoo_card_init() ai88[c].b = c & 0xff; } #ifndef NO_CODEGEN -#if (defined WIN32 || defined WIN64) +#if (defined WIN32 || defined WIN64) && !defined(ARM64) voodoo_codegen_init(voodoo); #endif #endif @@ -1205,7 +1205,7 @@ void *voodoo_2d3d_card_init(int type) ai88[c].b = c & 0xff; } #ifndef NO_CODEGEN -#if (defined WIN32 || defined WIN64) +#if (defined WIN32 || defined WIN64) && !defined(ARM64) voodoo_codegen_init(voodoo); #endif #endif @@ -1322,7 +1322,7 @@ void voodoo_card_close(voodoo_t *voodoo) free(voodoo->texture_cache[0][c].data); } #ifndef NO_CODEGEN -#if (defined WIN32 || defined WIN64) +#if (defined WIN32 || defined WIN64) && !defined(ARM64) voodoo_codegen_close(voodoo); #endif #endif diff --git a/pcem/vid_voodoo_render.cpp b/pcem/vid_voodoo_render.cpp index 67eba7ca..63d1fc1e 100644 --- a/pcem/vid_voodoo_render.cpp +++ b/pcem/vid_voodoo_render.cpp @@ -646,9 +646,9 @@ static inline void voodoo_tmu_fetch_and_blend(voodoo_t *voodoo, voodoo_params_t state->tex_a[0] ^= 0xff; } -#if (defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32) && !(defined __amd64__) +#if (defined i386 || defined __i386 || defined __i386__ || defined _X86_ || defined WIN32 || defined _WIN32 || defined _WIN32) && !defined __amd64__ && !defined ARM64 #include "vid_voodoo_codegen_x86.h" -#elif (defined __amd64__ && defined WIN64) +#elif (defined __amd64__ && defined WIN64 && !defined ARM64) #include "vid_voodoo_codegen_x86-64.h" #else int voodoo_recomp = 0; @@ -778,7 +778,7 @@ static void voodoo_half_triangle(voodoo_t *voodoo, voodoo_params_t *params, vood } #ifndef NO_CODEGEN typedef uint8_t(__cdecl *VOODOO_DRAW)(voodoo_state_t*,voodoo_params_t*, int,int); -#if (defined WIN32 || defined WIN64) +#if (defined WIN32 || defined WIN64) && !defined ARM64 if (voodoo->use_recompiler) voodoo_draw = (VOODOO_DRAW)voodoo_get_block(voodoo, params, state, odd_even); else diff --git a/prowizard/include/extern.h b/prowizard/include/extern.h index 0e60b8ce..5c78ae2b 100644 --- a/prowizard/include/extern.h +++ b/prowizard/include/extern.h @@ -323,7 +323,8 @@ extern void Support_Types ( void ); extern void Support_Types_FileDefault ( void ); extern void Save_Rip ( char *, int ); extern void Save_Rip_Special ( char *, int, Uchar * , Ulong ); -extern void Crap ( char *, Uchar, Uchar, FILE *); +extern void Crap (char *, Uchar, Uchar, FILE *); +extern void Crap15 (char *, Uchar, Uchar, FILE *); extern short testSpecialCruncherData ( long , long ); extern void Rip_SpecialCruncherData ( char * , int , int ); extern short test_1_start ( Ulong ); @@ -331,7 +332,7 @@ extern short test_smps ( long, long, long, Uchar, Uchar ); extern long PWGetFileSize ( char * ); extern FILE * PW_fopen ( char *, char * ); extern void fillPTKtable ( Uchar[37][2] ); -extern int htonl(int); +extern unsigned int htonl(unsigned int); /* globals */ /* Some say it's badly coding when using Globals ... sure it is, now what's the solution ? */ diff --git a/prowizard/misc/misc.c b/prowizard/misc/misc.c index cc674e65..8d71d6fe 100644 --- a/prowizard/misc/misc.c +++ b/prowizard/misc/misc.c @@ -508,9 +508,7 @@ void fillPTKtable (Uchar poss[37][2]) return; } -#ifndef _WIN64 unsigned int htonl(unsigned int v) { return ((v >> 24) & 0x000000ff) | ((v >> 8) & 0x0000ff00) | ((v << 8) & 0x00ff0000) | ((v << 24) & 0xff000000); } -#endif