From 125af556ce9fe0b55afaa9d06c00f7e9fb5c7ff0 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 4 Dec 2020 23:30:17 -0800 Subject: [PATCH] [simulation] Fix halsim_gui ntcore and wpiutil deps (#2908) They were being linked out of order, so ntcore wasn't being linked. --- simulation/halsim_gui/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/simulation/halsim_gui/build.gradle b/simulation/halsim_gui/build.gradle index 6486a7d9e4..7c26ac8929 100644 --- a/simulation/halsim_gui/build.gradle +++ b/simulation/halsim_gui/build.gradle @@ -3,8 +3,6 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra description = "A plugin that creates a simulation gui" ext { - includeWpiutil = true - includeNtCore = true pluginName = 'halsim_gui' } @@ -23,10 +21,12 @@ if (!project.hasProperty('onlylinuxathena') && !project.hasProperty('onlylinuxra model { binaries { all { - lib project: ':wpimath', library: 'wpimath', linkage: 'shared' lib project: ':glass', library: 'glassnt', linkage: 'static' lib project: ':glass', library: 'glass', linkage: 'static' lib project: ':wpigui', library: 'wpigui', linkage: 'static' + lib project: ':wpimath', library: 'wpimath', linkage: 'shared' + lib project: ':ntcore', library: 'ntcore', linkage: 'shared' + lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared' nativeUtils.useRequiredLibrary(it, 'imgui_static') if (it.targetPlatform.name == nativeUtils.wpi.platforms.roborio || it.targetPlatform.name == nativeUtils.wpi.platforms.raspbian || it.targetPlatform.name == nativeUtils.wpi.platforms.aarch64bionic) { it.buildable = false