github actions

Author: OpenFunscripter

.github/workflows/windows_build.yml …ub/workflows/publish_windows_release.yml.github/workflows/windows_build.yml renamed to .github/workflows/publish_windows_release.yml .github/workflows/windows_build.yml renamed to .github/workflows/publish_windows_release.yml

@@ -1,17 +1,11 @@
-# This is a basic workflow to help you get started with Actions
-
-name: windows_build
+name: PublishWindowsRelease
 
 env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
 
-# Controls when the workflow will run
 on:
-  # Triggers the workflow on push or pull request events but only for the main branch
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   build:
     runs-on: windows-2019
@@ -39,9 +33,6 @@ jobs:
     - name: Configure CMake
       shell: bash
       working-directory: ${{runner.workspace}}/build
-      # Note the current convention is to use the -S and -B options here to specify source 
-      # and build directories, but this is only available with CMake 3.13 and higher.  
-      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
       run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G "Visual Studio 16 2019" -A x64
 
     - name: Build OFS
@@ -53,28 +44,12 @@ jobs:
     
     - name: FFMPEG & Zip 
       run: |
-        choco install -y -r --no-progress 7zip
         choco install -y -r --no-progress InnoSetup
-        powershell Invoke-WebRequest -Uri "https://www.gyan.dev/ffmpeg/builds/ffmpeg-git-essentials.7z" -OutFile "${{runner.workspace}}\ffmpeg.7z" 
-
-        mkdir "${{runner.workspace}}\ffmpeg"
-        7z e "${{runner.workspace}}\ffmpeg.7z" -o${{runner.workspace}}\ffmpeg
-        cp "${{runner.workspace}}\ffmpeg\ffmpeg.exe" "${{runner.workspace}}\OFS\bin\Release\ffmpeg.exe"
         powershell Compress-Archive "${{runner.workspace}}\OFS\bin\Release" "${{runner.workspace}}\OFS-64x_${{github.sha}}.zip"
 
-#    - uses: actions/upload-artifact@v2
-#      with:
-#        name: OFS-64x_${{github.sha}}.zip
-#        path: ${{runner.workspace}}\OFS-64x_${{github.sha}}.zip
-
     - name: Installer
       run: iscc "${{runner.workspace}}\OFS\ofs-installer.iss"
 
-#    - uses: actions/upload-artifact@v2
-#      with:
-#        name: OFS-64x_${{github.sha}}.exe
-#        path: ${{runner.workspace}}\OFS\installer\ofs-installer.exe
-
     - name: Upload Release Zip
       id: upload-release-zip
       uses: actions/upload-release-asset@v1

OFS-lib/OFS_Util.cpp

