From 0d9d7770860a4aa9c7903681cd0385365160d14f Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 29 Jun 2012 11:15:11 +0900
Subject: [PATCH] Fix Win32 package building for recent changes.

---
 tools/build_scripts/qf-release  |  2 ++
 tools/build_scripts/qf-win32.py | 59 ++++++++-------------------------
 2 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/tools/build_scripts/qf-release b/tools/build_scripts/qf-release
index e21ae2d76..0a6a1e810 100755
--- a/tools/build_scripts/qf-release
+++ b/tools/build_scripts/qf-release
@@ -120,6 +120,8 @@ if test $do_win32 -eq 1; then
 		pkgdatadir=${qf_win32_dir}/QF \
 		man1dir=${qf_win32_dir} \
 		install
+	mkdir -p ${qf_win32_dir}/pkgconfig
+	mv ${qf_win32_dir}/QF/*.pc ${qf_win32_dir}/pkgconfig
 	$MINGW/bin/strip --strip-unneeded "$qf_win32"/bin/*.exe
 	../tools/build_scripts/qf-win32.py "$ver-win32" quakeforge "$qf_win32"
 	mv *.zip $RELEASE
diff --git a/tools/build_scripts/qf-win32.py b/tools/build_scripts/qf-win32.py
index 4a4d57b08..21977b20e 100755
--- a/tools/build_scripts/qf-win32.py
+++ b/tools/build_scripts/qf-win32.py
@@ -26,35 +26,15 @@ server = [
 	dir + "bin/qtv.exe",
 ]
 
-client_wgl = [
-	dir,
-	dir + "bin",
-	dir + "bin/nq-wgl.exe",
-	dir + "bin/qw-client-wgl.exe",
-	dir + "QF",
-	dir + "QF/menu.dat.gz",
-	dir + "QF/menu.plist",
-]
-
-client_sgl = [
-	dir,
-	dir + "bin",
-	dir + "bin/nq-sgl.exe",
-	dir + "bin/qw-client-sgl.exe",
-	dir + "QF",
-	dir + "QF/menu.dat.gz",
-	dir + "QF/menu.plist",
-]
-
-client_sglsl = [
-	dir,
-	dir + "bin",
-	dir + "bin/nq-sglsl.exe",
-	dir + "bin/qw-client-sglsl.exe",
-	dir + "QF",
-	dir + "QF/menu.dat.gz",
-	dir + "QF/menu.plist",
-]
+#client_wgl = [
+#	dir,
+#	dir + "bin",
+#	dir + "bin/nq-wgl.exe",
+#	dir + "bin/qw-client-wgl.exe",
+#	dir + "QF",
+#	dir + "QF/menu.dat.gz",
+#	dir + "QF/menu.plist",
+#]
 
 client_sdl = [
 	dir,
@@ -66,16 +46,6 @@ client_sdl = [
 	dir + "QF/menu.plist",
 ]
 
-client_sdl32 = [
-	dir,
-	dir + "bin",
-	dir + "bin/nq-sdl32.exe",
-	dir + "bin/qw-client-sdl32.exe",
-	dir + "QF",
-	dir + "QF/menu.dat.gz",
-	dir + "QF/menu.plist",
-]
-
 tools = [
 	dir,
 	dir + "bin",
@@ -97,15 +67,15 @@ qfcc = [
 	dir + "bin/qfprogs.exe",
 	dir + "bin/qfpreqcc",
 	dir + "qfcc.1",
-	dir + "qfcc.pc",
+	dir + "pkgconfig/qfcc.pc",
 ]
 qfcc_r = [
-	dir + "lib/qfcc",
+	dir + "share/qfcc",
 ]
 
 devel = [
 	dir,
-	dir + "quakeforge.pc",
+	dir + "pkgconfig/quakeforge.pc",
 ]
 
 devel_r = [
@@ -115,11 +85,8 @@ devel_r = [
 
 packages = [
 	(prefix + "-" + "server", server),
-	(prefix + "-" + "client-wgl", client_wgl),
-	(prefix + "-" + "client-sgl", client_sgl),
-	(prefix + "-" + "client-sglsl", client_sglsl),
+	#(prefix + "-" + "client-wgl", client_wgl),
 	(prefix + "-" + "client-sdl", client_sdl),
-	(prefix + "-" + "client-sdl32", client_sdl32),
 	(prefix + "-" + "tools", tools),
 	(prefix + "-" + "devel", devel),
 	(prefix + "-" + "devel", devel_r, "-r"),