From 060e5c764cc66e54f422928e3921fd08dff31f69 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Fri, 3 May 2013 13:32:23 -0700
Subject: [PATCH] Matching build fixes for cross built Windows

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 linux.c                          |   2 ++
 macos.c                          |   3 +++
 packaging/windows/subsurface.res | Bin 18056 -> 0 bytes
 profile.c                        |   2 ++
 windows.c                        |   7 +++++++
 5 files changed, 14 insertions(+)
 delete mode 100644 packaging/windows/subsurface.res

diff --git a/linux.c b/linux.c
index 51d1ce75d..33a846f9b 100644
--- a/linux.c
+++ b/linux.c
@@ -2,7 +2,9 @@
 /* implements Linux specific functions */
 #include "dive.h"
 #include "display.h"
+#if USE_GTK_UI
 #include "display-gtk.h"
+#endif
 #include <gconf/gconf-client.h>
 #include <string.h>
 
diff --git a/macos.c b/macos.c
index d28ea1dae..b43849f87 100644
--- a/macos.c
+++ b/macos.c
@@ -2,7 +2,10 @@
 /* implements Mac OS X specific functions */
 #include <stdlib.h>
 #include "dive.h"
+#include "display.h"
+#if USE_GTK_UI
 #include "display-gtk.h"
+#endif /* USE_GTK_UI */
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreServices/CoreServices.h>
 #include <mach-o/dyld.h>
diff --git a/packaging/windows/subsurface.res b/packaging/windows/subsurface.res
deleted file mode 100644
index 616cf5ea91f052151757396a3e7e37e11f47f931..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18056
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

diff --git a/profile.c b/profile.c
index bd395f127..f30ff1d06 100644
--- a/profile.c
+++ b/profile.c
@@ -6,7 +6,9 @@
 
 #include "dive.h"
 #include "display.h"
+#if USE_GTK_UI
 #include "display-gtk.h"
+#endif
 #include "divelist.h"
 #include "color.h"
 #include "libdivecomputer/parser.h"
diff --git a/windows.c b/windows.c
index 94e3dc546..d6cb531ae 100644
--- a/windows.c
+++ b/windows.c
@@ -1,7 +1,10 @@
 /* windows.c */
 /* implements Windows specific functions */
 #include "dive.h"
+#include "display.h"
+#if USE_GTK_UI
 #include "display-gtk.h"
+#endif
 #include <windows.h>
 #include <shlobj.h>
 
@@ -128,6 +131,7 @@ void subsurface_close_conf(void)
 	RegCloseKey(hkey);
 }
 
+#if USE_GTK_UI
 int subsurface_fill_device_list(GtkListStore *store)
 {
 	const int bufdef = 512;
@@ -194,6 +198,7 @@ int subsurface_fill_device_list(GtkListStore *store)
 	}
 	return index;
 }
+#endif /* USE_GTK_UI */
 
 const char *subsurface_icon_name()
 {
@@ -231,11 +236,13 @@ const char *subsurface_gettext_domainpath(char *argv0)
 	return "./share/locale";
 }
 
+#if USE_GTK_UI
 void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar,
 		GtkWidget *vbox, GtkUIManager *ui_manager)
 {
 	gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
 }
+#endif /* USE_GTK_UI */
 
 /* barely documented API */
 extern int __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *);