p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build system

This commit is contained in:
nsubiron 2017-04-21 19:48:30 +02:00
parent 3fc7245a46
commit 2b062bbb8b
3 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Carla/Carla.Build.cs
View File

@ -48,7 +48,7 @@ public class Carla : ModuleRules
AddBoostDependency(Target); AddBoostDependency(Target);
AddProtobufDependency(Target); AddProtobufDependency(Target);
AddTurboJPEGDependency(Target); AddLibPNGDependency(Target);
AddCarlaServerDependency(Target); AddCarlaServerDependency(Target);
if (Target.Platform == UnrealTargetPlatform.Linux) if (Target.Platform == UnrealTargetPlatform.Linux)
@ -138,16 +138,11 @@ public class Carla : ModuleRules
} }
} }
private void AddTurboJPEGDependency(TargetInfo Target) private void AddLibPNGDependency(TargetInfo Target)
{ {
if (Target.Platform == UnrealTargetPlatform.Linux) if (Target.Platform == UnrealTargetPlatform.Linux)
{ {
string TurboJPEGLibPath = System.Environment.GetEnvironmentVariable("TURBOJPEG_LIB_PATH"); PublicAdditionalLibraries.Add("png");
if (string.IsNullOrEmpty(TurboJPEGLibPath) || !System.IO.Directory.Exists(TurboJPEGLibPath))
{
throw new System.Exception("TURBOJPEG_LIB_PATH is not defined, or points to a non-existant directory, please set this environment variable.");
}
PublicAdditionalLibraries.Add(Path.Combine(TurboJPEGLibPath, "libturbojpeg.a"));
} }
} }

22
Source/CarlaServer/CMakeLists.txt
View File

@ -93,28 +93,12 @@ endif (UNIX)
# ============================================================================== # ==============================================================================
if (UNIX) if (UNIX)
set(png_LIBRARY png)
elseif (WIN32) set(Png_LIBRARY png)
message( WARNING "Not linked in windows yet")
endif (UNIX)
# ==============================================================================
# -- TurboJPEG -----------------------------------------------------------------
# ==============================================================================
if (UNIX)
if (EXISTS $ENV{TURBOJPEG_LIB_PATH})
set(TurboJPEG_LIBRARIES ${TurboJPEG_LIBRARIES} $ENV{TURBOJPEG_LIB_PATH}/libturbojpeg.a)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_TURBOJPEG")
else (EXISTS $ENV{TURBOJPEG_LIB_PATH})
message(FATAL_ERROR "TURBOJPEG_LIB_PATH is not defined, or points to a non-existant directory, please set this environment variable.")
endif (EXISTS $ENV{TURBOJPEG_LIB_PATH})
elseif (WIN32) elseif (WIN32)
message(WARNING "TurboJPEG not available for Windows yet") message(WARNING "libpng not available for Windows yet")
endif (UNIX) endif (UNIX)
@ -123,7 +107,7 @@ endif (UNIX)
# ============================================================================== # ==============================================================================
set(CarlaServer_Deps_LIBRARIES set(CarlaServer_Deps_LIBRARIES
${png_LIBRARY} ${Png_LIBRARY}
${Protobuf_LIBRARIES} ${Protobuf_LIBRARIES}
${Boost_DATE_TIME_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
${Boost_REGEX_LIBRARY} ${Boost_REGEX_LIBRARY}

15
Source/CarlaServer/source/carla/server/Protocol.cpp
View File

@ -193,7 +193,7 @@ namespace server {
} }
static bool getJPEGImages(const std::vector<Image> &images, Reward &rwd){ static bool getPNGImages(const std::vector<Image> &images, Reward &rwd) {
std::string image_data; std::string image_data;
std::string depth_data; std::string depth_data;
std::string image_size_data; std::string image_size_data;
@ -214,7 +214,7 @@ static bool getJPEGImages(const std::vector<Image> &images, Reward &rwd){
double elapsed_secs = double(end - begin) / CLOCKS_PER_SEC; double elapsed_secs = double(end - begin) / CLOCKS_PER_SEC;
cout << "Time to encode the image: " << elapsed_secs << " sec" << endl; cout << "Time to encode the image: " << elapsed_secs << " sec" << endl;
}*/ }*/
if (!GetImage(img, compressedImage)) { if (!GetImage(img, compressedImage)) {
std::cerr << "Error while encoding image" << std::endl; std::cerr << "Error while encoding image" << std::endl;
@ -271,16 +271,9 @@ static bool getJPEGImages(const std::vector<Image> &images, Reward &rwd){
reward.set_speed(values.forward_speed); reward.set_speed(values.forward_speed);
reward.set_timestamp(values.timestamp); reward.set_timestamp(values.timestamp);
#ifdef WITH_TURBOJPEG if (!getPNGImages(values.images, reward)) {
std::cerr << "Error compressing image to PNG" << std::endl;
//constexpr int JPEG_QUALITY = 75;
if (!getJPEGImages(values.images, reward)) {
std::cerr << "Error compressing image to JPEG" << std::endl;
} }
#endif // WITH_TURBOJPEG
} }
void Protocol::LoadScene(Scene &scene, const Scene_Values &values) { void Protocol::LoadScene(Scene &scene, const Scene_Values &values) {