Attempt to fix issues with new vcpkg-based deployment (AppVeyor)

CE-Programming · Aug 25, 2018 · 5ebfd6d · 5ebfd6d
1 parent e133e89
commit 5ebfd6d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -69,11 +69,11 @@ build_script:
   - cmd: set ZLIB_LIB=C:\libpng-apng-1.6.34\debug\32bit\static\zlib.lib
   - cmd: set LIBPNG_APNG_LIB=C:\libpng-apng-1.6.34\debug\32bit\static\libpng16.lib
   - C:\Qt\Qt5.10.1-static\bin\qmake -spec win32-msvc -tp vc CEMU_VERSION=%CEMU_VERSION:~1% LIBS+=%ZLIB_LIB% LIBS+=%LIBPNG_APNG_LIB% INCLUDEPATH+=%LIBPNG_APNG_INCLUDE% "..\gui\qt\CEmu.pro"
-  - msbuild CEmu.vcxproj /p:Configuration=Debug
+  - msbuild CEmu.vcxproj /p:Configuration=Debug /p:VcpkgTriplet=x86-windows-static
   - cmd: set ZLIB_LIB=C:\libpng-apng-1.6.34\release\32bit\static\zlib.lib
   - cmd: set LIBPNG_APNG_LIB=C:\libpng-apng-1.6.34\release\32bit\static\libpng16.lib
   - C:\Qt\Qt5.10.1-static\bin\qmake -spec win32-msvc -tp vc CEMU_VERSION=%CEMU_VERSION:~1% LIBS+=%ZLIB_LIB% LIBS+=%LIBPNG_APNG_LIB% INCLUDEPATH+=%LIBPNG_APNG_INCLUDE% "..\gui\qt\CEmu.pro"
-  - msbuild CEmu.vcxproj /p:Configuration=Release
+  - msbuild CEmu.vcxproj /p:Configuration=Release /p:VcpkgTriplet=x86-windows-static
   - cd ..
 
   - endlocal
@@ -97,11 +97,11 @@ build_script:
   - cmd: set ZLIB_LIB=C:\libpng-apng-1.6.34\debug\64bit\static\zlib.lib
   - cmd: set LIBPNG_APNG_LIB=C:\libpng-apng-1.6.34\debug\64bit\static\libpng16.lib
   - C:\Qt\Qt5.10.1x64-static\bin\qmake -spec win32-msvc -tp vc CEMU_VERSION=%CEMU_VERSION:~1% LIBS+=%ZLIB_LIB% LIBS+=%LIBPNG_APNG_LIB% INCLUDEPATH+=%LIBPNG_APNG_INCLUDE% "..\gui\qt\CEmu.pro"
-  - msbuild CEmu.vcxproj /p:Configuration=Debug /p:Platform="x64"
+  - msbuild CEmu.vcxproj /p:Configuration=Debug /p:Platform="x64" /p:VcpkgTriplet=x64-windows-static
   - cmd: set ZLIB_LIB=C:\libpng-apng-1.6.34\release\64bit\static\zlib.lib
   - cmd: set LIBPNG_APNG_LIB=C:\libpng-apng-1.6.34\release\64bit\static\libpng16.lib
   - C:\Qt\Qt5.10.1x64-static\bin\qmake -spec win32-msvc -tp vc CEMU_VERSION=%CEMU_VERSION:~1% LIBS+=%ZLIB_LIB% LIBS+=%LIBPNG_APNG_LIB% INCLUDEPATH+=%LIBPNG_APNG_INCLUDE% "..\gui\qt\CEmu.pro"
-  - msbuild CEmu.vcxproj /p:Configuration=Release /p:Platform="x64"
+  - msbuild CEmu.vcxproj /p:Configuration=Release /p:Platform="x64" /p:VcpkgTriplet=x64-windows-static
   - cd ..
 
   - endlocal

diff --git a/gui/qt/deploy-scripts/appveyor_helper.py b/gui/qt/deploy-scripts/appveyor_helper.py
@@ -625,6 +625,7 @@ def deploy_snapshots():
                        os.path.join("deploy", "release32"),
                        extra_wc = {
                                     "libpng/zlib x86 release DLLs" : r"C:\libpng-apng-1.6.34\release\32bit\shared\*.dll",
+                                    "vcpkg provided DLLs" : os.path.join("build_32", "release") + r"\*.dll"
                                   }
                       )
     collect_main_files("x64", r"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\*.dll",
@@ -633,6 +634,7 @@ def deploy_snapshots():
                        os.path.join("deploy", "release64"),
                        extra_wc = {
                                     "libpng/zlib x64 release DLLs" : r"C:\libpng-apng-1.6.34\release\64bit\shared\*.dll",
+                                    "vcpkg provided DLLs" : os.path.join("build_64", "release") + r"\*.dll"
                                   }
                       )
 
@@ -645,6 +647,7 @@ def deploy_snapshots():
                        extra_wc = {
                                     "UCRT Debug" : r"C:\Program Files (x86)\Windows Kits\10\bin\x86\ucrt\*.dll",
                                     "libpng/zlib x86 debug DLLs" : r"C:\libpng-apng-1.6.34\debug\32bit\shared\*.dll",
+                                    "vcpkg provided DLLs" : os.path.join("build_32", "debug") + r"\*.dll"
                                   }
                       )
     collect_main_files("x64 Debug", r"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\debug_nonredist\x64\Microsoft.VC140.DebugCRT\*.dll",
@@ -654,6 +657,7 @@ def deploy_snapshots():
                        extra_wc = {
                                     "UCRT Debug" : r"C:\Program Files (x86)\Windows Kits\10\bin\x64\ucrt\*.dll",
                                     "libpng/zlib x64 debug DLLs" : r"C:\libpng-apng-1.6.34\debug\64bit\shared\*.dll",
+                                    "vcpkg provided DLLs" : os.path.join("build_64", "debug") + r"\*.dll"
                                   }
                       )