Permalink
Browse files

Remove ACE dependency

  • Loading branch information...
dskyle authored and David Kyle committed May 24, 2018
1 parent 74d7ab4 commit ac69ec84bfd71c705965ca075e2ef4bd7ee58fe3
Showing with 36 additions and 173 deletions.
  1. +5 −1 default.features
  2. +4 −42 gams.mpc
  3. +1 −9 simulation.mpc
  4. +20 −111 tests.mpc
  5. +0 −5 using_ace.mpb
  6. +0 −4 using_gams.mpb
  7. +6 −1 using_madara.mpb
@@ -8,6 +8,10 @@
///
///============================================================================
/// @feature debug
/// Enable this feature if you want to generate debug build
debug = 0
/// @feature tests
/// Enable this feature if you want to generate test applications
@@ -16,7 +20,7 @@ tests = 1
/// @feature vrep
/// Enable this feature if you want to support the VREP simulator
vrep = 1
vrep = 0
/// @feature utm
/// Enable this feature if you want to support the UTM coordinate system using GeographicLib
@@ -1,35 +1,16 @@
project (gams) : using_madara, using_ace, using_utm, using_ros, vrep_lib, ros_lib, port/java/using_android, port/java/using_java, port/java/using_openjdk, using_nortti {
project (gams) : using_madara, using_utm, using_ros, vrep_lib, ros_lib, port/java/using_android, port/java/using_java, port/java/using_openjdk, using_nortti {
libout = lib
sharedname = GAMS
includes += src
dynamicflags += GAMS_BUILD_DLL _USE_MATH_DEFINES
verbatim (gnuace, local) {
CPPFLAGS +=
}
Documentation_Files {
INSTALL.txt
LICENSE.txt
README.txt
VERSION.txt
}
Build_Files {
default.features
gams.mpc
gams.mwc
using_ace.mpb
using_madara.mpb
using_gams.mpb
using_utm.mpb
using_vrep.mpb
using_nortti.mpb
using_ros.mpb
vrep_lib.mpb
ros_lib.mpb
}
Header_Files {
Algorithms {
@@ -207,7 +188,7 @@ project (gams) : using_madara, using_ace, using_utm, using_ros, vrep_lib, ros_li
}
}
project (gams_jar) : using_gams, using_madara, using_ace {
project (gams_jar) : using_gams, using_madara {
requires += java
prebuild += "$(JAVA_HOME)/bin/javac" -classpath $(MADARA_ROOT)/lib/madara.jar -sourcepath port/java/src port/java/src/com/gams/tests/*.java port/java/src/com/gams/*.java port/java/src/com/gams/logger/*.java port/java/src/com/gams/variables/*.java port/java/src/com/gams/utility/*.java port/java/src/com/gams/platforms/*.java port/java/src/com/gams/algorithms/*.java port/java/src/com/gams/controllers/*.java
@@ -222,19 +203,14 @@ project (gams_jar) : using_gams, using_madara, using_ace {
port/java/src/com/gams/variables/*.java
}
Build_Files {
gams.mpc
port/java
}
Header_Files {
}
Source_Files {
}
}
project (gams_controller) : using_gams, using_madara, using_ace, using_vrep {
project (gams_controller) : using_gams, using_madara, using_vrep {
exeout = $(GAMS_ROOT)/bin
exename = gams_controller
@@ -243,11 +219,6 @@ project (gams_controller) : using_gams, using_madara, using_ace, using_vrep {
Documentation_Files {
}
Build_Files {
using_gams.mpb
gams.mpc
}
Header_Files {
}
@@ -256,7 +227,7 @@ project (gams_controller) : using_gams, using_madara, using_ace, using_vrep {
}
}
project (ros2gams) : using_madara, using_ace, using_ros, using_gams {
project (ros2gams) : using_madara, using_ros, using_gams {
exeout = $(GAMS_ROOT)/bin
exename = ros2gams
libpaths += $(ROS_ROOT)/../../lib
@@ -272,18 +243,9 @@ project (ros2gams) : using_madara, using_ace, using_ros, using_gams {
libs += rosbag
libs += rosbag_storage
verbatim (gnuace, local) {
CPPFLAGS += -std=c++11
}
Documentation_Files {
}
Build_Files {
using_gams.mpb
gams.mpc
}
Header_Files {
}
@@ -1,4 +1,4 @@
project (dynamic_simulation) : using_gams, using_madara, using_ace, using_vrep {
project (dynamic_simulation) : using_gams, using_madara, using_vrep {
exeout = $(GAMS_ROOT)/bin
exename = dynamic_simulation
@@ -12,14 +12,6 @@ project (dynamic_simulation) : using_gams, using_madara, using_ace, using_vrep {
README.txt
VERSION.txt
}
Build_Files {
using_ace.mpb
using_madara.mpb
using_vrep.mpb
using_gams.mpb
simulation.mpc
}
Source_Files {
Oops, something went wrong.

0 comments on commit ac69ec8

Please sign in to comment.