Skip to content

Commit bfc8456

Browse files
committed
Add DYNAMIC_CAMERA_SERVER macro back
1 parent c6a00b5 commit bfc8456

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

subprojects/robotpy-wpilib/meson.build

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ project('wpilib', ['cpp'],
44

55
subdir('semiwrap')
66

7-
dyn_camsrv = declare_dependency(compile_args: ['-DDYNAMIC_CAMERA_SERVER=1'])
8-
97
wpilib_sources += files(
108
'wpilib/src/main.cpp',
119
'wpilib/src/rpy/ControlWord.cpp',
@@ -14,8 +12,6 @@ wpilib_sources += files(
1412
'wpilib/src/rpy/MotorControllerGroup.cpp',
1513
)
1614

17-
wpilib_deps += [dyn_camsrv]
18-
1915
wpilib_counter_sources += files(
2016
'wpilib/counter/counter.cpp',
2117
)
@@ -37,8 +33,6 @@ wpilib_shuffleboard_sources += files(
3733
'wpilib/shuffleboard/ShuffleboardData.cpp',
3834
)
3935

40-
wpilib_shuffleboard_deps += [dyn_camsrv]
41-
4236
wpilib_simulation_sources += files(
4337
'wpilib/simulation/simulation.cpp',
4438
)

subprojects/robotpy-wpilib/pyproject.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,8 @@ depends = [
9797
]
9898
includes = ["wpilib/src"]
9999

100-
# pp_defines = [
101-
# "DYNAMIC_CAMERA_SERVER 1"
102-
# ]
100+
[tool.semiwrap.extension_modules."wpilib._wpilib".defines]
101+
DYNAMIC_CAMERA_SERVER = 1
103102

104103
[tool.semiwrap.extension_modules."wpilib._wpilib".headers]
105104
# frc
@@ -279,9 +278,9 @@ wraps = ["robotpy-native-wpilib"]
279278
depends = ["wpilib", "wpilib_interfaces"]
280279
yaml_path = "semiwrap/shuffleboard"
281280

282-
# pp_defines = [
283-
# "DYNAMIC_CAMERA_SERVER 1"
284-
# ]
281+
[tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard".defines]
282+
DYNAMIC_CAMERA_SERVER = 1
283+
285284

286285
[tool.semiwrap.extension_modules."wpilib.shuffleboard._shuffleboard".headers]
287286
# frc/shuffleboard

0 commit comments

Comments
 (0)