Last active
August 30, 2019 12:29
-
-
Save maki-rxrz/a65679d05aaa5efb203299eff1e2faea to your computer and use it in GitHub Desktop.
AviSynth+ patches
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AviSynth+ 用パッチ | |
【対象 repo】 | |
https://github.com/pinterf/AviSynthPlus | |
---------------------------------------------------------------------------------------------------- | |
■ 0001-CMakeLists-Disable-WinXP-support-on-MSVC-2019.patch | |
---------------------------------------------------------------------------------------------------- | |
VS2019ビルド時にXP非サポートでビルドする為のパッチです。 | |
---------------------------------------------------------------------------------------------------- | |
■ 0002-AvsCore-Add-include-directory-check-for-out-of-tree-.patch | |
---------------------------------------------------------------------------------------------------- | |
コンフィグレーション&ビルド処理を外部ディレクトリで行える様にする為の修正パッチです。 | |
---------------------------------------------------------------------------------------------------- | |
maki |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 40620b50d5898d5637f288cb0ca8de51f675a44a Mon Sep 17 00:00:00 2001 | |
From: Masaki Tanaka <maki.rxrz@gmail.com> | |
Date: Thu, 23 May 2019 00:00:00 +0900 | |
Subject: [PATCH 1/2] CMakeLists: Disable WinXP support on MSVC 2019 | |
--- | |
CMakeLists.txt | 11 +++++++++-- | |
1 file changed, 9 insertions(+), 2 deletions(-) | |
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index 3f65423c..988be41e 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -68,10 +68,17 @@ IF( MSVC ) # Check for Visual Studio | |
# https://connect.microsoft.com/VisualStudio/feedback/details/1789709/visual-c-2015-runtime-broken-on-windows-server-2003-c-11-magic-statics | |
message("CMAKE_GENERATOR_TOOLSET is forced to: ${CMAKE_GENERATOR_TOOLSET}") | |
add_definitions("/Zc:threadSafeInit-") | |
- ENDIF() | |
+ ENDIF() | |
+ ELSEIF(MSVC_VERSION VERSION_LESS 1920 ) | |
+ IF(NOT CLANG_IN_VS STREQUAL "1") | |
+ set(CMAKE_GENERATOR_TOOLSET "v141_xp" CACHE STRING "The compiler toolset to use for Visual Studio." FORCE) # VS2017 | |
+ # https://connect.microsoft.com/VisualStudio/feedback/details/1789709/visual-c-2015-runtime-broken-on-windows-server-2003-c-11-magic-statics | |
+ message("CMAKE_GENERATOR_TOOLSET is forced to: ${CMAKE_GENERATOR_TOOLSET}") | |
+ add_definitions("/Zc:threadSafeInit-") | |
+ ENDIF() | |
ELSE() | |
IF(NOT CLANG_IN_VS STREQUAL "1") | |
- set(CMAKE_GENERATOR_TOOLSET "v141_xp" CACHE STRING "The compiler toolset to use for Visual Studio." FORCE) # VS2017, also choosable for VS2019 | |
+ set(CMAKE_GENERATOR_TOOLSET "v142" CACHE STRING "The compiler toolset to use for Visual Studio." FORCE) # VS2019 | |
# https://connect.microsoft.com/VisualStudio/feedback/details/1789709/visual-c-2015-runtime-broken-on-windows-server-2003-c-11-magic-statics | |
message("CMAKE_GENERATOR_TOOLSET is forced to: ${CMAKE_GENERATOR_TOOLSET}") | |
add_definitions("/Zc:threadSafeInit-") | |
-- | |
2.23.0.windows.1 | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From eb36dc675fda99df28e5684df6dea6bf7a7d97f6 Mon Sep 17 00:00:00 2001 | |
From: Masaki Tanaka <maki.rxrz@gmail.com> | |
Date: Tue, 31 Jan 2017 00:00:00 +0900 | |
Subject: [PATCH 2/2] AvsCore: Add include directory check for out-of-tree | |
build | |
--- | |
avs_core/CMakeLists.txt | 6 +++++- | |
1 file changed, 5 insertions(+), 1 deletion(-) | |
diff --git a/avs_core/CMakeLists.txt b/avs_core/CMakeLists.txt | |
index db9dd61b..e3cc2113 100644 | |
--- a/avs_core/CMakeLists.txt | |
+++ b/avs_core/CMakeLists.txt | |
@@ -74,7 +74,11 @@ elseif (MINGW) | |
endif() | |
# Specify include directories | |
-target_include_directories("AvsCore" PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) | |
+if (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) | |
+ target_include_directories("AvsCore" PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) | |
+else() | |
+ target_include_directories("AvsCore" PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}) | |
+endif() | |
# Specify preprocessor definitions | |
target_compile_definitions("AvsCore" PRIVATE BUILDING_AVSCORE) | |
-- | |
2.23.0.windows.1 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment