Skip to content

Check MSVC Runtime before loading natives #1809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcm001 merged 5 commits into from
Mar 12, 2025
Merged

Check MSVC Runtime before loading natives #1809

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75a7acd
Check MSVC Runtime before loading natives
person4268 Mar 11, 2025
549d90c
alternate approach that actually works
person4268 Mar 12, 2025
1b62d44
revert index.html
person4268 Mar 12, 2025
f0d5726
remove print statement
person4268 Mar 12, 2025
2371cb6
move WpilibLoader to correct dir, fix formatting on it
person4268 Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...va/org/photonvision/jni/WpilibLoader.java → ...va/org/photonvision/jni/WpilibLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@

package org.photonvision.jni;

import java.io.IOException;

import org.opencv.core.Core;

import edu.wpi.first.apriltag.jni.AprilTagJNI;
import edu.wpi.first.cscore.CameraServerJNI;
import edu.wpi.first.cscore.OpenCvLoader;
Expand All @@ -30,9 +26,12 @@
import edu.wpi.first.networktables.NetworkTablesJNI;
import edu.wpi.first.util.CombinedRuntimeLoader;
import edu.wpi.first.util.WPIUtilJNI;
import java.io.IOException;
import org.opencv.core.Core;

public class WpilibLoader {
private static boolean has_loaded = false;

public static boolean loadLibraries() {
if (has_loaded) return true;

Expand All @@ -45,9 +44,11 @@ public static boolean loadLibraries() {
WPIMathJNI.Helper.setExtractOnStaticLoad(false);
AprilTagJNI.Helper.setExtractOnStaticLoad(false);
try {
// Need to load wpiutil first before checking if the MSVC runtime is valid
CombinedRuntimeLoader.loadLibraries(WpilibLoader.class, "wpiutiljni");
WPIUtilJNI.checkMsvcRuntime();
CombinedRuntimeLoader.loadLibraries(
WpilibLoader.class,
"wpiutiljni",
"wpimathjni",
"ntcorejni",
"wpinetjni",
Expand All @@ -56,7 +57,6 @@ public static boolean loadLibraries() {
"apriltagjni");

CombinedRuntimeLoader.loadLibraries(WpilibLoader.class, Core.NATIVE_LIBRARY_NAME);

has_loaded = true;
} catch (IOException e) {
e.printStackTrace();
Expand Down
Loading