code cleanup: move c++ code to src directory

OpenPHDGuiding · Jul 5, 2024 · 2e1a5eb · 2e1a5eb
1 parent ca87ea4
commit 2e1a5eb
Show file tree

Hide file tree

Showing 292 changed files with 35 additions and 33 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,21 +60,21 @@ endif()
 
 # root directory of the project
 set(PHD_PROJECT_ROOT_DIR ${CMAKE_SOURCE_DIR})
-set(phd_src_dir ${PHD_PROJECT_ROOT_DIR})
+set(phd_src_dir ${PHD_PROJECT_ROOT_DIR}/src)
 
 # Additional files in the workspace, To improve maintainability
 add_custom_target(CmakeAdditionalFiles
   SOURCES
-  ${phd_src_dir}/thirdparty/thirdparty.cmake
-  ${phd_src_dir}/cmake_modules/FindASCOM_INTERFACE.cmake
-  ${phd_src_dir}/cmake_modules/FindCFITSIO.cmake
-  ${phd_src_dir}/cmake_modules/FindINDI.cmake
-  ${phd_src_dir}/cmake_modules/FindNova.cmake
-  ${phd_src_dir}/cmake_modules/PHD2BuildDoc.cmake
-  ${phd_src_dir}/cmake_modules/PHD2GenerateDocScript.cmake
-  ${phd_src_dir}/cmake_modules/PHD2Removegettextwarning.cmake
-  ${phd_src_dir}/cmake_modules/compiler_options.cmake
-  ${phd_src_dir}/cmake_modules/PHD2Packaging.cmake)
+  ${PHD_PROJECT_ROOT_DIR}/thirdparty/thirdparty.cmake
+  ${PHD_PROJECT_ROOT_DIR}/cmake_modules/FindASCOM_INTERFACE.cmake
+  ${PHD_PROJECT_ROOT_DIR}/cmake_modules/FindCFITSIO.cmake
+  ${PHD_PROJECT_ROOT_DIR}/cmake_modules/FindINDI.cmake
+  ${PHD_PROJECT_ROOT_DIR}/cmake_modules/FindNova.cmake
+  ${PHD_PROJECT_ROOT_DIR}/cmake_modules/PHD2BuildDoc.cmake
+  ${PHD_PROJECT_ROOT_DIR}/cmake_modules/PHD2GenerateDocScript.cmake
+  ${PHD_PROJECT_ROOT_DIR}/cmake_modules/PHD2Removegettextwarning.cmake
+  ${PHD_PROJECT_ROOT_DIR}/cmake_modules/compiler_options.cmake
+  ${PHD_PROJECT_ROOT_DIR}/cmake_modules/PHD2Packaging.cmake)
 
 # compiler options
 include(cmake_modules/compiler_options.cmake)
@@ -146,10 +146,12 @@ add_subdirectory(contributions/MPI_IS_gaussian_process tmp_gaussian_process)
 #################################################################################
 #
 # Global include directories
-# WxWidgets inclusion narrowed to PHD2 project only
-# include_directories(${wxWidgets_INCLUDE_DIRS})
-include_directories(${phd_src_dir}/cameras/)
 include_directories(${phd_src_dir})
+include_directories(${PHD_PROJECT_ROOT_DIR}/cameras)
+# PROJECT_ROOT_DIR is added as in include directory file code that
+# uses: #include "cameras/some_camera.h"
+# TODO: would be better to separate cameras/ into per-camera directories
+include_directories(${PHD_PROJECT_ROOT_DIR})
 
 
 
@@ -245,8 +247,8 @@ if(WIN32)
     ${phd_src_dir}/cam_atik16.cpp
     ${phd_src_dir}/cam_atik16.h
 
-    ${phd_src_dir}/cameras/ArtemisHSCAPI.h
-    ${phd_src_dir}/cameras/ArtemisHSCAPI.cpp
+    ${PHD_PROJECT_ROOT_DIR}/cameras/ArtemisHSCAPI.h
+    ${PHD_PROJECT_ROOT_DIR}/cameras/ArtemisHSCAPI.cpp
   )
 elseif(UNIX AND (NOT APPLE))
   set(cam_SRC
@@ -572,17 +574,17 @@ if(APPLE)
     ${phd2_SRC}
 
     # resources of the bundle
-    ${phd_src_dir}/${MACOSX_BUNDLE_ICON_FILE}
+    ${PHD_PROJECT_ROOT_DIR}/icons/${MACOSX_BUNDLE_ICON_FILE}
 
     # extra frameworks
     ${phd2_OSX_FRAMEWORKS}
 
-    ${phd_src_dir}/run_phd2_macos
+    ${PHD_PROJECT_ROOT_DIR}/run_phd2_macos
   )
   set_target_properties(
     phd2
     PROPERTIES
-    MACOSX_BUNDLE_INFO_PLIST ${phd_src_dir}/MacOSXBundleInfo.plist.in
+    MACOSX_BUNDLE_INFO_PLIST ${PHD_PROJECT_ROOT_DIR}/MacOSXBundleInfo.plist.in
     OUTPUT_NAME PHD2  # upper case on OSX
   )
   target_include_directories(
@@ -591,13 +593,13 @@ if(APPLE)
   )
 
   set_source_files_properties(
-    ${phd_src_dir}/${MACOSX_BUNDLE_ICON_FILE}
+    ${PHD_PROJECT_ROOT_DIR}/icons/${MACOSX_BUNDLE_ICON_FILE}
       PROPERTIES
         MACOSX_PACKAGE_LOCATION Resources
   )
 
   set_source_files_properties(
-    ${phd_src_dir}/run_phd2_macos
+    ${PHD_PROJECT_ROOT_DIR}/run_phd2_macos
     PROPERTIES
       MACOSX_PACKAGE_LOCATION MacOS
   )
@@ -739,7 +741,7 @@ elseif(WIN32)
   ADD_MSVC_PRECOMPILED_HEADER("phd.h" "precompiled_header.cpp" phd2_WIN_SRC)
 
   # resource file, some VC do not like the options provided by the precompiled headers
