From ac7230683b9cef8b6f6e5428386f629e109d3949 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Thu, 16 Feb 2012 21:50:51 +0000
Subject: [PATCH] Win32 updates

---
 win/Makefile       | 17 +++++++++--------
 win/aweather.nsi   |  8 ++++----
 win/setup-mingw.sh |  7 ++++---
 win/xdg-open.c     | 11 +++++++++--
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/win/Makefile b/win/Makefile
index 96982ac..947b1b5 100644
--- a/win/Makefile
+++ b/win/Makefile
@@ -11,7 +11,7 @@ all: $(INSTALLERS)
 
 clean:
 	@echo clean-win
-	rm -f $(INSTALLERS)
+	rm -rf $(INSTALLERS) $(DESTDIR)
 
 $(DESTDIR):
 	make -C $(WIN_AWEATHER) install
@@ -19,23 +19,23 @@ $(DESTDIR):
 	make -C $(WIN_RSL)      install
 	find $(DESTDIR) -name '*.a'  -delete
 	find $(DESTDIR) -name '*.la' -delete
-	rm -rf $(DESTDIR)/share/rsl/colors
+	rm -rf $(DESTDIR)/share/rsl1/colors
 	rm -rf $(DESTDIR)/include
 	touch $@
 
 $(INSTALLERS): $(DESTDIR)
-	cd $(WIN_AWEATHER); \
-	makensis -DVERSION=$(VER_AWEATHER) aweather.nsi; \
-	makensis -DVERSION=$(VER_AWEATHER) -DUSE_GTK aweather.nsi
+	makensis -DROOT=$(WIN_AWEATHER) -DVERSION=$(VER_AWEATHER) aweather.nsi; \
+	makensis -DROOT=$(WIN_AWEATHER) -DVERSION=$(VER_AWEATHER) -DUSE_GTK aweather.nsi
 	cp $(WIN_AWEATHER)/aweather-$(VERSION)*.exe $(FILES)
 
 aweather-gen:
 	cd $(WIN_AWEATHER); \
-	PKG_CONFIG_PATH="$(WIN_GRITS)" \
-	LIBS="-L$(WIN_GRITS)" \
-	CPPFLAGS="-I$(WIN_GRITS)" \
+	PKG_CONFIG_PATH="$(WIN_GRITS)/src" \
+	CPPFLAGS="-I$(WIN_GRITS)/include/grits" \
+	LIBS="-L$(WIN_GRITS)/src/.libs" \
 	CFLAGS="-g -Werror -Wno-unused -O3" \
 	./autogen.sh \
+		--enable-relative \
 		--enable-shared \
 		--disable-static \
 		--host=i686-pc-mingw32
@@ -43,6 +43,7 @@ aweather-gen:
 grits-gen:
 	cd $(WIN_GRITS); \
 	./autogen.sh \
+		--enable-relative \
 		--enable-shared \
 		--disable-static \
 		--host=i686-pc-mingw32 \
diff --git a/win/aweather.nsi b/win/aweather.nsi
index e7bf623..e316b51 100644
--- a/win/aweather.nsi
+++ b/win/aweather.nsi
@@ -19,9 +19,9 @@ Name "AWeather"
 	!define VERSION LATEST
 !endif
 !ifdef USE_GTK
-	OutFile "aweather-${VERSION}-gtk.exe"
+	OutFile "${ROOT}/aweather-${VERSION}-gtk.exe"
 !else
-	OutFile "aweather-${VERSION}.exe"
+	OutFile "${ROOT}/aweather-${VERSION}.exe"
 !endif
 InstallDir AWeather
 Icon "${ROOT}/data/icons/48x48/aweather.ico"
@@ -43,9 +43,9 @@ Section "AWeather (required)" SecAWeather
 	SectionIn RO
 
 	SetOutPath $INSTDIR
-	File /r build/*
+	File /r ${ROOT}/build/*
 	!ifdef USE_GTK
-		file /r gtk/*
+		file /r ${ROOT}/gtk/*
 	!endif
 	
 	StrCmp $MultiUser.InstallMode "AllUsers" 0 +4
diff --git a/win/setup-mingw.sh b/win/setup-mingw.sh
index eae6515..be1f2e8 100755
--- a/win/setup-mingw.sh
+++ b/win/setup-mingw.sh
@@ -37,6 +37,7 @@ extract -bx  /scratch/aweather/local/extern/libsoup_2.26.3-1_win32.zip
 extract -dx  /scratch/aweather/local/extern/libsoup-dev_2.26.3-1_win32.zip
 extract -bx  /scratch/aweather/local/extern/bzip2-1.0.5-bin.zip
 extract -dx  /scratch/aweather/local/extern/bzip2-1.0.5-lib.zip
+#extract -dx  /scratch/aweather/local/extern/freeglut-MinGW-2.8.0-1.mp.zip
 
 # Cleanup install folders
 rm  -f $DEV/lib/*.la
@@ -59,9 +60,9 @@ find "$BIN" -type d -delete 2>/dev/null
 cp /usr/lib/pkgconfig/libxml-2.0.pc $DEV/lib/pkgconfig
 rename libxml2.dll libxml2-2.dll {$DEV,$BIN}/bin/*
 
-i686-pc-mingw32-gcc -Wall -mwindows -o $BIN/bin/xdg-open.exe mingw/xdg-open.c
-cp mingw/gtkrc $BIN/etc/gtk-2.0/gtkrc
-cp mingw/pango.aliases $BIN/etc/pango/pango.aliases
+i686-pc-mingw32-gcc -Wall -mwindows -o $BIN/bin/xdg-open.exe xdg-open.c
+cp gtkrc $BIN/etc/gtk-2.0/gtkrc
+cp pango.aliases $BIN/etc/pango/pango.aliases
 
 # Fix pkg-config
 sed -i 's!^prefix=.*!prefix=/usr/i686-pc-mingw32!' \
diff --git a/win/xdg-open.c b/win/xdg-open.c
index 33c171e..12bf669 100644
--- a/win/xdg-open.c
+++ b/win/xdg-open.c
@@ -2,7 +2,14 @@
 #include <shellapi.h>
 int main(int argc, char* argv[])
 {
-	if (argc > 1)
-		ShellExecute(NULL, "open", argv[1], "", NULL, SW_SHOWNORMAL);
+	if (argc > 1) {
+		SHELLEXECUTEINFO info = {
+			.cbSize = sizeof(info),
+			.lpVerb = "open",
+			.lpFile = argv[1],
+			.nShow  = SW_SHOWNORMAL,
+		};
+		ShellExecuteEx(&info);
+	}
 	return 0;
 }
-- 
2.43.2