diff --git a/.gitignore b/.gitignore index 48adf9b..2883364 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /Textractor* /build/ /builds/ +/out/ *.vs/ *.vscode/ *.user diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f6c8ca..e63ae52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_FINAL_OUTPUT_DIRECTORY}>) include_directories(include) link_directories(${LIBDIR}) +file(GLOB LIBS ${LIBDIR}/*) +file(COPY ${LIBS} DESTINATION ${CMAKE_FINAL_OUTPUT_DIRECTORY}) add_library(text text.cpp) target_compile_definitions(text PRIVATE ${TEXT_LANGUAGE}) diff --git a/deploy.ps1 b/deploy.ps1 index 2f6431c..9c0353a 100644 --- a/deploy.ps1 +++ b/deploy.ps1 @@ -22,10 +22,9 @@ foreach ($language in @{ foreach ($arch in @("x86", "x64")) { cd $arch; - $cmakeArch = if ($arch -eq "x86") {""} else {" Win64"}; - $vsArch = if ($arch -eq "x86") {"Win32"} else {"x64"}; - cmake -G "Visual Studio 15 2017$cmakeArch" -DVERSION="$version" -DTEXT_LANGUAGE="$($language.Key)" -DCMAKE_BUILD_TYPE="Release" ../..; - &"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv" Textractor.sln /build "Release|$vsArch"; + $VS_arch = if ($arch -eq "x86") {"Win32"} else {"x64"}; + cmake -G "Visual Studio 16 2019" -A"$VS_arch" -DVERSION="$version" -DTEXT_LANGUAGE="$($language.Key)" -DCMAKE_BUILD_TYPE="Release" ../..; + &"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv" Textractor.sln /build "Release|$VS_arch"; cd ..; mkdir -Force -Verbose "$folder/$arch"; foreach ($file in @(