X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=install.py;h=a9e585c680a948cf65ce502e91dfcf6328842afd;hp=505bd943377cbdbb10ea1ace21488ae2fc334b3b;hb=0e5bc042fe9a0b57a528ee444ca815c1a5693c72;hpb=23cc0661e04d41ac4db3f66f873ae1bbe6aebe25

diff --git a/install.py b/install.py
index 505bd943..a9e585c6 100644
--- a/install.py
+++ b/install.py
@@ -22,7 +22,6 @@ Builds the ./install directory.
 Copies files from various locations:
 ./setup/data/tools/
 ./games/<gamepack>/
-../<library>/<library>.dll
 ./include/version.default is used to generate RADIANT_MAJOR and RADIANT_MINOR
 """
 
@@ -93,7 +92,9 @@ games = [
   ("STVEFPack", "stvef"),
   ("WolfPack/bin", "wolf"),
   ("NexuizPack", "nexuiz"),
-  ("DarkPlacesPack", "darkplaces")
+  ("DarkPlacesPack", "darkplaces"),
+  ("WarsowPack/tools", "warsow"),
+  ("TremulousPack/tools", "trem")
 ]
 
 # copy games
@@ -101,24 +102,17 @@ for game in games:
   copyGame(gamesRoot, game, installRoot)
 
 # copy win32 dlls
-gtk2Root = os.path.normpath(os.path.join(thisDir, "../gtk2-2.4"))
+gtk2Root = os.path.normpath(os.path.join(thisDir, "../gtk2-2.10/install"))
 if os.path.exists(gtk2Root):
-  copySvn(os.path.join(gtk2Root, "install"), installRoot)
+  copySvn(gtk2Root, installRoot)
 
-libxml2 = os.path.normpath(os.path.join(thisDir, "../libxml2-2.6/win32/install/libxml2.dll"))
+libxml2 = os.path.normpath(os.path.join(thisDir, "../libxml2-2.6/bin/libxml2.dll"))
 copyFileIfExists(libxml2, installRoot)
 
-libpng = os.path.normpath(os.path.join(thisDir, "../libpng-1.2/lib/libpng13.dll"))
-copyFileIfExists(libpng, installRoot)
-
 libmhash = os.path.normpath(os.path.join(thisDir, "../mhash-0.9/win32/libmhash/Release/libmhash.dll"))
 copyFileIfExists(libmhash, installRoot)
 
-zlib = os.path.normpath(os.path.join(thisDir, "../zlib1-1.2/zlib1.dll"))
-copyFileIfExists(zlib, installRoot)
-
-msvcr71 = os.path.normpath(os.path.join(thisDir, "../msvc_redist/msvcr71.dll"))
-copyFileIfExists(msvcr71, installRoot)
+copySvn("../msvc_redist", installRoot)
 
 dbghelp = os.path.normpath(os.path.join(thisDir, "../msvc_redist/dbghelp.dll"))
 copyFileIfExists(dbghelp, installRoot)