Merge pull request #1488 from dwcaress/trndev

trndev broken ubuntu 24.04 build after proj-support
dwcaress · Nov 6, 2024 · ea07d4a · ea07d4a
2 parents 0ee5dff + 2ce22b3
commit ea07d4a
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 19 deletions.
diff --git a/src/mbtrnav/opt/rov/Makefile b/src/mbtrnav/opt/rov/Makefile
@@ -148,7 +148,7 @@ TRNXPP=trnxpp
 TRNXPP_SRC= trnxpp_app.cpp
 TRNXPP_HPP= trnxpp.hpp
 TRNXPP_OBJ = $(TRNXPP_SRC:%.cpp=$(BUILD_DIR)/%.o)
-TRNXPP_LIBS =  -llcm -lstdc++ -lmb1 -ltrncli -ltrn  -lnewmat -lqnx -lnetcdf -lm -lpthread -lgeolib -ludpms $(OS_LIBS) -ltrnxplug
+TRNXPP_LIBS =  -llcm -lstdc++ -lmb1 -ltrncli -ltrn  -lnewmat -lqnx -lnetcdf -lm -lpthread -lgeocon -lgeolib  -ludpms $(OS_LIBS) -ltrnxplug
 
 FVTEST=fv-test
 FVTEST_SRC = flag_var_test.cpp
@@ -164,7 +164,7 @@ LIBUDPMS_LIBS=
 LIBTRNXPLUG = libtrnxplug.a
 LIBTRNXPLUG_SRC = plug-common.cpp plug-idtlass.cpp plug-oisledx.cpp plug-dvl.cpp plug-idt.cpp  plug-oisled.cpp plug-oisled2.cpp plug-lassmb.cpp plug-xmb1.cpp
 LIBTRNXPLUG_OBJ = $(LIBTRNXPLUG_SRC:%.cpp=$(BUILD_DIR)/%.o)
-LIBTRNXPLUG_LIBS = -lnewmat -lgeolib -ltrnw -lqnx -lmb1 -ltrn -ludpms -ltrncli -lnetcdf -llcm
+LIBTRNXPLUG_LIBS = -lnewmat -lgeocon  -lgeolib -ltrnw -lqnx -lmb1 -ltrn -ludpms -ltrncli -lnetcdf -llcm
 
 ########################################
 # Build Files (mostly for cleanup)

diff --git a/src/mbtrnav/opt/rov/trnx_utils.hpp b/src/mbtrnav/opt/rov/trnx_utils.hpp
@@ -41,7 +41,7 @@
 #include "trn_debug.hpp"
 #include "geo_cfg.hpp"
 #include "NavUtils.h"
-#include "GeoCon.h"
+#include "GeoCon.hpp"
 
 // /////////////////
 // Macros

diff --git a/src/mbtrnav/qnx-utils/DataLog.cc b/src/mbtrnav/qnx-utils/DataLog.cc
@@ -15,15 +15,14 @@
 /****************************************************************************/
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdlib.h>
-#include <stdint.h>
 #include <sys/stat.h>
+#include <stdint.h>
+#include <string.h>
 
 #if !defined(__APPLE__)
 #include <malloc.h>
 #endif
 
-#include <string.h>
 #include "DataLog.h"
 #include "ourTypes.h"
 #include "Exception.h"

diff --git a/src/mbtrnav/terrain-nav/TrnLog.cpp b/src/mbtrnav/terrain-nav/TrnLog.cpp
@@ -7,7 +7,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 //
-#include <stdint.h>
+#include <cstdint>
 #include "structDefs.h"
 #include "TrnLog.h"
 

diff --git a/src/mbtrnav/terrain-nav/TrnLog.h b/src/mbtrnav/terrain-nav/TrnLog.h
@@ -7,20 +7,20 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////
 //
-
-#ifndef TRNLOG_H
-#define TRNLOG_H
-
-#define TRNLOG_NAME_DFL  "TrnIO"
-#define TRNLOG_MNEM_NAME_DFL "trn"
-
+#include <stdint.h>
 #include "DataLogWriter.h"
 #include "IntegerData.h"
 #include "DoubleData.h"
 #include "ShortData.h"
 #include "TimeTag.h"
 #include "structDefs.h"
 
+#ifndef TRNLOG_H
+#define TRNLOG_H
+
+#define TRNLOG_NAME_DFL  "TrnIO"
+#define TRNLOG_MNEM_NAME_DFL "trn"
+
 #define TRN_MAX_BEAMS_DFL TRN_MAX_BEAMS
 // size of record ID
 #define TL_RID_SIZE sizeof(uint32_t)

