Merge "Image v23"

2026-06-28 02:11:43 +00:00 · 2014-12-17 15:10:36 -08:00
parent 1fde00643f 22c4207553
commit 92c54f5f5d
16 changed files with 14 additions and 2 deletions
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
@@ -8,7 +8,7 @@ command.dir=/home/lvuser/
 # Libraries to use
 wpilib=${user.home}/wpilib/cpp/${cpp-version}
 wpilib.lib=${wpilib}/lib
-roboRIOAllowedImages=22
+roboRIOAllowedImages=23

 # Ant support
 wpilib.ant.dir=${wpilib}/ant
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
@@ -20,7 +20,7 @@ networktables.sources=${wpilib.lib}/NetworkTables-sources.jar
 #jnaerator.jar=${wpilib.lib}/jnaerator-runtime.jar
 #classpath=${wpilib.jar}:${networktables.jar}:${jna.jar}:${jnaerator.jar}
 classpath=${wpilib.jar}:${networktables.jar}
-roboRIOAllowedImages=22
+roboRIOAllowedImages=23

 # Ant support
 wpilib.ant.dir=${wpilib}/ant
--- a/ni-libraries/libFRC_NetworkCommunication.so.1.5.0
+++ b/ni-libraries/libFRC_NetworkCommunication.so.1.5.0
--- a/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0
+++ b/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0
--- a/ni-libraries/libniimaqdx.so
+++ b/ni-libraries/libniimaqdx.so
--- a/ni-libraries/libniimaqdx.so.14
+++ b/ni-libraries/libniimaqdx.so.14
@@ -0,0 +1,2 @@
+OUTPUT_FORMAT(elf32-littlearm)
+GROUP ( libniimaqdx.so.14.0 )
--- a/ni-libraries/libniimaqdx.so.14.0
+++ b/ni-libraries/libniimaqdx.so.14.0
@@ -0,0 +1,2 @@
+OUTPUT_FORMAT(elf32-littlearm)
+GROUP ( libniimaqdx.so.14.0.0 )
--- a/ni-libraries/libniimaqdx.so.14.0.0
+++ b/ni-libraries/libniimaqdx.so.14.0.0
--- a/ni-libraries/libnivision.so
+++ b/ni-libraries/libnivision.so
--- a/ni-libraries/libnivision.so.14
+++ b/ni-libraries/libnivision.so.14
@@ -0,0 +1,2 @@
+OUTPUT_FORMAT(elf32-littlearm)
+GROUP ( libnivision.so.14.0 )
--- a/ni-libraries/libnivision.so.14.0
+++ b/ni-libraries/libnivision.so.14.0
@@ -0,0 +1,2 @@
+OUTPUT_FORMAT(elf32-littlearm)
+GROUP ( libnivision.so.14.0.0 )
--- a/ni-libraries/libnivision.so.14.0.0
+++ b/ni-libraries/libnivision.so.14.0.0
--- a/ni-libraries/libnivissvc.so
+++ b/ni-libraries/libnivissvc.so
--- a/ni-libraries/libnivissvc.so.14
+++ b/ni-libraries/libnivissvc.so.14
@@ -0,0 +1,2 @@
+OUTPUT_FORMAT(elf32-littlearm)
+GROUP ( libnivissvc.so.14.0 )
--- a/ni-libraries/libnivissvc.so.14.0
+++ b/ni-libraries/libnivissvc.so.14.0
@@ -0,0 +1,2 @@
+OUTPUT_FORMAT(elf32-littlearm)
+GROUP ( libnivissvc.so.14.0.0 )
--- a/ni-libraries/libnivissvc.so.14.0.0
+++ b/ni-libraries/libnivissvc.so.14.0.0