From 5a68c8ba5e260d013e9075a8ff38888f06379b0b Mon Sep 17 00:00:00 2001 From: jmmuller Date: Thu, 27 Jun 2024 08:06:39 +0200 Subject: [PATCH] fix compil without Qt --- Comp3D_cpp_noGUI_noSIM.pro | 111 ------------------------------------- Makefile_nonQt | 5 +- main.cpp | 2 + src/station.h | 1 + 4 files changed, 5 insertions(+), 114 deletions(-) delete mode 100644 Comp3D_cpp_noGUI_noSIM.pro diff --git a/Comp3D_cpp_noGUI_noSIM.pro b/Comp3D_cpp_noGUI_noSIM.pro deleted file mode 100644 index 38984bd7..00000000 --- a/Comp3D_cpp_noGUI_noSIM.pro +++ /dev/null @@ -1,111 +0,0 @@ -win32 { - include(path_win.pri) -} - -gittarget.target = $$relative_path($$PWD/src/genere/git_revision.cpp,$$OUT_PWD) -licensetarget.target = $$relative_path($$PWD/src/genere/license_crypted.cpp,$$OUT_PWD) -win32 { - #gittarget.commands = powershell -NonInteractive -File $$PWD/src/genere/script_infos_git.sh $$PWD $$PWD/src/genere/git_revision.cpp #ne quitte pas! - gittarget.commands = $$GIT_BASH $$PWD/src/genere/script_infos_git.sh $$PWD $$PWD/src/genere/git_revision.cpp - licensetarget.commands = $$GIT_BASH $$PWD/src/genere/script_crypt_license.sh $$PWD/src/genere -} -unix { - gittarget.commands = sh $$PWD/src/genere/script_infos_git.sh $$PWD $$PWD/src/genere/git_revision.cpp - licensetarget.commands = sh $$PWD/src/genere/script_crypt_license.sh $$PWD/src/genere -} -gittarget.depends = FORCE -licensetarget.depends = FORCE - -QMAKE_EXTRA_TARGETS += gittarget licensetarget -PRE_TARGETDEPS += $$gittarget.target $$licensetarget.target - -DEFINES += USE_QT USE_AUTO - -QT += core -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = Comp3D -TEMPLATE = app - -#CONFIG += debug -CONFIG -= console -CONFIG += c++11 - -DEPENDPATH += $$gittarget.target $$licensetarget.target - -SOURCES += main.cpp \ - lib_ex.cpp \ - src/leastsquares.cpp \ - src/obs.cpp \ - src/point.cpp \ - src/coord.cpp \ - src/projection.cpp \ - src/station.cpp \ - src/station_simple.cpp \ - src/parameter.cpp \ - src/project.cpp \ - src/mathtools.cpp \ - src/station_hz.cpp \ - src/jsoncpp.cpp \ - src/project_config.cpp \ - src/datafile.cpp \ - src/ellipsoid.cpp \ - src/station_axis.cpp \ - src/axisobs.cpp \ - src/station_bascule.cpp \ - src/matrixordering.cpp \ - src/info.cpp \ - $$PWD/src/genere/git_revision.cpp \ - $$PWD/src/genere/license_crypted.cpp \ - src/comppref.cpp - - -INCLUDEPATH += src - -HEADERS += \ - src/leastsquares.h \ - src/obs.h \ - src/point.h \ - src/coord.h \ - src/projection.h \ - src/station.h \ - src/station_simple.h \ - src/parameter.h \ - src/project.h \ - src/mathtools.h \ - src/station_hz.h \ - src/json/json-forwards.h \ - src/json/json.h \ - src/compile.h \ - src/project_config.h \ - src/datafile.h \ - src/ellipsoid.h \ - src/station_axis.h \ - src/axisobs.h \ - src/station_bascule.h \ - src/matrixordering.h \ - src/info.h \ - src/comppref.h - -unix { - LIBS += -lboost_system - LIBS += -lboost_filesystem - LIBS += -lboost_date_time - LIBS += -lboost_regex - LIBS += -lboost_graph - LIBS += -lproj -} - -RESOURCES += \ - ressource.qrc - -OTHER_FILES += \ - gui/translations/Comp3D_fr.ts \ - gui/html/visu_comp.js \ - gui/html/comp3d.css - -DISTFILES += \ - INSTALL.txt \ - README.md \ - infos_comp_cpp.txt \ - TODO diff --git a/Makefile_nonQt b/Makefile_nonQt index e6e33e2f..03597c65 100644 --- 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 index e39f6a1c..d378ecd9 100644 --- a/main.cpp +++ b/main.cpp @@ -124,7 +124,9 @@ int main(int argc, char *argv[]) std::cout<<"------------------------------------------------------------------------"< +#include class Point;