Skip to content

Commit 117721a

Browse files
committed
Fix macOS build
1 parent 0c72722 commit 117721a

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(PICo24_Flasher)
2+
project(PICoBoot_Utility)
33

44
set(CMAKE_CXX_STANDARD 17)
55

@@ -36,4 +36,8 @@ CPMAddPackage(
3636
)
3737

3838
add_executable(picoboot PICoBoot_Utility.cpp PICoBoot_Utility.hpp ScanDevice.cpp SerialOps.cpp Protocol.cpp Cmd_Flash.cpp Cmd_Info.cpp Cmd_Reboot.cpp Cmd_Devices.cpp Cmd_Env.cpp Cmd_Erase.cpp)
39-
target_link_libraries(picoboot stdc++fs cxxopts IODash iHexPP)
39+
target_link_libraries(picoboot cxxopts IODash iHexPP)
40+
41+
if(UNIX AND NOT APPLE)
42+
target_link_libraries(picoboot stdc++fs)
43+
endif()

Cmd_Env.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,42 +60,42 @@ static void print_val(uint8_t type, uint8_t *target, uint8_t len) {
6060
switch (type) {
6161
case EnvType_u8: {
6262
uint8_t val = *((uint8_t *) target);
63-
printf("%" PRIu8 " (0x%02x)\n", val, val);
63+
printf("%" PRIu8 " (0x%02" PRIx8 ")\n", val, val);
6464
}
6565
break;
6666
case EnvType_s8: {
6767
int8_t val = *((int8_t *) target);
68-
printf("%" PRId8 " (0x%02x)\n", val, val);
68+
printf("%" PRId8 " (0x%02" PRIx8 ")\n", val, val);
6969
}
7070
break;
7171
case EnvType_u16: {
7272
uint16_t val = *((uint16_t *) target);
73-
printf("%" PRIu16 " (0x%04x)\n", val, val);
73+
printf("%" PRIu16 " (0x%04" PRIx16 ")\n", val, val);
7474
}
7575
break;
7676
case EnvType_s16: {
7777
int16_t val = *((int16_t *) target);
78-
printf("%" PRId16 " (0x%04x)\n", val, val);
78+
printf("%" PRId16 " (0x%04" PRIx16 ")\n", val, val);
7979
}
8080
break;
8181
case EnvType_u32: {
8282
uint32_t val = *((uint32_t *) target);
83-
printf("%" PRIu32 " (0x%08x)\n", val, val);
83+
printf("%" PRIu32 " (0x%08" PRIx32 ")\n", val, val);
8484
}
8585
break;
8686
case EnvType_s32: {
8787
int32_t val = *((int32_t *) target);
88-
printf("%" PRId32 " (0x%08x)\n", val, val);
88+
printf("%" PRId32 " (0x%08" PRIx32 ")\n", val, val);
8989
}
9090
break;
9191
case EnvType_u64: {
9292
uint64_t val = *((uint64_t *) target);
93-
printf("%" PRIu64 " (0x%016lx)\n", val, val);
93+
printf("%" PRIu64 " (0x%016" PRIx64 ")\n", val, val);
9494
}
9595
break;
9696
case EnvType_s64: {
9797
int64_t val = *((int64_t *) target);
98-
printf("%" PRId64 " (0x%016lx)\n", val, val);
98+
printf("%" PRId64 " (0x%016" PRIx64 ")\n", val, val);
9999
}
100100
break;
101101
case EnvType_str: {

0 commit comments

Comments
 (0)