@@ -464,13 +464,12 @@ bool Util::SavePNG(const std::string& path, void* buffer, int32_t width, int32_t
 
 std::filesystem::path Util::FfmpegPath() noexcept
 {
-	auto base_path = Util::Basepath();
 #if WIN32
-	auto ffmpeg_path = base_path / "ffmpeg.exe";
+	return Util::PathFromString(Util::Prefpath("ffmpeg.exe"));
 #else
-	auto ffmpeg_path = std::filesystem::path("ffmpeg");
+	auto ffmpegPath = std::filesystem::path("ffmpeg");
+	return ffmpegPath;
 #endif
-	return ffmpeg_path;
 }
 
 uint32_t Util::Hash(const char* data, size_t size, int32_t seed) noexcept

lib/CMakeLists.txt

@@ -309,4 +309,5 @@ file (GLOB ImGuizmo_SOURCES ImGuizmo/*.cpp)
 file (GLOB ImGuizmo_HEADERS ImGuizmo/*.h)
 add_library(ImGuizmo STATIC ${ImGuizmo_SOURCES} ${ImGuizmo_HEADERS})
 target_include_directories(ImGuizmo PUBLIC "ImGuizmo/")
-target_link_libraries(ImGuizmo PUBLIC imgui)
+target_link_libraries(ImGuizmo PUBLIC imgui)
+target_compile_features(ImGuizmo PRIVATE cxx_std_17)

ofs-installer.iss

@@ -18,7 +18,6 @@ OutputDir=.\installer
 [Files]
 Source: "bin\{#Configuration}\OpenFunscripter.exe"; DestDir: "{app}"
 Source: "bin\{#Configuration}\*.dll"; DestDir: "{app}"
-Source: "bin\{#Configuration}\ffmpeg.exe"; DestDir: "{app}"
 Source: "data\*"; Flags: recursesubdirs; DestDir: "{app}\data"
 
 [Icons]

src/UI/OFS_DownloadFfmpeg.cpp

@@ -57,7 +57,7 @@
 
     static DownloadStatusCallback cb;
 
-    static bool ExecuteSynchronous(const wchar_t* program, const wchar_t* params) noexcept
+    static bool ExecuteSynchronous(const wchar_t* program, const wchar_t* params, const wchar_t* directory) noexcept
     {
         bool succ = false;
         SHELLEXECUTEINFOW ShExecInfo = {0};
@@ -67,7 +67,7 @@
         ShExecInfo.lpVerb = NULL;
         ShExecInfo.lpFile = program;        
         ShExecInfo.lpParameters = params;   
-        ShExecInfo.lpDirectory = NULL;
+        ShExecInfo.lpDirectory = directory;
         ShExecInfo.nShow = SW_HIDE;
         ShExecInfo.hInstApp = NULL; 
         ShellExecuteExW(&ShExecInfo);
@@ -94,7 +94,7 @@ void OFS_DownloadFfmpeg::DownloadFfmpegModal() noexcept
 #ifdef WIN32
     static bool DownloadInProgress = false;
     static bool ExtractFailed = false;
-    static auto ZipExists = Util::FileExists((Util::Basepath() / "ffmpeg.zip").u8string());
+    static auto ZipExists = Util::FileExists(Util::Prefpath("ffmpeg.zip"));
 
     bool isOpen = true;
     if(ImGui::BeginPopupModal(OFS_DownloadFfmpeg::ModalText, DownloadInProgress ? NULL : &isOpen, ImGuiWindowFlags_AlwaysAutoResize)) {
@@ -103,9 +103,9 @@ void OFS_DownloadFfmpeg::DownloadFfmpegModal() noexcept
             ImGui::TextUnformatted("ffmpeg.exe was not found.\nDo you want to download it?");
             if(ImGui::Button("Yes", ImVec2(-1.f, 0.f))) {
                 auto dlThread = [](void* data) -> int {
-                    auto path = Util::Basepath();
-                    auto downloadPath = (path / "ffmpeg.zip").u8string();
-                    URLDownloadToFile(NULL, "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip",
+                    auto path = Util::PathFromString(Util::Prefpath());
+                    auto downloadPath =(path / "ffmpeg.zip").wstring();
+                    URLDownloadToFileW(NULL, L"https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip",
                         downloadPath.c_str(), 0, &cb);
                     return 0;
                 };
@@ -124,15 +124,16 @@ void OFS_DownloadFfmpeg::DownloadFfmpegModal() noexcept
             DownloadInProgress = false;
             ZipExists = true;
             std::wstringstream ss;
-            auto path = Util::Basepath();
+            auto path = Util::PathFromString(Util::Prefpath());
             auto downloadPath = (path / "ffmpeg.zip");
 
-            ss << L"-xvf ";
+            ss << L" -xvf ";
             ss << L'"' << downloadPath.wstring() << L'"';
             ss << L" --strip-components 2  **/ffmpeg.exe";
 
             auto params = ss.str();
-            ExtractFailed = !ExecuteSynchronous(L"tar.exe", params.c_str());
+            auto dir = Util::PathFromString(Util::Prefpath()).wstring();
+            ExtractFailed = !ExecuteSynchronous(L"tar.exe", params.c_str(), dir.c_str());
 
             if(!ExtractFailed) {
                 FfmpegMissing = false;