Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-28 02:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for latest image, not sure about ctre folder so leaving

Browse Source 
Change-Id: If2218df082bca93d25b88088696d6c2897732efd

Adding FRC Local new mdns name

Change-Id: I53d206879663b96009ba3a12de161b7a425ffd10

Adding rpath for new libstdc++

Change-Id: I0c022efb0b15f094d153b44f60215ca00d5f1924
This commit is contained in:
Patrick Plenefisch
2015-09-27 14:09:17 -04:00
committed by Brad Miller (WPI)
parent 89ae8f214e
commit 9f859234fb
133 changed files with 505 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wpilibj/wpilibJavaJNI/CMakeLists.txt
View File

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8)
project(WPILibJavaJNI)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=2 -Wextra -Wno-unused-parameter -fPIC -Werror")
SET(CMAKE_EXE_LINKER_FLAGS "-Wl,-rpath,/usr/local/frc/rpath-lib")
SET(CMAKE_SKIP_BUILD_RPATH TRUE)
file(GLOB_RECURSE NI_LIBS ../../ni-libraries/*.so)
list(REMOVE_ITEM NI_LIBS ${CMAKE_CURRENT_SOURCE_DIR}/../../ni-libraries/libwpi.so ${CMAKE_CURRENT_SOURCE_DIR}/../../ni-libraries/libwpi_2015.so)

2
wpilibj/wpilibJavaJNI/lib/CANJNI.cpp
View File

@@ -5,7 +5,7 @@
#include "edu_wpi_first_wpilibj_can_CANJNI.h"
#include "HAL/CAN.hpp"
#include "NetworkCommunication/CANSessionMux.h"
#include "FRC_NetworkCommunication/CANSessionMux.h"
// set the logging level
//TLogLevel canJNILogLevel = logDEBUG;