Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows on ARM fixes #427

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Windows on ARM fixes #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
36320c3
Shibatch: check for GCC or Clang for MulDiv under MinGW
qyot27 Jan 13, 2025
9e586ac
WinInstaller: add InnoSetup script for Windows on ARM
qyot27 Jan 13, 2025
51622fc
plugins/CMakeLists.txt: restrict VDubFilter to x86(-64)
qyot27 Jan 13, 2025
5b3ebad
avs/config.h: add defines to separate X86 and ARM Windows variants
qyot27 Jan 14, 2025
a99398d
PluginManager: only enable +GCC plugindir registry entries on X86
qyot27 Jan 14, 2025
bd4fb07
PluginManager: indent cosmetics for clarity
qyot27 Jan 15, 2025
92d3a52
docs: add pkgconf instructions to the external libraries guide
qyot27 Feb 7, 2025
e0812fd
buildsystem: restrict use of MSVC to x86(-64) only
qyot27 Feb 8, 2025
6e6444f
docs: remove ARM64 instructions from MSVC external deps guide
qyot27 Feb 8, 2025
0b0685c
docs: add external deps build guide for Windows on ARM
qyot27 Feb 8, 2025
93b9f37
docs: update external deps to xz-5.6.3
qyot27 Feb 9, 2025
b014233
plugin/CMakeLists: add CMake detection fallback for SoundTouch
qyot27 Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,19 @@ endif()
#1920-1929 = VS 16.0 (v142 toolset) Visual Studio 2019
#1930-1939 = VS 17.0 (v143 toolset) Visual Studio 2022

# detect if the target is for x86
string(TOLOWER "${CMAKE_VS_PLATFORM_NAME}" PLATFORMID)
if(("${PLATFORMID}" STREQUAL "win32") OR
("${PLATFORMID}" STREQUAL "x64" ))
set(NON_X86_PLATFORM "OFF")
else()
set(NON_X86_PLATFORM "ON")
endif()

if(NON_X86_PLATFORM)
message(FATAL_ERROR "MSVC/ClangCL only supported on x86(-64). Use MinGW (llvm-mingw or gcc).")
endif()

