From 935abfa226de0aa324b987cdab46a9b095d02de8 Mon Sep 17 00:00:00 2001 From: Jeremy Poulter Date: Fri, 15 Jul 2016 15:55:25 +0100 Subject: [PATCH] Output Dlls to a consistent location per config/platform --- QRCodeSource.sln | 11 +++- QRCodeSource/QRCodeSource.vcxproj | 79 ++++++++++++++++++++++++++++- QRCodeSource/QRCodeSourceVS.vcxproj | 79 ++++++++++++++++++++++++++++- Test.vpy | 2 +- 4 files changed, 165 insertions(+), 6 deletions(-) diff --git a/QRCodeSource.sln b/QRCodeSource.sln index 79aaba6..2bd7117 100644 --- a/QRCodeSource.sln +++ b/QRCodeSource.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QRCodeSource", "QRCodeSource\QRCodeSource.vcxproj", "{47BE75AE-90B7-43FB-89AC-648D288EAFD4}" EndProject @@ -10,17 +10,26 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {47BE75AE-90B7-43FB-89AC-648D288EAFD4}.Debug|Win32.ActiveCfg = Debug|Win32 {47BE75AE-90B7-43FB-89AC-648D288EAFD4}.Debug|Win32.Build.0 = Debug|Win32 + {47BE75AE-90B7-43FB-89AC-648D288EAFD4}.Debug|x64.ActiveCfg = Debug|x64 + {47BE75AE-90B7-43FB-89AC-648D288EAFD4}.Debug|x64.Build.0 = Debug|x64 {47BE75AE-90B7-43FB-89AC-648D288EAFD4}.Release|Win32.ActiveCfg = Release|Win32 {47BE75AE-90B7-43FB-89AC-648D288EAFD4}.Release|Win32.Build.0 = Release|Win32 + {47BE75AE-90B7-43FB-89AC-648D288EAFD4}.Release|x64.ActiveCfg = Release|x64 {4E5F178A-4084-47F4-99A9-7524DDF23B2D}.Debug|Win32.ActiveCfg = Debug|Win32 {4E5F178A-4084-47F4-99A9-7524DDF23B2D}.Debug|Win32.Build.0 = Debug|Win32 + {4E5F178A-4084-47F4-99A9-7524DDF23B2D}.Debug|x64.ActiveCfg = Debug|x64 + {4E5F178A-4084-47F4-99A9-7524DDF23B2D}.Debug|x64.Build.0 = Debug|x64 {4E5F178A-4084-47F4-99A9-7524DDF23B2D}.Release|Win32.ActiveCfg = Release|Win32 {4E5F178A-4084-47F4-99A9-7524DDF23B2D}.Release|Win32.Build.0 = Release|Win32 + {4E5F178A-4084-47F4-99A9-7524DDF23B2D}.Release|x64.ActiveCfg = Release|x64 + {4E5F178A-4084-47F4-99A9-7524DDF23B2D}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/QRCodeSource/QRCodeSource.vcxproj b/QRCodeSource/QRCodeSource.vcxproj index 297e54a..fd87887 100644 --- a/QRCodeSource/QRCodeSource.vcxproj +++ b/QRCodeSource/QRCodeSource.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {47BE75AE-90B7-43FB-89AC-648D288EAFD4} @@ -23,6 +31,12 @@ Unicode v140 + + DynamicLibrary + true + Unicode + v140 + DynamicLibrary false @@ -30,23 +44,48 @@ Unicode v140 + + DynamicLibrary + false + true + Unicode + v140 + + + + + + + true - $(Configuration)\As\ + $(Configuration)\As\$(Platform)\ + $(SolutionDir)$(Configuration)\As\$(Platform)\ + + + true + $(Configuration)\As\$(Platform)\ + $(SolutionDir)$(Configuration)\As\$(Platform)\ false - $(Configuration)\As\ + $(Configuration)\As\$(Platform)\ + $(SolutionDir)$(Configuration)\As\$(Platform)\ + + + false + $(Configuration)\As\$(Platform)\ + $(SolutionDir)$(Configuration)\As\$(Platform)\ @@ -64,6 +103,22 @@ true + + + + + Level3 + Disabled + WIN32;HAVE_CONFIG_H;_DEBUG;_WINDOWS;_USRDLL;QRCODESOURCE_EXPORTS;%(PreprocessorDefinitions) + + + $(ProjectDir);%(AdditionalIncludeDirectories) + + + Windows + true + + Level3 @@ -84,6 +139,26 @@ true + + + Level3 + + + MaxSpeed + true + true + WIN32;HAVE_CONFIG_H;NDEBUG;_WINDOWS;_USRDLL;QRCODESOURCE_EXPORTS;%(PreprocessorDefinitions) + + + $(ProjectDir);%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + diff --git a/QRCodeSource/QRCodeSourceVS.vcxproj b/QRCodeSource/QRCodeSourceVS.vcxproj index 2843bff..cd50653 100644 --- a/QRCodeSource/QRCodeSourceVS.vcxproj +++ b/QRCodeSource/QRCodeSourceVS.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {4E5F178A-4084-47F4-99A9-7524DDF23B2D} @@ -23,6 +31,12 @@ Unicode v140 + + DynamicLibrary + true + Unicode + v140 + DynamicLibrary false @@ -30,23 +44,48 @@ Unicode v140 + + DynamicLibrary + false + true + Unicode + v140 + + + + + + + true - $(Configuration)\VS\ + $(Configuration)\VS\$(Platform)\ + $(SolutionDir)$(Configuration)\VS\$(Platform)\ + + + true + $(SolutionDir)$(Configuration)\VS\$(Platform)\ + $(Configuration)\VS\$(Platform)\ false - $(Configuration)\VS\ + $(Configuration)\VS\$(Platform)\ + $(SolutionDir)$(Configuration)\VS\$(Platform)\ + + + false + $(SolutionDir)$(Configuration)\VS\$(Platform)\ + $(Configuration)\VS\$(Platform)\ @@ -64,6 +103,22 @@ true + + + + + Level3 + Disabled + WIN32;HAVE_CONFIG_H;IS_VAPOURSYNTH;_DEBUG;_WINDOWS;_USRDLL;QRCODESOURCE_EXPORTS;%(PreprocessorDefinitions) + + + C:\Program Files %28x86%29\VapourSynth\sdk\include\vapoursynth;$(ProjectDir);%(AdditionalIncludeDirectories) + + + Windows + true + + Level3 @@ -84,6 +139,26 @@ true + + + Level3 + + + MaxSpeed + true + true + WIN32;HAVE_CONFIG_H;IS_VAPOURSYNTH;NDEBUG;_WINDOWS;_USRDLL;QRCODESOURCE_EXPORTS;%(PreprocessorDefinitions) + + + C:\Program Files %28x86%29\VapourSynth\sdk\include\vapoursynth;$(ProjectDir);%(AdditionalIncludeDirectories) + + + Windows + true + true + true + + diff --git a/Test.vpy b/Test.vpy index 370735a..b2bdd80 100644 --- a/Test.vpy +++ b/Test.vpy @@ -4,7 +4,7 @@ import math core = vs.get_core() -core.std.LoadPlugin(path="D:/Users/Jeremy/Documents/Dev/JeremyPoulter/QRCodeSource/Debug/QRCodeSourceVS.dll") +#core.std.LoadPlugin(path="D:/Users/Jeremy/Documents/Dev/JeremyPoulter/QRCodeSource/Debug/QRCodeSourceVS.dll") def overlay(bottom, top, x, y): # crop the top clip if needed