fix compil without Qt

IGNF · Jun 27, 2024 · 5a68c8b · 5a68c8b
1 parent c7c254f
commit 5a68c8b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 114 deletions.
diff --git a/Comp3D_cpp_noGUI_noSIM.pro b/Comp3D_cpp_noGUI_noSIM.pro
diff --git a/Makefile_nonQt b/Makefile_nonQt
@@ -1,6 +1,6 @@
 CXX = g++
-CXXFLAGS = -DUSE_AUTO -DADD_PROJ_CC -DADD_PROJ_NTF -DUSE_SIM -Isrc/ -std=c++11 -I/usr/local/proj61/include/
-LFLAGS = -no-pie -lboost_system -lboost_filesystem -lboost_date_time -lboost_regex -lboost_graph -lproj -lsqlite3 -L/usr/local/proj61/lib/
+CXXFLAGS = -DUSE_AUTO -DADD_PROJ_CC -DADD_PROJ_NTF -DUSE_SIM -Isrc/ -std=c++14 -I/usr/local/proj82/include/
+LFLAGS = -no-pie -lboost_system -lboost_filesystem -lboost_date_time -lboost_regex -lboost_graph -lproj -lsqlite3 -L/usr/local/proj82/lib/
 EXE = Comp3d5_nonQt
 
 CXX_SRCS = $(wildcard src/*.cpp main.cpp) src/genere/git_revision.cpp
@@ -20,4 +20,3 @@ clean:
 
 %.o: %.cpp
 	$(CXX) -c  $(CXXFLAGS) $< -o $@
-
diff --git a/main.cpp b/main.cpp
@@ -124,7 +124,9 @@ int main(int argc, char *argv[])
     std::cout<<"------------------------------------------------------------------------"<<std::endl;
     std::cout<<" end of "<<COMP3D_VERSION<<std::endl;
     std::cout<<"------------------------------------------------------------------------"<<std::endl;
+#ifdef USE_QT
     delete a;
+#endif
     return result;
 }
 

diff --git a/src/station.h b/src/station.h
@@ -21,6 +21,7 @@
 #include "json/json.h"
 #include "parameter.h"
 #include <vector>
+#include <list>
 
 
 class Point;