IF( MSVC_VERSION VERSION_LESS 1910 )
MESSAGE(FATAL_ERROR "Visual C++ 2017 or newer required.")
ENDIF()
Expand Down
62 changes: 35 additions & 27 deletions avs_core/core/PluginManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,17 @@ typedef const char* (__stdcall *AvisynthPluginInit2Func)(IScriptEnvironment_Avs2
typedef const char* (AVSC_CC *AvisynthCPluginInitFunc)(AVS_ScriptEnvironment* env);

#ifdef AVS_WINDOWS // only Windows has a registry we care about
const char RegAvisynthKey[] = "Software\\Avisynth";
#if defined (__GNUC__)
const char RegPluginDirPlus_GCC[] = "PluginDir+GCC";
#if defined(X86_32)
#define GCC_WIN32
#endif
#else
const char RegPluginDirClassic[] = "PluginDir2_5";
const char RegPluginDirPlus[] = "PluginDir+";
#endif
const char RegAvisynthKey[] = "Software\\Avisynth";
#if defined (AVS_WINDOWS_X86)
#if defined (__GNUC__)
const char RegPluginDirPlus_GCC[] = "PluginDir+GCC";
#if defined(X86_32)
#define GCC_WIN32
#endif // X86_32
#endif // __GNUC__
#endif // AVS_WINDOWS_X86
const char RegPluginDirClassic[] = "PluginDir2_5";
const char RegPluginDirPlus[] = "PluginDir+";
#endif // AVS_WINDOWS

#ifdef AVS_POSIX
Expand Down Expand Up @@ -612,23 +613,30 @@ void PluginManager::AddAutoloadDir(const std::string &dirPath, bool toFront)

std::string plugin_dir;
#ifdef AVS_WINDOWS
#if defined (__GNUC__)
if (GetRegString(HKEY_CURRENT_USER, RegAvisynthKey, RegPluginDirPlus_GCC, &plugin_dir))
replace_beginning(dir, "USER_PLUS_PLUGINS", plugin_dir);
if (GetRegString(HKEY_LOCAL_MACHINE, RegAvisynthKey, RegPluginDirPlus_GCC, &plugin_dir))
replace_beginning(dir, "MACHINE_PLUS_PLUGINS", plugin_dir);
#else
// note: if e.g HKCU/PluginDir+ does not exist, USER_PLUS_PLUGINS as a string remain in search path
if (GetRegString(HKEY_CURRENT_USER, RegAvisynthKey, RegPluginDirPlus, &plugin_dir))
replace_beginning(dir, "USER_PLUS_PLUGINS", plugin_dir);
if (GetRegString(HKEY_LOCAL_MACHINE, RegAvisynthKey, RegPluginDirPlus, &plugin_dir))
replace_beginning(dir, "MACHINE_PLUS_PLUGINS", plugin_dir);
if (GetRegString(HKEY_CURRENT_USER, RegAvisynthKey, RegPluginDirClassic, &plugin_dir))
replace_beginning(dir, "USER_CLASSIC_PLUGINS", plugin_dir);
if (GetRegString(HKEY_LOCAL_MACHINE, RegAvisynthKey, RegPluginDirClassic, &plugin_dir))
replace_beginning(dir, "MACHINE_CLASSIC_PLUGINS", plugin_dir);
#endif
#endif
#if defined (AVS_WINDOWS_X86)
#if defined (__GNUC__)
if (GetRegString(HKEY_CURRENT_USER, RegAvisynthKey, RegPluginDirPlus_GCC, &plugin_dir))
replace_beginning(dir, "USER_PLUS_PLUGINS", plugin_dir);
if (GetRegString(HKEY_LOCAL_MACHINE, RegAvisynthKey, RegPluginDirPlus_GCC, &plugin_dir))
replace_beginning(dir, "MACHINE_PLUS_PLUGINS", plugin_dir);
#else
// note: if e.g HKCU/PluginDir+ does not exist, USER_PLUS_PLUGINS as a string remain in search path
if (GetRegString(HKEY_CURRENT_USER, RegAvisynthKey, RegPluginDirPlus, &plugin_dir))
replace_beginning(dir, "USER_PLUS_PLUGINS", plugin_dir);
if (GetRegString(HKEY_LOCAL_MACHINE, RegAvisynthKey, RegPluginDirPlus, &plugin_dir))
replace_beginning(dir, "MACHINE_PLUS_PLUGINS", plugin_dir);
if (GetRegString(HKEY_CURRENT_USER, RegAvisynthKey, RegPluginDirClassic, &plugin_dir))
replace_beginning(dir, "USER_CLASSIC_PLUGINS", plugin_dir);
if (GetRegString(HKEY_LOCAL_MACHINE, RegAvisynthKey, RegPluginDirClassic, &plugin_dir))
replace_beginning(dir, "MACHINE_CLASSIC_PLUGINS", plugin_dir);
#endif // _GNUC_
#else
if (GetRegString(HKEY_CURRENT_USER, RegAvisynthKey, RegPluginDirPlus, &plugin_dir))
replace_beginning(dir, "USER_PLUS_PLUGINS", plugin_dir);
if (GetRegString(HKEY_LOCAL_MACHINE, RegAvisynthKey, RegPluginDirPlus, &plugin_dir))
replace_beginning(dir, "MACHINE_PLUS_PLUGINS", plugin_dir);
#endif // AVS_WINDOWS_X86
#endif // AVS_WINDOWS

// replace backslashes with forward slashes
replace(dir, '\\', '/');
Expand Down
12 changes: 12 additions & 0 deletions avs_core/include/avs/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,18 @@
# error Operating system unsupported.
#endif

#if defined(AVS_WINDOWS)
# if defined(X86_32) || defined(X86_64)
# define AVS_WINDOWS_X86
# elif defined(ARM64) || defined(ARM32)
# define AVS_WINDOWS_ARM
# endif
#endif

#if defined(MSVC) && !defined(AVS_WINDOWS_X86)
# error Unsupported combination of compiler, operating system, and machine architecture.
#endif

// useful warnings disabler macros for supported compilers

#if defined(_MSC_VER)
Expand Down
Loading