From 80c8d08d8bf55b18a2da3ecda83fbe4573eee704 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Tue, 9 Apr 2013 07:01:20 -0700
Subject: Make Qt branch cross-build for Windows

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 packaging/windows/mingw-make.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packaging/windows')

diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh
index 6201d41a4..53599ed20 100755
--- a/packaging/windows/mingw-make.sh
+++ b/packaging/windows/mingw-make.sh
@@ -11,7 +11,7 @@
 rm packaging/windows/subsurface.nsi
 
 export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH
-make CC=i686-w64-mingw32-gcc \
+make CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ \
 	PKGCONFIG=i686-w64-mingw32-pkg-config \
 	PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \
 	CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw/ \
-- 
cgit v1.2.3-70-g09d2


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: 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

(limited to 'packaging/windows')

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 616cf5ea9..000000000
Binary files a/packaging/windows/subsurface.res and /dev/null differ
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 *);
-- 
cgit v1.2.3-70-g09d2