Fixes for examples and Gazebo 3.1.

Change-Id: Ie41a29b4b8f5cee87357f44adb45f54e03487622
This commit is contained in:
Alex Henning
2014-08-12 15:45:15 -04:00
parent d4e377fc0e
commit 760439082b
2 changed files with 4 additions and 3 deletions

View File

@@ -153,7 +153,7 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/src&quot;"/>
<listOptionValue builtIn="false" value="$cpp-location/sim/include"/>
<listOptionValue builtIn="false" value="/usr/include"/>
<listOptionValue builtIn="false" value="/usr/include/gazebo-3.0"/>
<listOptionValue builtIn="false" value="/usr/include/gazebo-3.1"/>
<listOptionValue builtIn="false" value="/usr/include/sdformat-2.0"/>
</option>
<option id="gnu.cpp.compiler.option.optimization.level.1648211502" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>

View File

@@ -1,4 +1,5 @@
allwpilib=../..
version=DEVELOPMENT
all: java cpp site
@@ -8,7 +9,7 @@ java:
cp -r $(allwpilib)/wpilibj/wpilibJava/src/main/java/* build/java/
cp -r $(allwpilib)/wpilibj/wpilibJavaDevices/src/main/java/* build/java/
# cp -r $(allwpilib)/networktables/java/src/main/java/* build/java/
doxygen java.doxy
( cat java.doxy ; echo "PROJECT_NUMBER=${version}" ) | doxygen -
cpp:
mkdir -p build/cpp/
@@ -19,7 +20,7 @@ cpp:
cp -r $(allwpilib)/wpilibc/wpilibC++Devices/include build/cpp/
# cp -r $(allwpilib)/networktables/cpp/lib build/cpp/
# cp -r $(allwpilib)/networktables/cpp/include build/cpp/
doxygen cpp.doxy
( cat cpp.doxy ; echo "PROJECT_NUMBER=${version}" ) | doxygen -
# TODO: HAL