rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-14 11:29:26 +01:00
Code Issues Releases Activity

Windows: msvc*.dll are not found when loading AStyle.dll. Forcing load.

Browse Source 
Fixes #4076
This commit is contained in:
Federico Fissore 2015-11-06 13:41:59 +01:00
parent 90f09e9b38
commit 53987f9db9
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/cc/arduino/packages/formatter/AStyleInterface.java
View File

@ -30,20 +30,27 @@
package cc.arduino.packages.formatter; package cc.arduino.packages.formatter;
import processing.app.Base; import processing.app.Base;
import processing.app.helpers.OSUtils;
import java.io.File; import java.io.File;
public class AStyleInterface { public class AStyleInterface {
static { static {
File astyleLib = new File(Base.getContentFile("lib"), System.mapLibraryName("astylej")); if (OSUtils.isWindows()) {
String astylePath = astyleLib.getAbsolutePath(); loadLib(Base.getContentFile(System.mapLibraryName("msvcp100")));
loadLib(Base.getContentFile(System.mapLibraryName("msvcr100")));
}
loadLib(new File(Base.getContentFile("lib"), System.mapLibraryName("astylej")));
}
private static void loadLib(File lib) {
try { try {
System.load(astylePath); System.load(lib.getAbsolutePath());
} catch (UnsatisfiedLinkError e) { } catch (UnsatisfiedLinkError e) {
e.printStackTrace(); e.printStackTrace();
System.out.println(e.getMessage()); System.out.println(e.getMessage());
System.out.println("Cannot load native library " + astylePath); System.out.println("Cannot load native library " + lib.getAbsolutePath());
System.out.println("The program has terminated!"); System.out.println("The program has terminated!");
System.exit(1); System.exit(1);
} }