From 8cdf5cee26486f99494adb663f6ae6ac1c491225 Mon Sep 17 00:00:00 2001 From: Mr_Goldberg Date: Fri, 14 Feb 2020 15:00:16 -0500 Subject: [PATCH] Proper vcpkg directory for protobuf (thanks Christsnatcher). --- .gitlab-ci.yml | 2 +- build_set_protobuf_directories.bat | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cb8671..b35fb13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,7 @@ build_windows: - dnf -y install wine wget p7zip sed dos2unix - unix2dos *.txt - unix2dos files_example/*.txt files_example/*/*.txt - - sed -i 's/..\\vcpkg\\packages\\/.\\/g' build_set_protobuf_directories.bat + - sed -i 's/..\\vcpkg\\installed\\/.\\/g' build_set_protobuf_directories.bat - wget 'https://gitlab.com/Mr_Goldberg/goldberg_emulator/uploads/48db8f434a193aae872279dc4f5dde6a/sdk_standalone.7z' - wget 'https://gitlab.com/Mr_Goldberg/goldberg_emulator/uploads/0119304e030098b4821d73170fe52084/protobuf_x64-windows-static.7z' - wget 'https://gitlab.com/Mr_Goldberg/goldberg_emulator/uploads/4185a97ab363ddc1859127e59ec68581/protobuf_x86-windows-static.7z' diff --git a/build_set_protobuf_directories.bat b/build_set_protobuf_directories.bat index bf81456..2d8e703 100755 --- a/build_set_protobuf_directories.bat +++ b/build_set_protobuf_directories.bat @@ -1,7 +1,7 @@ @echo off cd /d "%~dp0" -SET PROTOBUF_X86_DIRECTORY=..\vcpkg\packages\protobuf_x86-windows-static -SET PROTOBUF_X64_DIRECTORY=..\vcpkg\packages\protobuf_x64-windows-static +SET PROTOBUF_X86_DIRECTORY=..\vcpkg\installed\protobuf_x86-windows-static +SET PROTOBUF_X64_DIRECTORY=..\vcpkg\installed\protobuf_x64-windows-static rem location of protoc in protobuf directories: SET PROTOC_X86_EXE=%PROTOBUF_X86_DIRECTORY%\tools\protobuf\protoc.exe