dll again

petiaccja · Mar 23, 2024 · 0f130d7 · 0f130d7
1 parent 82ddccf
commit 0f130d7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -146,19 +146,15 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: SEDManager-${{ matrix.core_profile }}
-          path: ${{github.workspace}}/core_binary
-
-      - name: "Install core"
-        run: |
-          cp ${{github.workspace}}/core_binary/*SEDManagerCAPI* ${{github.workspace}}/src/SEDManagerGUI/${{matrix.binary_path}}
+          path: ${{github.workspace}}/core
 
       - name: "Install GUI Dart dependencies"
         working-directory: ${{github.workspace}}/src/SEDManagerGUI
         run: flutter pub get
 
       - name: "Test GUI"
         working-directory: ${{github.workspace}}/src/SEDManagerGUI
-        run: flutter test
+        run: flutter test --dart-define=CAPI_LIBRARY_PATH=${{github.workspace}}/core
 
       - name: "Build GUI"
         working-directory: ${{github.workspace}}/src/SEDManagerGUI

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,9 +33,4 @@ add_subdirectory(test)
 
 install(
 	TARGETS SEDManagerCLI SEDManagerCAPI DESTINATION "."
-	RUNTIME_DEPENDENCIES
-		PRE_EXCLUDE_REGEXES "ext-ms-.*" "api-ms-.*" "hvsifiletrust.dll" "pdmutilities.dll"
-		DIRECTORIES ${EXTRA_RUNTIME_DEPENDENCY_DIRS}
-		POST_EXCLUDE_REGEXES ".*system32/.*\\.dll"
-		DESTINATION "."
 )
diff --git a/src/SEDManagerGUI/lib/bindings/sedmanager_capi.dart b/src/SEDManagerGUI/lib/bindings/sedmanager_capi.dart
@@ -4,7 +4,9 @@ import 'dart:io' show Platform;
 import 'package:path/path.dart' as path;
 
 final libraryName = Platform.isWindows ? "SEDManagerCAPI.dll" : "libSEDManagerCAPI.so";
-final libraryPath = path.join(Platform.resolvedExecutable, libraryName)
+const libraryDirEnv = String.fromEnvironment("CAPI_LIBRARY_PATH", defaultValue: "");
+final libraryDirLocal = Platform.resolvedExecutable;
+final libraryPath = path.join(libraryDirEnv.isEmpty ? libraryDirLocal : libraryDirEnv, libraryName);
 
 typedef CUID = Uint64;