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.

Sign up for GitHub

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

Jump to bottom

Set DependentLoadFlags on shared windows binaries #76

Merged
merged 3 commits into from
May 27, 2024
Merged

Set DependentLoadFlags on shared windows binaries #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1465f13
Set DependentLoadFlags on shared windows binaries
ThadHouse Jan 18, 2024
1e02c7b
Bump path
ThadHouse Jan 18, 2024
38f9710
Switch to 2024 roborio compiler part 2
ThadHouse Jan 18, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
include:
- container: wpilib/roborio-cross-ubuntu:2023-22.04
- container: wpilib/roborio-cross-ubuntu:2024-22.04
artifact-name: Athena
build-options: "-Pplatform=linux-athena"
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04
Expand Down
2 changes: 1 addition & 1 deletion arm-frc-gnueabi.toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set(GCC_COMPILER_VERSION "" CACHE STRING "GCC Compiler version")
set(GNU_MACHINE "arm-frc2023-linux-gnueabi" CACHE STRING "GNU compiler triple")
set(GNU_MACHINE "arm-frc2024-linux-gnueabi" CACHE STRING "GNU compiler triple")
set(SOFTFP yes)
set(ARM_LINUX_SYSROOT /usr/local/arm-nilrt-linux-gnueabi/sysroot)
include("${CMAKE_CURRENT_LIST_DIR}/opencv/platforms/linux/arm.toolchain.cmake")
8 changes: 6 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ def stripExe = 'strip'
def objCopyExe = 'objcopy'

if (project.platform == "linux-athena") {
stripExe = 'arm-frc2023-linux-gnueabi-strip'
objCopyExe = 'arm-frc2023-linux-gnueabi-objcopy'
stripExe = 'arm-frc2024-linux-gnueabi-strip'
objCopyExe = 'arm-frc2024-linux-gnueabi-objcopy'
} else if (project.platform == "linux-arm32") {
stripExe = 'armv6-bullseye-linux-gnueabihf-strip'
objCopyExe = 'armv6-bullseye-linux-gnueabihf-objcopy'
Expand All @@ -210,6 +210,10 @@ if (project.platform == "linux-athena") {
def args = defaultCmakeArgs
if (buildType.contains("Shared")) {
args = args + '-DBUILD_SHARED_LIBS=ON' + '-DOPENCV_DEBUG_POSTFIX=d'

if (project.platform.contains('windows')) {
args = args + '-DCMAKE_SHARED_LINKER_FLAGS=/DEPENDENTLOADFLAG:0x1100'
}
} else {
args = args + '-DBUILD_SHARED_LIBS=OFF'
}
Expand Down
2 changes: 1 addition & 1 deletion publish.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ publishing {
}
}

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

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

Expand Down
Loading