Fix Win32 package building for recent changes.

This commit is contained in:
Bill Currie 2012-06-29 11:15:11 +09:00
parent 3406cad99a
commit 0d9d777086
2 changed files with 15 additions and 46 deletions

View file

@ -120,6 +120,8 @@ if test $do_win32 -eq 1; then
pkgdatadir=${qf_win32_dir}/QF \ pkgdatadir=${qf_win32_dir}/QF \
man1dir=${qf_win32_dir} \ man1dir=${qf_win32_dir} \
install 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 $MINGW/bin/strip --strip-unneeded "$qf_win32"/bin/*.exe
../tools/build_scripts/qf-win32.py "$ver-win32" quakeforge "$qf_win32" ../tools/build_scripts/qf-win32.py "$ver-win32" quakeforge "$qf_win32"
mv *.zip $RELEASE mv *.zip $RELEASE

View file

@ -26,35 +26,15 @@ server = [
dir + "bin/qtv.exe", dir + "bin/qtv.exe",
] ]
client_wgl = [ #client_wgl = [
dir, # dir,
dir + "bin", # dir + "bin",
dir + "bin/nq-wgl.exe", # dir + "bin/nq-wgl.exe",
dir + "bin/qw-client-wgl.exe", # dir + "bin/qw-client-wgl.exe",
dir + "QF", # dir + "QF",
dir + "QF/menu.dat.gz", # dir + "QF/menu.dat.gz",
dir + "QF/menu.plist", # 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_sdl = [ client_sdl = [
dir, dir,
@ -66,16 +46,6 @@ client_sdl = [
dir + "QF/menu.plist", 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 = [ tools = [
dir, dir,
dir + "bin", dir + "bin",
@ -97,15 +67,15 @@ qfcc = [
dir + "bin/qfprogs.exe", dir + "bin/qfprogs.exe",
dir + "bin/qfpreqcc", dir + "bin/qfpreqcc",
dir + "qfcc.1", dir + "qfcc.1",
dir + "qfcc.pc", dir + "pkgconfig/qfcc.pc",
] ]
qfcc_r = [ qfcc_r = [
dir + "lib/qfcc", dir + "share/qfcc",
] ]
devel = [ devel = [
dir, dir,
dir + "quakeforge.pc", dir + "pkgconfig/quakeforge.pc",
] ]
devel_r = [ devel_r = [
@ -115,11 +85,8 @@ devel_r = [
packages = [ packages = [
(prefix + "-" + "server", server), (prefix + "-" + "server", server),
(prefix + "-" + "client-wgl", client_wgl), #(prefix + "-" + "client-wgl", client_wgl),
(prefix + "-" + "client-sgl", client_sgl),
(prefix + "-" + "client-sglsl", client_sglsl),
(prefix + "-" + "client-sdl", client_sdl), (prefix + "-" + "client-sdl", client_sdl),
(prefix + "-" + "client-sdl32", client_sdl32),
(prefix + "-" + "tools", tools), (prefix + "-" + "tools", tools),
(prefix + "-" + "devel", devel), (prefix + "-" + "devel", devel),
(prefix + "-" + "devel", devel_r, "-r"), (prefix + "-" + "devel", devel_r, "-r"),