Skip to content

Commit

Permalink
IWYU mode, 4.16 compatibilit fixes, build for linux without compiling…
Browse files Browse the repository at this point in the history
… sources
  • Loading branch information
sytelus committed Jul 26, 2017
1 parent b9a978d commit b5f9a05
Show file tree
Hide file tree
Showing 90 changed files with 1,293 additions and 1,352 deletions.
24 changes: 12 additions & 12 deletions AirLib/AirLib.vcxproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ShowAllFiles>true</ShowAllFiles>
</PropertyGroup>
Expand All @@ -22,6 +22,7 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\api\DebugApiServer.hpp" />
<ClInclude Include="include\common\ClockBase.hpp" />
<ClInclude Include="include\common\Common.hpp" />
<ClInclude Include="include\common\CommonStructs.hpp" />
Expand Down Expand Up @@ -95,17 +96,17 @@
<ClInclude Include="include\controllers\simple_flight\SimpleFlightDroneController.hpp" />
<ClInclude Include="include\controllers\VehicleCameraBase.hpp" />
<ClInclude Include="include\physics\DebugPhysicsBody.hpp" />
<ClInclude Include="include\rpc\ControlServerBase.hpp" />
<ClInclude Include="include\api\ControlServerBase.hpp" />
<ClInclude Include="include\safety\CubeGeoFence.hpp" />
<ClInclude Include="include\controllers\DroneCommon.hpp" />
<ClInclude Include="include\controllers\DroneControllerBase.hpp" />
<ClInclude Include="include\safety\IGeoFence.hpp" />
<ClInclude Include="include\controllers\MavLinkDroneController.hpp" />
<ClInclude Include="include\safety\ObstacleMap.hpp" />
<ClInclude Include="include\controllers\PidController.hpp" />
<ClInclude Include="include\rpc\RpcLibAdapators.hpp" />
<ClInclude Include="include\rpc\RpcLibClient.hpp" />
<ClInclude Include="include\rpc\RpcLibServer.hpp" />
<ClInclude Include="include\api\RpcLibAdapators.hpp" />
<ClInclude Include="include\api\RpcLibClient.hpp" />
<ClInclude Include="include\api\RpcLibServer.hpp" />
<ClInclude Include="include\safety\SafetyEval.hpp" />
<ClInclude Include="include\controllers\DroneControllerCancelable.hpp" />
<ClInclude Include="include\controllers\Settings.hpp" />
Expand Down Expand Up @@ -150,8 +151,8 @@
<ItemGroup>
<ClCompile Include="src\controllers\DroneControllerBase.cpp" />
<ClCompile Include="src\safety\ObstacleMap.cpp" />
<ClCompile Include="src\rpc\RpcLibClient.cpp" />
<ClCompile Include="src\rpc\RpcLibServer.cpp" />
<ClCompile Include="src\api\RpcLibClient.cpp" />
<ClCompile Include="src\api\RpcLibServer.cpp" />
<ClCompile Include="src\safety\SafetyEval.cpp" />
<ClCompile Include="src\controllers\FileSystem.cpp" />
</ItemGroup>
Expand Down Expand Up @@ -238,7 +239,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>include;$(EIGEN_ROOT)\Eigen3;deps\rpclib\include;..\MavLinkCom\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>include;deps\eigen3;deps\rpclib\include;$(ProjectDir)..\MavLinkCom\include</AdditionalIncludeDirectories>
<TreatWarningAsError>true</TreatWarningAsError>
<AdditionalOptions>/w34263 /w34266 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
Expand All @@ -262,7 +263,7 @@
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>include;$(EIGEN_ROOT)\Eigen3;deps\rpclib\include;..\MavLinkCom\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>include;deps\eigen3;deps\rpclib\include;$(ProjectDir)..\MavLinkCom\include</AdditionalIncludeDirectories>
<TreatWarningAsError>true</TreatWarningAsError>
<AdditionalOptions>/w34263 /w34266 %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4100;4505;4820;4464;4514;4710;4571;%(DisableSpecificWarnings)</DisableSpecificWarnings>
Expand All @@ -289,7 +290,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>include;$(EIGEN_ROOT)\Eigen3;deps\rpclib\include;..\MavLinkCom\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>include;deps\eigen3;deps\rpclib\include;$(ProjectDir)..\MavLinkCom\include</AdditionalIncludeDirectories>
<TreatWarningAsError>true</TreatWarningAsError>
<AdditionalOptions>/w34263 /w34266 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
Expand Down Expand Up @@ -317,7 +318,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>include;$(EIGEN_ROOT)\Eigen3;deps\rpclib\include;..\MavLinkCom\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>include;deps\eigen3;deps\rpclib\include;$(ProjectDir)..\MavLinkCom\include</AdditionalIncludeDirectories>
<TreatWarningAsError>true</TreatWarningAsError>
<AdditionalOptions>/w34263 /w34266 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
Expand All @@ -337,7 +338,6 @@
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(MSBuildThisFileDirectory)\build\eigen.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
35 changes: 19 additions & 16 deletions AirLib/AirLib.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -228,18 +228,6 @@
<ClInclude Include="include\safety\SphereGeoFence.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\rpc\RpcLibAdapators.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\rpc\RpcLibClient.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\rpc\RpcLibServer.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\rpc\ControlServerBase.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\sensors\SensorCollection.hpp">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -387,6 +375,21 @@
<ClInclude Include="include\controllers\VehicleCameraBase.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\api\ControlServerBase.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\api\RpcLibAdapators.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\api\RpcLibClient.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\api\RpcLibServer.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\api\DebugApiServer.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\safety\ObstacleMap.cpp">
Expand All @@ -395,16 +398,16 @@
<ClCompile Include="src\safety\SafetyEval.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\rpc\RpcLibClient.cpp">
<ClCompile Include="src\controllers\FileSystem.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\rpc\RpcLibServer.cpp">
<ClCompile Include="src\controllers\DroneControllerBase.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\controllers\FileSystem.cpp">
<ClCompile Include="src\api\RpcLibClient.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\controllers\DroneControllerBase.cpp">
<ClCompile Include="src\api\RpcLibServer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
Expand Down
37 changes: 0 additions & 37 deletions AirLib/build/BuildRpcLib.cmd