diff --git a/src/mbtrnav/trnw/GeoCon.cpp b/src/mbtrnav/trnw/GeoCon.cpp
@@ -330,6 +330,15 @@ GeoCon::GeoCon(const char *tcrs)
 {
     std::cerr << __func__ << ": ERR proj not supported; build using -DTRN_USE_PROJ" << std::endl;
 }
+GeoCon::GeoCon(void *xfm, bool autodel, const char *tcrs, const char *scrs)
+{
+    std::cerr << __func__ << ": ERR proj not supported; build using -DTRN_USE_PROJ" << std::endl;
+}
+
+GeoCon::GeoCon(void *xfm, bool autodel)
+{
+    std::cerr << __func__ << ": ERR proj not supported; build using -DTRN_USE_PROJ" << std::endl;
+}
 #endif
 
 GeoCon::~GeoCon()

diff --git a/src/mbtrnav/trnw/Makefile b/src/mbtrnav/trnw/Makefile
@@ -13,7 +13,7 @@ OPT_TRN_BUILD=-DLIBTRN_BUILD=$(build_date)
 mb1rs_ver ?=0.0.0b1
 OPT_MB1RS_VER=-DMB1RS_VER=$(mb1rs_ver)
 OPT_MB1RS_BUILD=-DMB1RS_BUILD=$(build_date)
-OPT_USE_PROJ=-DTRN_USE_PROJ
+OPT_USE_PROJ= #-DTRN_USE_PROJ
 
 # C standard e.g. -std=c99 -std=gnu99
 # may be needed for Cygwin (e.g. for loop declare/init)
@@ -119,8 +119,8 @@ LIB_PATHS = -L$(OUTPUT_DIR) -L$(MFRAME_LIB_DIR) -L$(PROJ_LIB_DIR) $(OS_LIB_PATH)
 ########################################
 # Target Definitions
 
-# libgcon: Geoconversion wrapper for NavUtils/GCTP, PROJ
-LIBGCON=libgcon.a
+# libgeocon: Geoconversion wrapper for NavUtils/GCTP, PROJ
+LIBGCON=libgeocon.a
 LIBGCON_SRC = GeoCon.cpp
 LIBGCON_OBJ=$(LIBGCON_SRC:%.cpp=$(BUILD_DIR)/%.o)
 LIBGCON_LIBS = -lqnx $(PROJ_LIB)
@@ -169,7 +169,7 @@ LIBTRNCLI_LIBS = -lmframe -lpthread -lm
 TRNCLI_TEST=trncli-test
 TRNCLI_TEST_SRC=trncli_test.c mb1_msg.c
 TRNCLI_TEST_OBJ=$(TRNCLI_TEST_SRC:%.c=$(BUILD_DIR)/%.o)
-TRNCLI_TEST_LIBS = -lmframe -ltrnw -lpthread -lm -lqnx -lnewmat -ltrn -ltrncli -lgcon -lnetcdf -lgeolib $(PROJ_LIB) -lstdc++
+TRNCLI_TEST_LIBS = -lmframe -ltrnw -lpthread -lm -lqnx -lnewmat -ltrn -ltrncli -lgeocon -lnetcdf -lgeolib $(PROJ_LIB) -lstdc++
 
 # libtrnucli: TRNU client lib
 LIBTRNUCLI=libtrnucli.a
@@ -222,7 +222,7 @@ MMCSUB_LIBS = $(MFRAME_LIB) -lmframe -lm -lstdc++
 TRNIF_TEST=trnif-test
 TRNIF_TEST_SRC=trnif_test.c trnif_proto.c trnif_msg.c
 TRNIF_TEST_OBJ = $(TRNIF_TEST_SRC:%.c=$(BUILD_DIR)/%.o)
-TRNIF_TEST_LIBS = -lnetif -lmframe -ltrnw -lpthread -lm -lqnx -lnewmat -ltrn -lnetcdf -lgeolib -lgcon $(PROJ_LIB) -lstdc++
+TRNIF_TEST_LIBS = -lnetif -lmframe -ltrnw -lpthread -lm -lqnx -lnewmat -ltrn -lnetcdf -lgeolib -lgeocon $(PROJ_LIB) -lstdc++
 
 MB1RS=mb1rs
 MB1RS_SRC=mb1_msg.c mb1rs.c mb1rs-app.c