Skip to content

Commit

Permalink
Fix DLL linkage/visibility issues (#2254)
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
  • Loading branch information
mjcarroll authored and azeey committed Jul 11, 2024
1 parent 9d35f5c commit a2a9c53
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 8 deletions.
3 changes: 1 addition & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ set (sources
Util.cc
View.cc
World.cc
cmd/ModelCommandAPI.cc
${PROTO_PRIVATE_SRC}
${network_sources}
${comms_sources}
Expand Down Expand Up @@ -160,7 +159,7 @@ target_link_libraries(${ign_lib_target}
)

# Executable target that runs the GUI without ruby for debugging purposes.
add_executable(runGui gz.cc)
add_executable(runGui cmd/runGui_main.cc)
target_link_libraries(runGui PRIVATE ${ign_lib_target})

# Create the library target
Expand Down
23 changes: 23 additions & 0 deletions src/cmd/runGui_main.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Copyright (C) 2023 Open Source Robotics Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

#include "gz/sim/gui/Gui.hh"

int main(int argc, char* argv[])
{
return gz::sim::gui::runGui(argc, argv, nullptr);
}
5 changes: 0 additions & 5 deletions src/gz.cc
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,3 @@ extern "C" int runGui(const char *_guiConfig, const char *_file, int _waitGui,
return gz::sim::gui::runGui(
argc, &argv, _guiConfig, _file, _waitGui, _renderEngine);
}

int main(int argc, char* argv[])
{
return gazebo::gui::runGui(argc, argv, nullptr);
}
1 change: 0 additions & 1 deletion src/systems/camera_video_recorder/CameraVideoRecorder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@ void CameraVideoRecorderPrivate::OnPostRender()
{
this->camera->Copy(this->cameraImage);
std::chrono::steady_clock::time_point t;
std::chrono::steady_clock::now();
if (this->recordVideoUseSimTime)
t = std::chrono::steady_clock::time_point(this->simTime);
else
Expand Down

0 comments on commit a2a9c53

Please sign in to comment.