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 <[email protected]>
  • Loading branch information
mjcarroll authored Nov 22, 2023
1 parent 3a21904 commit a88340b
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ target_link_libraries(${gz_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 ${gz_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 @@ -452,8 +452,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 sim::gui::runGui(argc, argv, nullptr);
}

0 comments on commit a88340b

Please sign in to comment.