Skip to content
Permalink
Browse files

* Fixed errors related to Visual Studio builds

* Updated base_build.bat
* Fixed issues related to Eigen and Windows
  • Loading branch information...
jredmondson committed Mar 9, 2019
1 parent 12e6212 commit b408b33a62cbb5201d0922e3d77550bd7fa3b4cd
@@ -82,3 +82,6 @@ port/python/tools/plotting.pyc
scripts/simulation/vrep/spell/config.yaml
scripts/simulation/unreal/spell/config.yaml

.vs/
Release/
Debug/
@@ -285,12 +285,12 @@ IF %PREREQS% EQU 1 (

echo cd %BOOST_ROOT%
cd %BOOST_ROOT%
echo .\bootstrap.bat --with-library=system,python
.\bootstrap.bat --with-library=system,python
echo .\bootstrap.bat --with-library=system,python,filesystem
.\bootstrap.bat --with-library=system,python,filesystem
echo cd %BOOST_ROOT%
cd %BOOST_ROOT%
echo b2.exe --with-system --with-python
.\b2.exe --with-system --with-python
echo b2.exe --with-system --with-python --with-filesystem
.\b2.exe --with-system --with-python --with-filesystem
SET BOOST_BUILD_RESULT=%ERRORLEVEL%
)

@@ -311,7 +311,7 @@ IF %MADARA% EQU 1 (
echo.
echo Generating MADARA project with docs=%DOCS%, java=%JAVA%, tests=%TESTS% and tutorials=%TUTORIALS%
cd "%MADARA_ROOT%"
"%ACE_ROOT%\bin\mwc.pl" -type %vs_version% -features tests=%TESTS%,tutorials=%TUTORIALS%,java=%JAVA%,docs=%DOCS% MADARA.mwc
"%ACE_ROOT%\bin\mwc.pl" -type %vs_version% -features nothreadlocal=1,tests=%TESTS%,tutorials=%TUTORIALS%,java=%JAVA%,docs=%DOCS% MADARA.mwc
echo Building MADARA library for Debug target with tests=%TESTS%
msbuild "%MADARA_ROOT%\MADARA.sln" /maxcpucount /t:Rebuild /clp:NoSummary;NoItemAndPropertyList;ErrorsOnly /verbosity:quiet /nologo /p:Configuration=Debug;Platform=X64 /target:Madara
echo Building MADARA for Release target with tests=%TESTS%
@@ -322,7 +322,7 @@ IF %GAMS% EQU 1 (
echo.
echo Generating GAMS project with docs=%DOCS%, java=%JAVA%, tests=%TESTS% and vrep=%VREP%
cd "%GAMS_ROOT%"
"%ACE_ROOT%\bin\mwc.pl" -type %vs_version% -features docs=%DOCS%,vrep=%VREP%,tests=%TESTS%,java=%JAVA% gams.mwc
"%ACE_ROOT%\bin\mwc.pl" -type %vs_version% -features nothreadlocal=1,docs=%DOCS%,vrep=%VREP%,tests=%TESTS%,java=%JAVA% gams.mwc
echo Building GAMS library for Debug target with tests=%TESTS% and vrep=%VREP%
msbuild "gams.sln" /maxcpucount /t:Rebuild /clp:NoSummary;NoItemAndPropertyList;ErrorsOnly /verbosity:quiet /nologo /p:Configuration=Debug;Platform=X64 /target:gams
echo Building GAMS for Release target with tests=%TESTS% and vrep=%VREP%
@@ -69,8 +69,10 @@
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include "Eigen/Geometry"
#include "Eigen/Geometry"
#pragma GCC diagnostic pop
#elif defined _WIN32
#include "Eigen/Geometry"
#endif

#define INVAL_COORD DBL_MAX
@@ -788,12 +788,12 @@ uint64_t ReferenceFrameVersion::find_common_timestamp_to_first_ancestor(

if (!common) {
LOCAL_DEBUG(std::cerr << "No Common Ancestor" << std::endl;)
return -1UL;
return 0UL - 1;
}

LOCAL_DEBUG(std::cerr << "Common Ancestor: " << *common << std::endl;)

uint64_t timestamp = -1UL;
uint64_t timestamp = 0UL - 1;

for (size_t i = 0; i < iter.size(); ++i) {
for (size_t j = 0; j < iter[i]; ++j) {
@@ -842,7 +842,7 @@ ReferenceFrame ReferenceFrameVersion::load(
LOCAL_DEBUG(std::cerr << "Nearest " << id << " " << pair.first << " " <<
timestamp << " " << pair.second << std::endl;)

if (pair.first == -1UL || pair.second == -1UL) {
if (pair.first == 0UL - 1 || pair.second == 0UL - 1) {
return make_temp_frame(id, timestamp, arena);
/*
LOCAL_DEBUG(std::cerr << "No valid timestamp pair for " << id << std::endl;)
@@ -887,7 +887,7 @@ class GAMS_EXPORT ReferenceFrameVersion :
const FrameEvalSettings &settings = FrameEvalSettings::DEFAULT)
{
if (begin == end) {
return -1UL;
return 0UL - 1;
}

std::vector<ancestor_vec> stamps;
@@ -201,8 +201,8 @@ class GAMS_EXPORT ReferenceFrame
std::shared_ptr<ReferenceFrameVersion> impl_;

public:
static const uint64_t ETERNAL = -1UL;
static const uint64_t TEMP = -2UL;
static const uint64_t ETERNAL = 0UL - 1;
static const uint64_t TEMP = 0UL - 2;

/**
* Default constructor. This frame's valid() will return false. Calling
@@ -276,7 +276,7 @@ int main(int, char *[])
ReferenceFrame room_frame("LivingRoom", Pose{building_frame, 10, 20}, -1);
ReferenceFrame kitchen_frame("Kitchen", Pose{building_frame, 30, 50}, -1);

TEST_EQ(building_frame.timestamp(), -1UL);
TEST_EQ(building_frame.timestamp(), 0UL - 1);

ReferenceFrame drone_frame("Drone", Pose{kitchen_frame, 3, 2, -2}, 1000);
ReferenceFrame camera_frame("Camera", Pose{drone_frame, 0, 0, 0.5}, 1000);
@@ -1,8 +1,6 @@
project {
libpaths += /usr/local/lib
libpaths += /usr/local/Cellar/boost@1.59/1.59.0/lib
includes += /usr/local/Cellar/boost@1.59/1.59.0/include



expand(BOOST_ROOT_LIB) {
$BOOST_ROOT_LIB
$(BOOST_ROOT)/stage/lib
@@ -41,13 +39,16 @@ project {
specific(prop:windows) {
libpaths += $(BOOST_ROOT_LIB)
includes += $(BOOST_ROOT)

macros += _WINSOCK_DEPRECATED_NO_WARNINGS BOOST_ALL_NO_LIB

Debug::lit_libs += $(BOOST_SYSTEM_DEBUG)
Release::lit_libs += $(BOOST_SYSTEM_RELEASE)
// end if windows build
} else {
lit_libs += $(BOOST_STATIC_LIB_PREFIX)boost_system$(BOOST_CFG)
libpaths += /usr/local/lib
libpaths += /usr/local/Cellar/boost@1.59/1.59.0/lib
includes += /usr/local/Cellar/boost@1.59/1.59.0/include
}
}
@@ -1,25 +1,33 @@
project {
includes += $(CAPNP_ROOT)/c++/src
libpaths += $(CAPNP_ROOT)/c++/.libs

libs += capnp
libs += capnpc
libs += capnp-json
libs += kj

Define_Custom (CAPN) {
command = bash -c "capnp compile -I \$$CAPNP_ROOT/c++/src -oc++ \$$0;\
capnp compile -I \$$CAPNP_ROOT/c++/src -o/bin/cat \$$0 > \$$0.bin"
command = bash -c "capnp compile -I \$$CAPNP_ROOT/c++/src -oc++ \"\$$0\";\
mv \"\$$0.c++\" \"\$$0.cpp\";\
capnp compile -I \$$CAPNP_ROOT/c++/src -o/bin/cat \"\$$0\" > \$$0.bin"
inputext = .capnp
source_outputext = .capnp.c++
source_outputext = .capnp.cpp
header_outputext = .capnp.h
generic_outputext = .capnp.bin
automatic_out = 1
}

includes += $(CAPNP_ROOT)/c++/src

specific(prop:microsoft) {
DisableSpecificWarnings += 4005 4251 4275 4244
DisableSpecificWarnings += 4005 4251 4275 4244 4267
macros += _CRT_SECURE_NO_WARNINGS

Debug::libpaths += $(CAPNP_ROOT)/c++/src/capnp/Debug $(CAPNP_ROOT)/c++/src/kj/Debug
Release::libpaths += $(CAPNP_ROOT)/c++/src/capnp/Release $(CAPNP_ROOT)/c++/src/kj/Release

lit_libs += capnp
lit_libs += capnp-json
lit_libs += kj
} else {
libpaths += $(CAPNP_ROOT)/c++/.libs

libs += capnp
libs += capnp-json
libs += kj
}

verbatim(make, top) {

0 comments on commit b408b33

Please sign in to comment.
You can’t perform that action at this time.