Merged from branch linux_build

2026-03-22 23:05:36 +08:00 · 2013-04-04 21:36:27 +02:00
parent ce55772f7a be743ba75e
commit 4ca22ddf3f
30 changed files with 81 additions and 46 deletions
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -1,6 +1,6 @@
-ADD_SUBDIRECTORY(Logging)
+ADD_SUBDIRECTORY(logging)
 ADD_SUBDIRECTORY(com_server)
 ADD_SUBDIRECTORY(com_client)
-ADD_SUBDIRECTORY(Geodetic2Ecef)
+ADD_SUBDIRECTORY(geodetic2ecef)
 ADD_SUBDIRECTORY(interpolator)
 ADD_SUBDIRECTORY(config)
--- a/samples/Geodetic2Ecef/CMakeLists.txt
+++ b/samples/Geodetic2Ecef/CMakeLists.txt
@@ -1,6 +0,0 @@
-FILE(GLOB SRC *.cpp)
-
-ADD_EXECUTABLE(sample_Geodetic2Ecef ${SRC})
-
-TARGET_LINK_LIBRARIES(sample_Geodetic2Ecef blackmisc blackcore ${QT_LIBRARIES})
-SET_TARGET_PROPERTIES(sample_Geodetic2Ecef PROPERTIES PROJECT_LABEL "Samples - Geodetic to Ecef")
--- a/samples/geodetic2ecef/CMakeLists.txt
+++ b/samples/geodetic2ecef/CMakeLists.txt
@@ -0,0 +1,6 @@
+FILE(GLOB SRC *.cpp)
+
+ADD_EXECUTABLE(sample_geodetic2ecef ${SRC})
+
+TARGET_LINK_LIBRARIES(sample_geodetic2ecef blackmisc blackcore ${QT_LIBRARIES})
+SET_TARGET_PROPERTIES(sample_geodetic2ecef PROPERTIES PROJECT_LABEL "Samples - Geodetic to Ecef")
--- a/samples/geodetic2ecef/main.cpp
+++ b/samples/geodetic2ecef/main.cpp
@@ -2,8 +2,6 @@
 #include <QElapsedTimer>
 #include "blackmisc/debug.h"
 #include <iostream>
-#include <conio.h>
-#include <windows.h>

 #include "blackcore/ecef.h"
 #include "blackcore/vector_geo.h"
--- a/samples/geodetic2ecef/sample_geodetic2ecef.pro
+++ b/samples/geodetic2ecef/sample_geodetic2ecef.pro
--- a/samples/interpolator/main.cpp
+++ b/samples/interpolator/main.cpp
@@ -1,8 +1,6 @@
 #include <QCoreApplication>
 #include <QElapsedTimer>

-#include <windows.h>
-
 #include <iostream>

 #include "blackcore/matrix_3d.h"
--- a/samples/logging/CMakeLists.txt
+++ b/samples/logging/CMakeLists.txt
--- a/samples/logging/main.cpp
+++ b/samples/logging/main.cpp
--- a/samples/logging/sample_logging.pro
+++ b/samples/logging/sample_logging.pro