Skip to content

Commit 77f2341

Browse files
authored
Set DependentLoadFlags on shared windows binaries (#76)
* Set DependentLoadFlags on shared windows binaries * Bump path * Switch to 2024 roborio compiler part 2
1 parent 7c90e4f commit 77f2341

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
include:
15-
- container: wpilib/roborio-cross-ubuntu:2023-22.04
15+
- container: wpilib/roborio-cross-ubuntu:2024-22.04
1616
artifact-name: Athena
1717
build-options: "-Pplatform=linux-athena"
1818
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04

arm-frc-gnueabi.toolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(GCC_COMPILER_VERSION "" CACHE STRING "GCC Compiler version")
2-
set(GNU_MACHINE "arm-frc2023-linux-gnueabi" CACHE STRING "GNU compiler triple")
2+
set(GNU_MACHINE "arm-frc2024-linux-gnueabi" CACHE STRING "GNU compiler triple")
33
set(SOFTFP yes)
44
set(ARM_LINUX_SYSROOT /usr/local/arm-nilrt-linux-gnueabi/sysroot)
55
include("${CMAKE_CURRENT_LIST_DIR}/opencv/platforms/linux/arm.toolchain.cmake")

build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ def stripExe = 'strip'
183183
def objCopyExe = 'objcopy'
184184

185185
if (project.platform == "linux-athena") {
186-
stripExe = 'arm-frc2023-linux-gnueabi-strip'
187-
objCopyExe = 'arm-frc2023-linux-gnueabi-objcopy'
186+
stripExe = 'arm-frc2024-linux-gnueabi-strip'
187+
objCopyExe = 'arm-frc2024-linux-gnueabi-objcopy'
188188
} else if (project.platform == "linux-arm32") {
189189
stripExe = 'armv6-bullseye-linux-gnueabihf-strip'
190190
objCopyExe = 'armv6-bullseye-linux-gnueabihf-objcopy'
@@ -210,6 +210,10 @@ if (project.platform == "linux-athena") {
210210
def args = defaultCmakeArgs
211211
if (buildType.contains("Shared")) {
212212
args = args + '-DBUILD_SHARED_LIBS=ON' + '-DOPENCV_DEBUG_POSTFIX=d'
213+
214+
if (project.platform.contains('windows')) {
215+
args = args + '-DCMAKE_SHARED_LINKER_FLAGS=/DEPENDENTLOADFLAG:0x1100'
216+
}
213217
} else {
214218
args = args + '-DBUILD_SHARED_LIBS=OFF'
215219
}

publish.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ publishing {
1313
}
1414
}
1515

16-
def pubVersion = "${project.ext.version}-2"
16+
def pubVersion = "${project.ext.version}-3"
1717

1818
def outputsFolder = file("$project.buildDir/outputs")
1919

0 commit comments

Comments
 (0)