-  set(phd2_WIN_SRC ${phd2_WIN_SRC} ${phd_src_dir}/phd.rc)
+  set(phd2_WIN_SRC ${phd2_WIN_SRC} ${PHD_PROJECT_ROOT_DIR}/phd.rc)
   source_group(src FILES precompiled_header.cpp)
 
   link_directories("C:/Program Files (x86)/Visual Leak Detector/lib/win32")

diff --git a/build/build-mac b/build/build-mac
@@ -84,7 +84,7 @@ fi
 
 V=$(perl -ne '
  /^\s*#\s*define\s+PHDVERSION[^"]+"([^"]*)/ && do { $v = $1; next LINE };
- /^\s*#\s*define\s+PHDSUBVER[^"]+"([^"]*)/ && do { $s = $1; print "$v$s"; exit }' phd.h)
+ /^\s*#\s*define\s+PHDSUBVER[^"]+"([^"]*)/ && do { $s = $1; print "$v$s"; exit }' src/phd.h)
 
 [[ $V ]] || {
     echo "could not get version from phd.h!" >&2

diff --git a/build/build-win b/build/build-win
@@ -73,7 +73,7 @@ CMAKE_W=$(cygpath -w "$CMAKE")
 
 V=$(perl -ne '
  /^\s*#\s*define\s+PHDVERSION[^"]+"([^"]*)/ && do { $v = $1; next LINE };
- /^\s*#\s*define\s+PHDSUBVER[^"]+"([^"]*)/ && do { $s = $1; print "$v$s"; exit }' phd.h)
+ /^\s*#\s*define\s+PHDSUBVER[^"]+"([^"]*)/ && do { $s = $1; print "$v$s"; exit }' src/phd.h)
 
 INSTALLER=phd2-${V}-installer
 

diff --git a/cam_KWIQGuider/KWIQGuider.cpp → cameras/KWIQGuider/KWIQGuider.cpp b/cam_KWIQGuider/KWIQGuider.cpp → cameras/KWIQGuider/KWIQGuider.cpp
diff --git a/cam_KWIQGuider/KWIQGuider.h → cameras/KWIQGuider/KWIQGuider.h b/cam_KWIQGuider/KWIQGuider.h → cameras/KWIQGuider/KWIQGuider.h
diff --git a/cam_KWIQGuider/KWIQGuider_firmware.h → cameras/KWIQGuider/KWIQGuider_firmware.h b/cam_KWIQGuider/KWIQGuider_firmware.h → cameras/KWIQGuider/KWIQGuider_firmware.h
diff --git a/cam_KWIQGuider/KWIQGuider_loader.cpp → cameras/KWIQGuider/KWIQGuider_loader.cpp b/cam_KWIQGuider/KWIQGuider_loader.cpp → cameras/KWIQGuider/KWIQGuider_loader.cpp
diff --git a/cam_KWIQGuider/KWIQGuider_priv.h → cameras/KWIQGuider/KWIQGuider_priv.h b/cam_KWIQGuider/KWIQGuider_priv.h → cameras/KWIQGuider/KWIQGuider_priv.h
diff --git a/cmake_modules/PHD2BuildDoc.cmake b/cmake_modules/PHD2BuildDoc.cmake
@@ -46,7 +46,7 @@ set(_default_locale "en_EN")
 #    `VERSION_MAJOR`, `VERSION_MINOR` and `VERSION_PATCH`.
 #    Raises an error if the version cannot be extracted
 function(get_phd_version)
-  set(filename_to_extract_from ${PHD_PROJECT_ROOT_DIR}/phd.h)
+  set(filename_to_extract_from ${PHD_PROJECT_ROOT_DIR}/src/phd.h)
   file(STRINGS ${filename_to_extract_from} file_content
        #REGEX "PHDVERSION[ _T\\(]+\"(.*)\""
   )

diff --git a/PHD_2.0_Architecture.docx → doc/PHD_2.0_Architecture.docx b/PHD_2.0_Architecture.docx → doc/PHD_2.0_Architecture.docx
diff --git a/PHD_OSX_icon.icns → icons/PHD_OSX_icon.icns b/PHD_OSX_icon.icns → icons/PHD_OSX_icon.icns
diff --git a/Refine_DefMap.cpp → src/Refine_DefMap.cpp b/Refine_DefMap.cpp → src/Refine_DefMap.cpp
diff --git a/Refine_DefMap.h → src/Refine_DefMap.h b/Refine_DefMap.h → src/Refine_DefMap.h
diff --git a/about_dialog.cpp → src/about_dialog.cpp b/about_dialog.cpp → src/about_dialog.cpp
diff --git a/about_dialog.h → src/about_dialog.h b/about_dialog.h → src/about_dialog.h
diff --git a/advanced_dialog.cpp → src/advanced_dialog.cpp b/advanced_dialog.cpp → src/advanced_dialog.cpp
diff --git a/advanced_dialog.h → src/advanced_dialog.h b/advanced_dialog.h → src/advanced_dialog.h
diff --git a/aui_controls.cpp → src/aui_controls.cpp b/aui_controls.cpp → src/aui_controls.cpp
diff --git a/aui_controls.h → src/aui_controls.h b/aui_controls.h → src/aui_controls.h
diff --git a/backlash_comp.cpp → src/backlash_comp.cpp b/backlash_comp.cpp → src/backlash_comp.cpp
diff --git a/backlash_comp.h → src/backlash_comp.h b/backlash_comp.h → src/backlash_comp.h
diff --git a/calibration_assistant.cpp → src/calibration_assistant.cpp b/calibration_assistant.cpp → src/calibration_assistant.cpp
diff --git a/calibration_assistant.h → src/calibration_assistant.h b/calibration_assistant.h → src/calibration_assistant.h
diff --git a/calreview_dialog.cpp → src/calreview_dialog.cpp b/calreview_dialog.cpp → src/calreview_dialog.cpp
diff --git a/calreview_dialog.h → src/calreview_dialog.h b/calreview_dialog.h → src/calreview_dialog.h
diff --git a/calstep_dialog.cpp → src/calstep_dialog.cpp b/calstep_dialog.cpp → src/calstep_dialog.cpp
diff --git a/calstep_dialog.h → src/calstep_dialog.h b/calstep_dialog.h → src/calstep_dialog.h
diff --git a/cam_INovaPLC.cpp → src/cam_INovaPLC.cpp b/cam_INovaPLC.cpp → src/cam_INovaPLC.cpp
diff --git a/cam_INovaPLC.h → src/cam_INovaPLC.h b/cam_INovaPLC.h → src/cam_INovaPLC.h
diff --git a/cam_KWIQGuider.cpp → src/cam_KWIQGuider.cpp b/cam_KWIQGuider.cpp → src/cam_KWIQGuider.cpp
diff --git a/cam_KWIQGuider.h → src/cam_KWIQGuider.h b/cam_KWIQGuider.h → src/cam_KWIQGuider.h
diff --git a/cam_LELXUSBWebcam.cpp → src/cam_LELXUSBWebcam.cpp b/cam_LELXUSBWebcam.cpp → src/cam_LELXUSBWebcam.cpp
diff --git a/cam_LELXUSBWebcam.h → src/cam_LELXUSBWebcam.h b/cam_LELXUSBWebcam.h → src/cam_LELXUSBWebcam.h
diff --git a/cam_LEParallelWebcam.cpp → src/cam_LEParallelWebcam.cpp b/cam_LEParallelWebcam.cpp → src/cam_LEParallelWebcam.cpp
diff --git a/cam_LEParallelWebcam.h → src/cam_LEParallelWebcam.h b/cam_LEParallelWebcam.h → src/cam_LEParallelWebcam.h
diff --git a/cam_LESerialWebcam.cpp → src/cam_LESerialWebcam.cpp b/cam_LESerialWebcam.cpp → src/cam_LESerialWebcam.cpp
diff --git a/cam_LESerialWebcam.h → src/cam_LESerialWebcam.h b/cam_LESerialWebcam.h → src/cam_LESerialWebcam.h
diff --git a/cam_LEwebcam.cpp → src/cam_LEwebcam.cpp b/cam_LEwebcam.cpp → src/cam_LEwebcam.cpp
diff --git a/cam_MeadeDSI.cpp → src/cam_MeadeDSI.cpp b/cam_MeadeDSI.cpp → src/cam_MeadeDSI.cpp
diff --git a/cam_MeadeDSI.h → src/cam_MeadeDSI.h b/cam_MeadeDSI.h → src/cam_MeadeDSI.h
diff --git a/cam_NebSBIG.cpp → src/cam_NebSBIG.cpp b/cam_NebSBIG.cpp → src/cam_NebSBIG.cpp
diff --git a/cam_NebSBIG.h → src/cam_NebSBIG.h b/cam_NebSBIG.h → src/cam_NebSBIG.h
diff --git a/cam_OSPL130.cpp → src/cam_OSPL130.cpp b/cam_OSPL130.cpp → src/cam_OSPL130.cpp
diff --git a/cam_OSPL130.h → src/cam_OSPL130.h b/cam_OSPL130.h → src/cam_OSPL130.h
diff --git a/cam_StarShootDSCI.cpp → src/cam_StarShootDSCI.cpp b/cam_StarShootDSCI.cpp → src/cam_StarShootDSCI.cpp
diff --git a/cam_StarShootDSCI.h → src/cam_StarShootDSCI.h b/cam_StarShootDSCI.h → src/cam_StarShootDSCI.h
diff --git a/cam_altair.cpp → src/cam_altair.cpp b/cam_altair.cpp → src/cam_altair.cpp
diff --git a/cam_altair.h → src/cam_altair.h b/cam_altair.h → src/cam_altair.h
diff --git a/cam_ascom.cpp → src/cam_ascom.cpp b/cam_ascom.cpp → src/cam_ascom.cpp
diff --git a/cam_ascom.h → src/cam_ascom.h b/cam_ascom.h → src/cam_ascom.h
diff --git a/cam_atik16.cpp → src/cam_atik16.cpp b/cam_atik16.cpp → src/cam_atik16.cpp
diff --git a/cam_atik16.h → src/cam_atik16.h b/cam_atik16.h → src/cam_atik16.h
diff --git a/cam_firewire.h → src/cam_firewire.h b/cam_firewire.h → src/cam_firewire.h
diff --git a/cam_firewire_IC.cpp → src/cam_firewire_IC.cpp b/cam_firewire_IC.cpp → src/cam_firewire_IC.cpp
diff --git a/cam_firewire_OSX.cpp → src/cam_firewire_OSX.cpp b/cam_firewire_OSX.cpp → src/cam_firewire_OSX.cpp
diff --git a/cam_indi.cpp → src/cam_indi.cpp b/cam_indi.cpp → src/cam_indi.cpp
diff --git a/cam_indi.h → src/cam_indi.h b/cam_indi.h → src/cam_indi.h
diff --git a/cam_ioptron.cpp → src/cam_ioptron.cpp b/cam_ioptron.cpp → src/cam_ioptron.cpp
diff --git a/cam_ioptron.h → src/cam_ioptron.h b/cam_ioptron.h → src/cam_ioptron.h
diff --git a/cam_moravian.cpp → src/cam_moravian.cpp b/cam_moravian.cpp → src/cam_moravian.cpp
diff --git a/cam_moravian.h → src/cam_moravian.h b/cam_moravian.h → src/cam_moravian.h
diff --git a/cam_ogma.cpp → src/cam_ogma.cpp b/cam_ogma.cpp → src/cam_ogma.cpp
diff --git a/cam_ogma.h → src/cam_ogma.h b/cam_ogma.h → src/cam_ogma.h
diff --git a/cam_opencv.cpp → src/cam_opencv.cpp b/cam_opencv.cpp → src/cam_opencv.cpp
diff --git a/cam_opencv.h → src/cam_opencv.h b/cam_opencv.h → src/cam_opencv.h
diff --git a/cam_openssag.cpp → src/cam_openssag.cpp b/cam_openssag.cpp → src/cam_openssag.cpp
diff --git a/cam_openssag.h → src/cam_openssag.h b/cam_openssag.h → src/cam_openssag.h
diff --git a/cam_qguide.cpp → src/cam_qguide.cpp b/cam_qguide.cpp → src/cam_qguide.cpp
diff --git a/cam_qguide.h → src/cam_qguide.h b/cam_qguide.h → src/cam_qguide.h
diff --git a/cam_qhy.cpp → src/cam_qhy.cpp b/cam_qhy.cpp → src/cam_qhy.cpp
diff --git a/cam_qhy.h → src/cam_qhy.h b/cam_qhy.h → src/cam_qhy.h
diff --git a/cam_qhy5.cpp → src/cam_qhy5.cpp b/cam_qhy5.cpp → src/cam_qhy5.cpp
diff --git a/cam_qhy5.h → src/cam_qhy5.h b/cam_qhy5.h → src/cam_qhy5.h
diff --git a/cam_sbig.cpp → src/cam_sbig.cpp b/cam_sbig.cpp → src/cam_sbig.cpp
diff --git a/cam_sbig.h → src/cam_sbig.h b/cam_sbig.h → src/cam_sbig.h
diff --git a/cam_sbigrotator.cpp → src/cam_sbigrotator.cpp b/cam_sbigrotator.cpp → src/cam_sbigrotator.cpp
diff --git a/cam_sbigrotator.h → src/cam_sbigrotator.h b/cam_sbigrotator.h → src/cam_sbigrotator.h
diff --git a/cam_skyraider.cpp → src/cam_skyraider.cpp b/cam_skyraider.cpp → src/cam_skyraider.cpp
diff --git a/cam_skyraider.h → src/cam_skyraider.h b/cam_skyraider.h → src/cam_skyraider.h
diff --git a/cam_sspiag.cpp → src/cam_sspiag.cpp b/cam_sspiag.cpp → src/cam_sspiag.cpp
diff --git a/cam_sspiag.h → src/cam_sspiag.h b/cam_sspiag.h → src/cam_sspiag.h
diff --git a/cam_starfish.cpp → src/cam_starfish.cpp b/cam_starfish.cpp → src/cam_starfish.cpp
diff --git a/cam_starfish.h → src/cam_starfish.h b/cam_starfish.h → src/cam_starfish.h
diff --git a/cam_svb.cpp → src/cam_svb.cpp b/cam_svb.cpp → src/cam_svb.cpp
diff --git a/cam_svb.h → src/cam_svb.h b/cam_svb.h → src/cam_svb.h
diff --git a/cam_sxv.cpp → src/cam_sxv.cpp b/cam_sxv.cpp → src/cam_sxv.cpp
diff --git a/cam_sxv.h → src/cam_sxv.h b/cam_sxv.h → src/cam_sxv.h
diff --git a/cam_touptek.cpp → src/cam_touptek.cpp b/cam_touptek.cpp → src/cam_touptek.cpp
diff --git a/cam_touptek.h → src/cam_touptek.h b/cam_touptek.h → src/cam_touptek.h
diff --git a/cam_vfw.cpp → src/cam_vfw.cpp b/cam_vfw.cpp → src/cam_vfw.cpp
diff --git a/cam_vfw.h → src/cam_vfw.h b/cam_vfw.h → src/cam_vfw.h
diff --git a/cam_wdm.cpp → src/cam_wdm.cpp b/cam_wdm.cpp → src/cam_wdm.cpp
diff --git a/cam_wdm.h → src/cam_wdm.h b/cam_wdm.h → src/cam_wdm.h
diff --git a/cam_wdm_base.h → src/cam_wdm_base.h b/cam_wdm_base.h → src/cam_wdm_base.h
diff --git a/cam_zwo.cpp → src/cam_zwo.cpp b/cam_zwo.cpp → src/cam_zwo.cpp
diff --git a/cam_zwo.h → src/cam_zwo.h b/cam_zwo.h → src/cam_zwo.h
diff --git a/camcal_import_dialog.cpp → src/camcal_import_dialog.cpp b/camcal_import_dialog.cpp → src/camcal_import_dialog.cpp
diff --git a/camcal_import_dialog.h → src/camcal_import_dialog.h b/camcal_import_dialog.h → src/camcal_import_dialog.h
diff --git a/camera.cpp → src/camera.cpp b/camera.cpp → src/camera.cpp
diff --git a/camera.h → src/camera.h b/camera.h → src/camera.h
diff --git a/cameras.h → src/cameras.h b/cameras.h → src/cameras.h
diff --git a/circbuf.h → src/circbuf.h b/circbuf.h → src/circbuf.h
diff --git a/comdispatch.cpp → src/comdispatch.cpp b/comdispatch.cpp → src/comdispatch.cpp
diff --git a/comdispatch.h → src/comdispatch.h b/comdispatch.h → src/comdispatch.h
diff --git a/comet_tool.cpp → src/comet_tool.cpp b/comet_tool.cpp → src/comet_tool.cpp
diff --git a/comet_tool.h → src/comet_tool.h b/comet_tool.h → src/comet_tool.h
diff --git a/config_indi.cpp → src/config_indi.cpp b/config_indi.cpp → src/config_indi.cpp
diff --git a/config_indi.h → src/config_indi.h b/config_indi.h → src/config_indi.h
diff --git a/configdialog.cpp → src/configdialog.cpp b/configdialog.cpp → src/configdialog.cpp
diff --git a/configdialog.h → src/configdialog.h b/configdialog.h → src/configdialog.h
diff --git a/confirm_dialog.cpp → src/confirm_dialog.cpp b/confirm_dialog.cpp → src/confirm_dialog.cpp
diff --git a/confirm_dialog.h → src/confirm_dialog.h b/confirm_dialog.h → src/confirm_dialog.h
diff --git a/darks_dialog.cpp → src/darks_dialog.cpp b/darks_dialog.cpp → src/darks_dialog.cpp
diff --git a/darks_dialog.h → src/darks_dialog.h b/darks_dialog.h → src/darks_dialog.h
diff --git a/debuglog.cpp → src/debuglog.cpp b/debuglog.cpp → src/debuglog.cpp
diff --git a/debuglog.h → src/debuglog.h b/debuglog.h → src/debuglog.h
diff --git a/drift_tool.cpp → src/drift_tool.cpp b/drift_tool.cpp → src/drift_tool.cpp
diff --git a/drift_tool.h → src/drift_tool.h b/drift_tool.h → src/drift_tool.h
diff --git a/eegg.cpp → src/eegg.cpp b/eegg.cpp → src/eegg.cpp
diff --git a/event_server.cpp → src/event_server.cpp b/event_server.cpp → src/event_server.cpp
diff --git a/event_server.h → src/event_server.h b/event_server.h → src/event_server.h
diff --git a/fitsiowrap.cpp → src/fitsiowrap.cpp b/fitsiowrap.cpp → src/fitsiowrap.cpp
diff --git a/fitsiowrap.h → src/fitsiowrap.h b/fitsiowrap.h → src/fitsiowrap.h
diff --git a/gear_dialog.cpp → src/gear_dialog.cpp b/gear_dialog.cpp → src/gear_dialog.cpp
diff --git a/gear_dialog.h → src/gear_dialog.h b/gear_dialog.h → src/gear_dialog.h
diff --git a/gear_simulator.cpp → src/gear_simulator.cpp b/gear_simulator.cpp → src/gear_simulator.cpp
diff --git a/gear_simulator.h → src/gear_simulator.h b/gear_simulator.h → src/gear_simulator.h
diff --git a/graph-stepguider.cpp → src/graph-stepguider.cpp b/graph-stepguider.cpp → src/graph-stepguider.cpp
diff --git a/graph-stepguider.h → src/graph-stepguider.h b/graph-stepguider.h → src/graph-stepguider.h
diff --git a/graph.cpp → src/graph.cpp b/graph.cpp → src/graph.cpp
diff --git a/graph.h → src/graph.h b/graph.h → src/graph.h
diff --git a/guide_algorithm.cpp → src/guide_algorithm.cpp b/guide_algorithm.cpp → src/guide_algorithm.cpp
diff --git a/guide_algorithm.h → src/guide_algorithm.h b/guide_algorithm.h → src/guide_algorithm.h
diff --git a/guide_algorithm_gaussian_process.cpp → src/guide_algorithm_gaussian_process.cpp b/guide_algorithm_gaussian_process.cpp → src/guide_algorithm_gaussian_process.cpp
diff --git a/guide_algorithm_gaussian_process.h → src/guide_algorithm_gaussian_process.h b/guide_algorithm_gaussian_process.h → src/guide_algorithm_gaussian_process.h
diff --git a/guide_algorithm_hysteresis.cpp → src/guide_algorithm_hysteresis.cpp b/guide_algorithm_hysteresis.cpp → src/guide_algorithm_hysteresis.cpp
diff --git a/guide_algorithm_hysteresis.h → src/guide_algorithm_hysteresis.h b/guide_algorithm_hysteresis.h → src/guide_algorithm_hysteresis.h
diff --git a/guide_algorithm_identity.cpp → src/guide_algorithm_identity.cpp b/guide_algorithm_identity.cpp → src/guide_algorithm_identity.cpp
diff --git a/guide_algorithm_identity.h → src/guide_algorithm_identity.h b/guide_algorithm_identity.h → src/guide_algorithm_identity.h
diff --git a/guide_algorithm_lowpass.cpp → src/guide_algorithm_lowpass.cpp b/guide_algorithm_lowpass.cpp → src/guide_algorithm_lowpass.cpp
diff --git a/guide_algorithm_lowpass.h → src/guide_algorithm_lowpass.h b/guide_algorithm_lowpass.h → src/guide_algorithm_lowpass.h
diff --git a/guide_algorithm_lowpass2.cpp → src/guide_algorithm_lowpass2.cpp b/guide_algorithm_lowpass2.cpp → src/guide_algorithm_lowpass2.cpp
diff --git a/guide_algorithm_lowpass2.h → src/guide_algorithm_lowpass2.h b/guide_algorithm_lowpass2.h → src/guide_algorithm_lowpass2.h
diff --git a/guide_algorithm_resistswitch.cpp → src/guide_algorithm_resistswitch.cpp b/guide_algorithm_resistswitch.cpp → src/guide_algorithm_resistswitch.cpp
diff --git a/guide_algorithm_resistswitch.h → src/guide_algorithm_resistswitch.h b/guide_algorithm_resistswitch.h → src/guide_algorithm_resistswitch.h
diff --git a/guide_algorithm_zfilter.cpp → src/guide_algorithm_zfilter.cpp b/guide_algorithm_zfilter.cpp → src/guide_algorithm_zfilter.cpp
diff --git a/guide_algorithm_zfilter.h → src/guide_algorithm_zfilter.h b/guide_algorithm_zfilter.h → src/guide_algorithm_zfilter.h
diff --git a/guide_algorithms.h → src/guide_algorithms.h b/guide_algorithms.h → src/guide_algorithms.h
diff --git a/guider.cpp → src/guider.cpp b/guider.cpp → src/guider.cpp
diff --git a/guider.h → src/guider.h b/guider.h → src/guider.h
diff --git a/guider_multistar.cpp → src/guider_multistar.cpp b/guider_multistar.cpp → src/guider_multistar.cpp
diff --git a/guider_multistar.h → src/guider_multistar.h b/guider_multistar.h → src/guider_multistar.h
diff --git a/guiders.h → src/guiders.h b/guiders.h → src/guiders.h
diff --git a/guiding_assistant.cpp → src/guiding_assistant.cpp b/guiding_assistant.cpp → src/guiding_assistant.cpp
diff --git a/guiding_assistant.h → src/guiding_assistant.h b/guiding_assistant.h → src/guiding_assistant.h
diff --git a/guiding_stats.cpp → src/guiding_stats.cpp b/guiding_stats.cpp → src/guiding_stats.cpp
diff --git a/guiding_stats.h → src/guiding_stats.h b/guiding_stats.h → src/guiding_stats.h
diff --git a/guidinglog.cpp → src/guidinglog.cpp b/guidinglog.cpp → src/guidinglog.cpp
diff --git a/guidinglog.h → src/guidinglog.h b/guidinglog.h → src/guidinglog.h
diff --git a/image_math.cpp → src/image_math.cpp b/image_math.cpp → src/image_math.cpp
diff --git a/image_math.h → src/image_math.h b/image_math.h → src/image_math.h
diff --git a/imagelogger.cpp → src/imagelogger.cpp b/imagelogger.cpp → src/imagelogger.cpp
diff --git a/imagelogger.h → src/imagelogger.h b/imagelogger.h → src/imagelogger.h
diff --git a/indi_gui.cpp → src/indi_gui.cpp b/indi_gui.cpp → src/indi_gui.cpp
diff --git a/indi_gui.h → src/indi_gui.h b/indi_gui.h → src/indi_gui.h
diff --git a/json_parser.cpp → src/json_parser.cpp b/json_parser.cpp → src/json_parser.cpp
diff --git a/json_parser.h → src/json_parser.h b/json_parser.h → src/json_parser.h
diff --git a/log_uploader.cpp → src/log_uploader.cpp b/log_uploader.cpp → src/log_uploader.cpp
diff --git a/log_uploader.h → src/log_uploader.h b/log_uploader.h → src/log_uploader.h
diff --git a/logger.cpp → src/logger.cpp b/logger.cpp → src/logger.cpp
diff --git a/logger.h → src/logger.h b/logger.h → src/logger.h
diff --git a/manualcal_dialog.cpp → src/manualcal_dialog.cpp b/manualcal_dialog.cpp → src/manualcal_dialog.cpp
diff --git a/manualcal_dialog.h → src/manualcal_dialog.h b/manualcal_dialog.h → src/manualcal_dialog.h
diff --git a/messagebox_proxy.cpp → src/messagebox_proxy.cpp b/messagebox_proxy.cpp → src/messagebox_proxy.cpp
diff --git a/messagebox_proxy.h → src/messagebox_proxy.h b/messagebox_proxy.h → src/messagebox_proxy.h
diff --git a/mount.cpp → src/mount.cpp b/mount.cpp → src/mount.cpp
diff --git a/mount.h → src/mount.h b/mount.h → src/mount.h
diff --git a/myframe.cpp → src/myframe.cpp b/myframe.cpp → src/myframe.cpp
diff --git a/myframe.h → src/myframe.h b/myframe.h → src/myframe.h
diff --git a/myframe_events.cpp → src/myframe_events.cpp b/myframe_events.cpp → src/myframe_events.cpp
diff --git a/nudge_lock.cpp → src/nudge_lock.cpp b/nudge_lock.cpp → src/nudge_lock.cpp
diff --git a/nudge_lock.h → src/nudge_lock.h b/nudge_lock.h → src/nudge_lock.h
diff --git a/onboard_st4.cpp → src/onboard_st4.cpp b/onboard_st4.cpp → src/onboard_st4.cpp
diff --git a/onboard_st4.h → src/onboard_st4.h b/onboard_st4.h → src/onboard_st4.h
diff --git a/optionsbutton.cpp → src/optionsbutton.cpp b/optionsbutton.cpp → src/optionsbutton.cpp
diff --git a/optionsbutton.h → src/optionsbutton.h b/optionsbutton.h → src/optionsbutton.h
diff --git a/parallelport.cpp → src/parallelport.cpp b/parallelport.cpp → src/parallelport.cpp
diff --git a/parallelport.h → src/parallelport.h b/parallelport.h → src/parallelport.h
diff --git a/parallelport_win32.cpp → src/parallelport_win32.cpp b/parallelport_win32.cpp → src/parallelport_win32.cpp
diff --git a/parallelport_win32.h → src/parallelport_win32.h b/parallelport_win32.h → src/parallelport_win32.h
diff --git a/parallelports.h → src/parallelports.h b/parallelports.h → src/parallelports.h
diff --git a/phd.cpp → src/phd.cpp b/phd.cpp → src/phd.cpp
diff --git a/phd.h → src/phd.h b/phd.h → src/phd.h
diff --git a/phdconfig.cpp → src/phdconfig.cpp b/phdconfig.cpp → src/phdconfig.cpp
diff --git a/phdconfig.h → src/phdconfig.h b/phdconfig.h → src/phdconfig.h
diff --git a/phdcontrol.cpp → src/phdcontrol.cpp b/phdcontrol.cpp → src/phdcontrol.cpp
diff --git a/phdcontrol.h → src/phdcontrol.h b/phdcontrol.h → src/phdcontrol.h
diff --git a/phdupdate.cpp → src/phdupdate.cpp b/phdupdate.cpp → src/phdupdate.cpp
diff --git a/phdupdate.h → src/phdupdate.h b/phdupdate.h → src/phdupdate.h
diff --git a/pierflip_tool.cpp → src/pierflip_tool.cpp b/pierflip_tool.cpp → src/pierflip_tool.cpp
diff --git a/pierflip_tool.h → src/pierflip_tool.h b/pierflip_tool.h → src/pierflip_tool.h
diff --git a/point.h → src/point.h b/point.h → src/point.h
diff --git a/polardrift_tool.h → src/polardrift_tool.h b/polardrift_tool.h → src/polardrift_tool.h
diff --git a/polardrift_toolwin.cpp → src/polardrift_toolwin.cpp b/polardrift_toolwin.cpp → src/polardrift_toolwin.cpp
diff --git a/polardrift_toolwin.h → src/polardrift_toolwin.h b/polardrift_toolwin.h → src/polardrift_toolwin.h
diff --git a/precompiled_header.cpp → src/precompiled_header.cpp b/precompiled_header.cpp → src/precompiled_header.cpp
diff --git a/profile_wizard.cpp → src/profile_wizard.cpp b/profile_wizard.cpp → src/profile_wizard.cpp
diff --git a/profile_wizard.h → src/profile_wizard.h b/profile_wizard.h → src/profile_wizard.h
diff --git a/rotator.cpp → src/rotator.cpp b/rotator.cpp → src/rotator.cpp
diff --git a/rotator.h → src/rotator.h b/rotator.h → src/rotator.h
diff --git a/rotator_ascom.cpp → src/rotator_ascom.cpp b/rotator_ascom.cpp → src/rotator_ascom.cpp
diff --git a/rotator_ascom.h → src/rotator_ascom.h b/rotator_ascom.h → src/rotator_ascom.h
diff --git a/rotator_indi.cpp → src/rotator_indi.cpp b/rotator_indi.cpp → src/rotator_indi.cpp
diff --git a/rotator_indi.h → src/rotator_indi.h b/rotator_indi.h → src/rotator_indi.h
diff --git a/rotators.h → src/rotators.h b/rotators.h → src/rotators.h
diff --git a/runinbg.cpp → src/runinbg.cpp b/runinbg.cpp → src/runinbg.cpp
diff --git a/runinbg.h → src/runinbg.h b/runinbg.h → src/runinbg.h
diff --git a/scope.cpp → src/scope.cpp b/scope.cpp → src/scope.cpp
diff --git a/scope.h → src/scope.h b/scope.h → src/scope.h
diff --git a/scope_GC_USBST4.cpp → src/scope_GC_USBST4.cpp b/scope_GC_USBST4.cpp → src/scope_GC_USBST4.cpp
diff --git a/scope_GC_USBST4.h → src/scope_GC_USBST4.h b/scope_GC_USBST4.h → src/scope_GC_USBST4.h
diff --git a/scope_ascom.cpp → src/scope_ascom.cpp b/scope_ascom.cpp → src/scope_ascom.cpp
diff --git a/scope_ascom.h → src/scope_ascom.h b/scope_ascom.h → src/scope_ascom.h
diff --git a/scope_eqmac.cpp → src/scope_eqmac.cpp b/scope_eqmac.cpp → src/scope_eqmac.cpp
diff --git a/scope_eqmac.h → src/scope_eqmac.h b/scope_eqmac.h → src/scope_eqmac.h
diff --git a/scope_equinox.cpp → src/scope_equinox.cpp b/scope_equinox.cpp → src/scope_equinox.cpp
diff --git a/scope_equinox.h → src/scope_equinox.h b/scope_equinox.h → src/scope_equinox.h
diff --git a/scope_gpint.cpp → src/scope_gpint.cpp b/scope_gpint.cpp → src/scope_gpint.cpp
diff --git a/scope_gpint.h → src/scope_gpint.h b/scope_gpint.h → src/scope_gpint.h
diff --git a/scope_gpusb.cpp → src/scope_gpusb.cpp b/scope_gpusb.cpp → src/scope_gpusb.cpp
diff --git a/scope_gpusb.h → src/scope_gpusb.h b/scope_gpusb.h → src/scope_gpusb.h
diff --git a/scope_indi.cpp → src/scope_indi.cpp b/scope_indi.cpp → src/scope_indi.cpp
diff --git a/scope_indi.h → src/scope_indi.h b/scope_indi.h → src/scope_indi.h
diff --git a/scope_manual_pointing.cpp → src/scope_manual_pointing.cpp b/scope_manual_pointing.cpp → src/scope_manual_pointing.cpp
diff --git a/scope_manual_pointing.h → src/scope_manual_pointing.h b/scope_manual_pointing.h → src/scope_manual_pointing.h
diff --git a/scope_onboard_st4.cpp → src/scope_onboard_st4.cpp b/scope_onboard_st4.cpp → src/scope_onboard_st4.cpp
diff --git a/scope_onboard_st4.h → src/scope_onboard_st4.h b/scope_onboard_st4.h → src/scope_onboard_st4.h
diff --git a/scope_oncamera.cpp → src/scope_oncamera.cpp b/scope_oncamera.cpp → src/scope_oncamera.cpp
diff --git a/scope_oncamera.h → src/scope_oncamera.h b/scope_oncamera.h → src/scope_oncamera.h
diff --git a/scope_onstepguider.cpp → src/scope_onstepguider.cpp b/scope_onstepguider.cpp → src/scope_onstepguider.cpp
diff --git a/scope_onstepguider.h → src/scope_onstepguider.h b/scope_onstepguider.h → src/scope_onstepguider.h
diff --git a/scope_voyager.cpp → src/scope_voyager.cpp b/scope_voyager.cpp → src/scope_voyager.cpp
diff --git a/scope_voyager.h → src/scope_voyager.h b/scope_voyager.h → src/scope_voyager.h
diff --git a/scopes.h → src/scopes.h b/scopes.h → src/scopes.h
diff --git a/serialport.cpp → src/serialport.cpp b/serialport.cpp → src/serialport.cpp
diff --git a/serialport.h → src/serialport.h b/serialport.h → src/serialport.h
diff --git a/serialport_loopback.cpp → src/serialport_loopback.cpp b/serialport_loopback.cpp → src/serialport_loopback.cpp
diff --git a/serialport_loopback.h → src/serialport_loopback.h b/serialport_loopback.h → src/serialport_loopback.h
diff --git a/serialport_mac.cpp → src/serialport_mac.cpp b/serialport_mac.cpp → src/serialport_mac.cpp
diff --git a/serialport_mac.h → src/serialport_mac.h b/serialport_mac.h → src/serialport_mac.h
diff --git a/serialport_posix.cpp → src/serialport_posix.cpp b/serialport_posix.cpp → src/serialport_posix.cpp
diff --git a/serialport_posix.h → src/serialport_posix.h b/serialport_posix.h → src/serialport_posix.h
diff --git a/serialport_win32.cpp → src/serialport_win32.cpp b/serialport_win32.cpp → src/serialport_win32.cpp
diff --git a/serialport_win32.h → src/serialport_win32.h b/serialport_win32.h → src/serialport_win32.h
diff --git a/serialports.h → src/serialports.h b/serialports.h → src/serialports.h
diff --git a/sha1.cpp → src/sha1.cpp b/sha1.cpp → src/sha1.cpp
diff --git a/sha1.h → src/sha1.h b/sha1.h → src/sha1.h
diff --git a/socket_server.cpp → src/socket_server.cpp b/socket_server.cpp → src/socket_server.cpp
diff --git a/socket_server.h → src/socket_server.h b/socket_server.h → src/socket_server.h
diff --git a/star.cpp → src/star.cpp b/star.cpp → src/star.cpp
diff --git a/star.h → src/star.h b/star.h → src/star.h
diff --git a/star_profile.cpp → src/star_profile.cpp b/star_profile.cpp → src/star_profile.cpp
diff --git a/star_profile.h → src/star_profile.h b/star_profile.h → src/star_profile.h
diff --git a/starcross_test.cpp → src/starcross_test.cpp b/starcross_test.cpp → src/starcross_test.cpp
diff --git a/starcross_test.h → src/starcross_test.h b/starcross_test.h → src/starcross_test.h
diff --git a/staticpa_tool.h → src/staticpa_tool.h b/staticpa_tool.h → src/staticpa_tool.h
diff --git a/staticpa_toolwin.cpp → src/staticpa_toolwin.cpp b/staticpa_toolwin.cpp → src/staticpa_toolwin.cpp
diff --git a/staticpa_toolwin.h → src/staticpa_toolwin.h b/staticpa_toolwin.h → src/staticpa_toolwin.h
diff --git a/statswindow.cpp → src/statswindow.cpp b/statswindow.cpp → src/statswindow.cpp
diff --git a/statswindow.h → src/statswindow.h b/statswindow.h → src/statswindow.h
diff --git a/stepguider.cpp → src/stepguider.cpp b/stepguider.cpp → src/stepguider.cpp
diff --git a/stepguider.h → src/stepguider.h b/stepguider.h → src/stepguider.h
diff --git a/stepguider_sbigao_indi.cpp → src/stepguider_sbigao_indi.cpp b/stepguider_sbigao_indi.cpp → src/stepguider_sbigao_indi.cpp
diff --git a/stepguider_sbigao_indi.h → src/stepguider_sbigao_indi.h b/stepguider_sbigao_indi.h → src/stepguider_sbigao_indi.h
diff --git a/stepguider_sxao.cpp → src/stepguider_sxao.cpp b/stepguider_sxao.cpp → src/stepguider_sxao.cpp
diff --git a/stepguider_sxao.h → src/stepguider_sxao.h b/stepguider_sxao.h → src/stepguider_sxao.h
diff --git a/stepguider_sxao_indi.cpp → src/stepguider_sxao_indi.cpp b/stepguider_sxao_indi.cpp → src/stepguider_sxao_indi.cpp
diff --git a/stepguider_sxao_indi.h → src/stepguider_sxao_indi.h b/stepguider_sxao_indi.h → src/stepguider_sxao_indi.h
diff --git a/stepguiders.h → src/stepguiders.h b/stepguiders.h → src/stepguiders.h
diff --git a/target.cpp → src/target.cpp b/target.cpp → src/target.cpp
diff --git a/target.h → src/target.h b/target.h → src/target.h
diff --git a/testguide.cpp → src/testguide.cpp b/testguide.cpp → src/testguide.cpp
diff --git a/testguide.h → src/testguide.h b/testguide.h → src/testguide.h
diff --git a/usImage.cpp → src/usImage.cpp b/usImage.cpp → src/usImage.cpp
diff --git a/usImage.h → src/usImage.h b/usImage.h → src/usImage.h
diff --git a/worker_thread.cpp → src/worker_thread.cpp b/worker_thread.cpp → src/worker_thread.cpp
diff --git a/worker_thread.h → src/worker_thread.h b/worker_thread.h → src/worker_thread.h
diff --git a/wxled.cpp → src/wxled.cpp b/wxled.cpp → src/wxled.cpp
diff --git a/wxled.h → src/wxled.h b/wxled.h → src/wxled.h
diff --git a/zfilterfactory.cpp → src/zfilterfactory.cpp b/zfilterfactory.cpp → src/zfilterfactory.cpp
diff --git a/zfilterfactory.h → src/zfilterfactory.h b/zfilterfactory.h → src/zfilterfactory.h
diff --git a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake
@@ -1126,8 +1126,8 @@ if(WIN32)
 elseif(UNIX OR APPLE)
   add_definitions(-DHAVE_SXV_CAMERA=1)
   set(SXV_PLATFORM_SRC
-      ${phd_src_dir}/cameras/SXMacLib.h
-      ${phd_src_dir}/cameras/SXMacLib.c)
+      ${PHD_PROJECT_ROOT_DIR}/cameras/SXMacLib.h
+      ${PHD_PROJECT_ROOT_DIR}/cameras/SXMacLib.c)
 endif()
 
 
@@ -1137,13 +1137,13 @@ endif()
 
 if(APPLE)
   add_definitions(-DHAVE_KWIQGUIDER_CAMERA=1)
-  include_directories(${phd_src_dir}/cam_KWIQGuider/)
+  include_directories(${PHD_PROJECT_ROOT_DIR}/cameras/KWIQGuider/)
   set(KWIQGuider_PLATFORM_SRC
-    ${phd_src_dir}/cam_KWIQGuider/KWIQGuider.cpp
-    ${phd_src_dir}/cam_KWIQGuider/KWIQGuider.h
-    ${phd_src_dir}/cam_KWIQGuider/KWIQGuider_firmware.h
-    ${phd_src_dir}/cam_KWIQGuider/KWIQGuider_loader.cpp
-    ${phd_src_dir}/cam_KWIQGuider/KWIQGuider_priv.h
+    ${PHD_PROJECT_ROOT_DIR}/cameras/KWIQGuider/KWIQGuider.cpp
+    ${PHD_PROJECT_ROOT_DIR}/cameras/KWIQGuider/KWIQGuider.h
+    ${PHD_PROJECT_ROOT_DIR}/cameras/KWIQGuider/KWIQGuider_firmware.h
+    ${PHD_PROJECT_ROOT_DIR}/cameras/KWIQGuider/KWIQGuider_loader.cpp
+    ${PHD_PROJECT_ROOT_DIR}/cameras/KWIQGuider/KWIQGuider_priv.h
   )
 endif()