This file was deleted.

72 changes: 0 additions & 72 deletions AirLib/build/eigen.targets

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

#ifndef air_ControlServerBase_hpp
#define air_ControlServerBase_hpp

#include "common/Common.hpp"
#include <functional>


namespace msr { namespace airlib {

class ControlServerBase {
public:
virtual void start(bool block = false) = 0;
virtual void stop() = 0;
virtual ~ControlServerBase() = default;
};

}} //namespace
#endif
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

#ifndef air_ControlServerBase_hpp
#define air_ControlServerBase_hpp

#include "common/Common.hpp"
#include <functional>


namespace msr { namespace airlib {

class ControlServerBase {
public:
virtual void start(bool block = false) = 0;
virtual void stop() = 0;
virtual ~ControlServerBase() = default;
};

}} //namespace
#endif
26 changes: 26 additions & 0 deletions AirLib/include/api/DebugApiServer.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

#ifndef air_DebugApiServer_hpp
#define air_DebugApiServer_hpp

#include "ControlServerBase.hpp"
#include "common/common_utils/Utils.hpp"

namespace msr { namespace airlib {

class DebugApiServer : public ControlServerBase {
public:
virtual void start(bool block = false) override
{
common_utils::Utils::log("Debug server started");
}
virtual void stop() override
{
common_utils::Utils::log("Debug server stopped");
}
virtual ~DebugApiServer() = default;
};

}} //namespace
#endif
Loading

0 comments on commit b5f9a05

Please sign in to comment.