From 40d21b3321269e2d5e39c86e4dec5c87aaf7fc73 Mon Sep 17 00:00:00 2001
From: AlexandreRouma <alexandre.rouma@gmail.com>
Date: Sat, 2 Oct 2021 20:33:22 +0200
Subject: [PATCH] Final tweaks to windows CI for M17 decoder

---
 .github/workflows/build_all.yml | 3 +++
 m17_decoder/CMakeLists.txt      | 4 ++--
 make_windows_package.ps1        | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
index 02e775e8..25c2a960 100644
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@@ -47,6 +47,9 @@ jobs:
         - name: Build codec2
           run: cd codec2/build ; C:/msys64/msys2_shell.cmd -defterm -here -no-start -mingw64 -c "ninja"
 
+        - name: Install codec2
+          run: mkdir "C:/Program Files/codec2" ; mkdir "C:/Program Files/codec2/include" ; mkdir "C:/Program Files/codec2/include/codec2" ; mkdir "C:/Program Files/codec2/lib" ; cd "codec2" ; xcopy "src" "C:/Program Files/codec2/include" ; cd "build" ; xcopy "src" "C:/Program Files/codec2/lib" ; xcopy "codec2" "C:/Program Files/codec2/include/codec2"
+
         - name: Install vcpkg dependencies
           run: vcpkg install fftw3:x64-windows glew:x64-windows glfw3:x64-windows portaudio:x64-windows
 
diff --git a/m17_decoder/CMakeLists.txt b/m17_decoder/CMakeLists.txt
index 4ab7b7f2..b397f835 100644
--- a/m17_decoder/CMakeLists.txt
+++ b/m17_decoder/CMakeLists.txt
@@ -23,8 +23,8 @@ set_target_properties(m17_decoder PROPERTIES PREFIX "")
 
 if (MSVC)
     # Lib path
-    target_include_directories(m17_decoder PUBLIC "C:/Users/ryzerth/Documents/Code/codec2/src")
-    target_link_directories(sdrpp_core PUBLIC "C:/Users/ryzerth/Documents/Code/codec2/build/src")
+    target_include_directories(m17_decoder PUBLIC "C:/Program Files/codec2/include/")
+    target_link_directories(sdrpp_core PUBLIC "C:/Program Files/codec2/lib")
 
     target_link_libraries(m17_decoder PRIVATE libcodec2)
 
diff --git a/make_windows_package.ps1 b/make_windows_package.ps1
index fb113da6..00707b70 100644
--- a/make_windows_package.ps1
+++ b/make_windows_package.ps1
@@ -52,6 +52,9 @@ cp $build_dir/network_sink/Release/network_sink.dll sdrpp_windows_x64/modules/
 
 
 # Copy decoder modules
+cp $build_dir/m17_decoder/Release/m17_decoder.dll sdrpp_windows_x64/modules/
+cp "C:/Program Files/codec2/lib/libcodec2.dll" sdrpp_windows_x64/
+
 cp $build_dir/meteor_demodulator/Release/meteor_demodulator.dll sdrpp_windows_x64/modules/
 cp $build_dir/radio/Release/radio.dll sdrpp_windows_x64/modules/