Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DLL linkage/visibility issues #2254

Merged
merged 2 commits into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ target_link_libraries(${gz_lib_target}
)

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

# Create the library target
gz_create_core_library(SOURCES ${sources} CXX_STANDARD 17)
Expand Down
6 changes: 6 additions & 0 deletions src/cmd/runGui_main.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#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);
}