Remove dependencies to gob2

[andy/viking.git] / src / globals.h

diff --git a/src/globals.h b/src/globals.h
index ab932c3653e73de587eda8f096b562b6e11a6fd5..6090d0c104a68ab9fa6953b165a28b475e1b1125 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -22,20 +22,13 @@
 #ifndef __VIKING_GLOBALS_H
 #define __VIKING_GLOBALS_H
 
+#include <glib.h>
+
 #define PROJECT "Viking"
-#define VIKING_VERSION "0.1.0"
-#define VIKING_VERSION_NAME "Nuovo Giorno"
+#define VIKING_VERSION PACKAGE_VERSION
+#define VIKING_VERSION_NAME "This Name For Rent"
 #define VIKING_URL "http://viking.sf.net/"
 
-#ifdef WINDOWS
-#define access(a,b) _access(a,b)
-#define VIKING_FILE_SEP '\\'
-#else
-#include <unistd.h>
-#define VIKING_FILE_SEP '/'
-#define UNIX_WEB_BROWSER "galeon"
-#endif
-
 #define ALTI_TO_MPP 1.4017295
 #define MPP_TO_ALTI 0.7134044
 
@@ -51,4 +44,21 @@
 #define MERCLAT(x) (RAD2DEG * log(tan((0.25 * M_PI) + (0.5 * DEG2RAD * (x)))))
 #define DEMERCLAT(x) (RAD2DEG * atan(sinh(DEG2RAD * (x))))
 
+/* Some command line options */
+extern gboolean vik_debug;
+extern gboolean vik_verbose;
+extern gboolean vik_version;
+
+/* Glbal preferences */
+void a_vik_preferences_init ();
+
+/* Coord display preferences */
+typedef enum {
+  VIK_DEGREE_FORMAT_DDD,
+  VIK_DEGREE_FORMAT_DMM,
+  VIK_DEGREE_FORMAT_DMS,
+} vik_degree_format_t;
+
+vik_degree_format_t a_vik_get_degree_format ( );
+
 #endif