Changeset 17756

Timestamp:

05/02/14 12:04:46 (11 years ago)

Author:

tbretz

Message:

Got the libnova stuff from libnova-dir

Location:

trunk/Mars

Files:

• MLinkDef.h (modified) (2 diffs)
• Makefile (modified) (2 diffs)

trunk/Mars/MLinkDef.h

@@ -4 +4 @@
 #pragma link off all classes;
 #pragma link off all functions;
+
+// ==========================================================
 
 // I/O
@@ -23 +25 @@
 #pragma link C++ class Interpolator2D+;
 
+// ======================== libnova =========================
+
+#pragma link C++ global LN_SOLAR_STANDART_HORIZON;
+
+#pragma link C++ struct ln_lnlat_posn;
+#pragma link C++ struct ln_hrz_posn;
+#pragma link C++ struct ln_equ_posn;
+
+// angular_separation
+#pragma link C++ function ln_get_angular_separation;
+
+// transform
+#pragma link C++ function ln_get_hrz_from_equ;
+
+// rise_set
+#pragma link C++ struct ln_rst_time;
+
+// solar
+#pragma link C++ function ln_get_solar_rst;
+#pragma link C++ function ln_get_solar_rst_horizon;
+#pragma link C++ function ln_get_solar_equ_coords;
+
+// lunar
+#pragma link C++ function ln_get_lunar_equ_coords;
+#pragma link C++ function ln_get_lunar_equ_coords_prec;
+#pragma link C++ function ln_get_lunar_disk;
+#pragma link C++ function ln_get_lunar_sdiam;
+#pragma link C++ function ln_get_lunar_phase;
+#pragma link C++ function ln_get_lunar_rst;
+#pragma link C++ function ln_get_lunar_earth_dist;
+
+// Nova wrapper
+#pragma link C++ namespace Nova;
+#pragma link C++ struct Nova::ZdAzPosn;
+#pragma link C++ struct Nova::HrzPosn;
+#pragma link C++ struct Nova::RaDecPosn;
+#pragma link C++ struct Nova::EquPosn;
+
 #endif

trunk/Mars/Makefile

@@ -83 +83 @@
 
 ifeq ($(shell basename "$(LIBNOVA_PATH)X"), libnovaconfigX)
-SUBDIRS += libnova
+#SUBDIRS += libnova
 LIBNOVA = -lnova
 endif
@@ -103 +103 @@
            mcore/DrsCalib.h \
            mcore/PixelMap.h \
-           mcore/Interpolator2D.h
+           mcore/Interpolator2D.h \
+           mcore/nova.h
 
 ############################################################