From 113506749d186a332e06987adf2043938bce1159 Mon Sep 17 00:00:00 2001 From: drf5n Date: Fri, 6 Feb 2026 23:10:35 -0500 Subject: [PATCH 1/2] Work in progress form Mac build per https://rtklibexplorer.wordpress.com/2026/01/28/new-qt-based-gui-for-rtklib/. Cmake and cli. --- app/consapp/rtkrcv/rtkrcv.c | 2 +- app/qtapp/rtkconv_qt/CMakeLists.txt | 2 +- app/qtapp/rtkget_qt/CMakeLists.txt | 2 +- app/qtapp/rtklaunch_qt/CMakeLists.txt | 2 +- app/qtapp/rtknavi_qt/CMakeLists.txt | 2 +- app/qtapp/rtkplot_qt/CMakeLists.txt | 2 +- app/qtapp/rtkpost_qt/CMakeLists.txt | 2 +- app/qtapp/srctblbrows_qt/CMakeLists.txt | 2 +- app/qtapp/strsvr_qt/CMakeLists.txt | 2 +- src/rtkcmn.c | 3 ++- src/rtklib.h | 3 +++ 11 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/consapp/rtkrcv/rtkrcv.c b/app/consapp/rtkrcv/rtkrcv.c index 2cb1f2b3c..9d4114de8 100644 --- a/app/consapp/rtkrcv/rtkrcv.c +++ b/app/consapp/rtkrcv/rtkrcv.c @@ -36,7 +36,7 @@ * add option -w * 2017/09/01 1.21 add command ssr *-----------------------------------------------------------------------------*/ -#define _POSIX_C_SOURCE 199506 +/*#define _POSIX_C_SOURCE 199506 */ #include #include #include diff --git a/app/qtapp/rtkconv_qt/CMakeLists.txt b/app/qtapp/rtkconv_qt/CMakeLists.txt index 70cfb683f..21089a4c9 100644 --- a/app/qtapp/rtkconv_qt/CMakeLists.txt +++ b/app/qtapp/rtkconv_qt/CMakeLists.txt @@ -50,7 +50,7 @@ set_target_properties(rtkconv_qt PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON ) -install(TARGETS rtkconv_qt RUNTIME DESTINATION bin) +install(TARGETS rtkconv_qt RUNTIME DESTINATION bin BUNDLE DESTINATION bin) if (UNIX) install(FILES rtkconv_qt.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/app/qtapp/rtkget_qt/CMakeLists.txt b/app/qtapp/rtkget_qt/CMakeLists.txt index ed802caeb..7febe98a8 100644 --- a/app/qtapp/rtkget_qt/CMakeLists.txt +++ b/app/qtapp/rtkget_qt/CMakeLists.txt @@ -43,7 +43,7 @@ set_target_properties(rtkget_qt PROPERTIES MACOSX_BUNDLE ON ) -install(TARGETS rtkget_qt RUNTIME DESTINATION bin) +install(TARGETS rtkget_qt RUNTIME DESTINATION bin BUNDLE DESTINATION bin) if (UNIX) install(FILES rtkget_qt.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES ../icon/rtkget.png DESTINATION ${XDG_APPS_PIXMAPS_DIR}) diff --git a/app/qtapp/rtklaunch_qt/CMakeLists.txt b/app/qtapp/rtklaunch_qt/CMakeLists.txt index 78280cd57..6013ead83 100644 --- a/app/qtapp/rtklaunch_qt/CMakeLists.txt +++ b/app/qtapp/rtklaunch_qt/CMakeLists.txt @@ -26,7 +26,7 @@ set_target_properties(rtklaunch_qt PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON ) -install(TARGETS rtklaunch_qt RUNTIME DESTINATION bin) +install(TARGETS rtkget_qt RUNTIME DESTINATION bin BUNDLE DESTINATION bin) if (UNIX) install(FILES rtklaunch_qt.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES ../icon/rtklaunch.png DESTINATION ${XDG_APPS_PIXMAPS_DIR}) diff --git a/app/qtapp/rtknavi_qt/CMakeLists.txt b/app/qtapp/rtknavi_qt/CMakeLists.txt index 65bb93a62..3e176f7e9 100644 --- a/app/qtapp/rtknavi_qt/CMakeLists.txt +++ b/app/qtapp/rtknavi_qt/CMakeLists.txt @@ -81,7 +81,7 @@ set_target_properties(rtknavi_qt PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON ) -install(TARGETS rtknavi_qt RUNTIME DESTINATION bin) +install(TARGETS rtkget_qt RUNTIME DESTINATION bin BUNDLE DESTINATION bin) if (UNIX) install(FILES rtknavi_qt.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES ../icon/rtknavi.png DESTINATION ${XDG_APPS_PIXMAPS_DIR}) diff --git a/app/qtapp/rtkplot_qt/CMakeLists.txt b/app/qtapp/rtkplot_qt/CMakeLists.txt index 93cd8a9c2..ac52c1396 100644 --- a/app/qtapp/rtkplot_qt/CMakeLists.txt +++ b/app/qtapp/rtkplot_qt/CMakeLists.txt @@ -90,7 +90,7 @@ set_target_properties(rtkplot_qt PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON ) -install(TARGETS rtkplot_qt RUNTIME DESTINATION bin) +install(TARGETS rtkget_qt RUNTIME DESTINATION bin BUNDLE DESTINATION bin) if (UNIX) install(FILES rtkplot_qt.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES ../icon/rtkplot.png DESTINATION ${XDG_APPS_PIXMAPS_DIR}) diff --git a/app/qtapp/rtkpost_qt/CMakeLists.txt b/app/qtapp/rtkpost_qt/CMakeLists.txt index 99cb54e73..2cd56ddb2 100644 --- a/app/qtapp/rtkpost_qt/CMakeLists.txt +++ b/app/qtapp/rtkpost_qt/CMakeLists.txt @@ -51,7 +51,7 @@ set_target_properties(rtkpost_qt PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON ) -install(TARGETS rtkpost_qt RUNTIME DESTINATION bin) +install(TARGETS rtkget_qt RUNTIME DESTINATION bin BUNDLE DESTINATION bin) if (UNIX) install(FILES rtkpost_qt.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES ../icon/rtkpost.png DESTINATION ${XDG_APPS_PIXMAPS_DIR}) diff --git a/app/qtapp/srctblbrows_qt/CMakeLists.txt b/app/qtapp/srctblbrows_qt/CMakeLists.txt index 1857d139c..0db977e86 100644 --- a/app/qtapp/srctblbrows_qt/CMakeLists.txt +++ b/app/qtapp/srctblbrows_qt/CMakeLists.txt @@ -51,7 +51,7 @@ set_target_properties(srctblbrows_qt PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON ) -install(TARGETS srctblbrows_qt RUNTIME DESTINATION bin) +install(TARGETS rtkget_qt RUNTIME DESTINATION bin BUNDLE DESTINATION bin) if (UNIX) install(FILES srctblbrows_qt.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES ../icon/srctblbrows.png DESTINATION ${XDG_APPS_PIXMAPS_DIR}) diff --git a/app/qtapp/strsvr_qt/CMakeLists.txt b/app/qtapp/strsvr_qt/CMakeLists.txt index b35b1f354..c3e2aeaa9 100644 --- a/app/qtapp/strsvr_qt/CMakeLists.txt +++ b/app/qtapp/strsvr_qt/CMakeLists.txt @@ -53,7 +53,7 @@ set_target_properties(strsvr_qt PROPERTIES WIN32_EXECUTABLE ON MACOSX_BUNDLE ON ) -install(TARGETS strsvr_qt RUNTIME DESTINATION bin) +install(TARGETS rtkget_qt RUNTIME DESTINATION bin BUNDLE DESTINATION bin) if (UNIX) install(FILES strsvr_qt.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES ../icon/strsvr.png DESTINATION ${XDG_APPS_PIXMAPS_DIR}) diff --git a/src/rtkcmn.c b/src/rtkcmn.c index f2f890b30..6bb204390 100644 --- a/src/rtkcmn.c +++ b/src/rtkcmn.c @@ -143,7 +143,8 @@ * use integer types in stdint.h * suppress warnings *-----------------------------------------------------------------------------*/ -#define _POSIX_C_SOURCE 199506 +/*#define _POSIX_C_SOURCE 199506 +*/ #include #include #include diff --git a/src/rtklib.h b/src/rtklib.h index b77e4038b..90f07c3d2 100644 --- a/src/rtklib.h +++ b/src/rtklib.h @@ -30,6 +30,9 @@ *-----------------------------------------------------------------------------*/ #ifndef RTKLIB_H #define RTKLIB_H +#ifdef __APPLE__ +#define _DARWIN_C_SOURCE +#endif #include #include #include From 794092dc3386e09e144ae317e0e6c43818f09a9b Mon Sep 17 00:00:00 2001 From: drf5n Date: Sun, 8 Feb 2026 23:59:03 -0500 Subject: [PATCH 2/2] Change to #define _POSIX_C_SOURCE 200112L in src/rtkcmn.c and app/consapp/rtkrcv/rtkrcv.c --- app/consapp/rtkrcv/rtkrcv.c | 2 +- src/rtkcmn.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/consapp/rtkrcv/rtkrcv.c b/app/consapp/rtkrcv/rtkrcv.c index 9d4114de8..92fdc6199 100644 --- a/app/consapp/rtkrcv/rtkrcv.c +++ b/app/consapp/rtkrcv/rtkrcv.c @@ -36,7 +36,7 @@ * add option -w * 2017/09/01 1.21 add command ssr *-----------------------------------------------------------------------------*/ -/*#define _POSIX_C_SOURCE 199506 */ +#define _POSIX_C_SOURCE 200112L #include #include #include diff --git a/src/rtkcmn.c b/src/rtkcmn.c index 6bb204390..7e945c7ae 100644 --- a/src/rtkcmn.c +++ b/src/rtkcmn.c @@ -143,8 +143,7 @@ * use integer types in stdint.h * suppress warnings *-----------------------------------------------------------------------------*/ -/*#define _POSIX_C_SOURCE 199506 -*/ +#define _POSIX_C_SOURCE 200112L #include #include #include