Skip to content

Commit 484a4ee

Browse files
committed
Fix multiCameraServer frc.json location
1 parent c169363 commit 484a4ee

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

deps/tools/multiCameraServer/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
DEPS_CFLAGS?=$(shell pkg-config --cflags cameraserver ntcore wpiutil)
1818
DEPS_LIBS?=$(shell pkg-config --libs --static cameraserver ntcore wpiutil)
1919
CXXFLAGS?=-std=c++20
20+
FRC_JSON?=/boot/frc.json
2021

2122
.PHONY: all clean
2223

@@ -26,4 +27,4 @@ clean:
2627
rm -f multiCameraServer
2728

2829
multiCameraServer: src/multiCameraServer.cpp
29-
${CXX} -pthread -g -o $@ ${CXXFLAGS} ${DEPS_CFLAGS} $^ ${DEPS_LIBS}
30+
${CXX} -pthread -g -o $@ ${CXXFLAGS} ${DEPS_CFLAGS} '-DFRC_JSON="${FRC_JSON}"' $^ ${DEPS_LIBS}

deps/tools/multiCameraServer/src/multiCameraServer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
}
6060
*/
6161

62-
#ifdef __RASPBIAN__
63-
static const char* configFile = "/boot/frc.json";
62+
#ifdef FRC_JSON
63+
static const char* configFile = FRC_JSON;
6464
#else
6565
static const char* configFile = "frc.json";
6666
#endif

0 commit comments

Comments
 (0)