64bit compile fixes

[xonotic/netradiant.git] / install.py

diff --git a/install.py b/install.py
index d237e0ffc8b1d62a3ed36e28eb3947551eb33f3e..69fc6253ab24c9f82c431554fe9d41432ec16aef 100644 (file)
--- a/install.py
+++ b/install.py
@@ -1,17 +1,17 @@
 # Copyright (C) 2001-2006 William Joseph.
-# 
+#
 # This file is part of GtkRadiant.
-# 
+#
 # GtkRadiant is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # GtkRadiant is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with GtkRadiant; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -32,19 +32,16 @@ import shutil
 def assertMessage(condition, message):
   if not condition:
     raise Exception(message)
-    
+
 def copyFile(source, target):
   assertMessage(os.path.isfile(source), "failed to find file: " + source)
-  targetFile = target
-  if os.path.isdir(targetFile):
-    targetFile = os.path.join(target, os.path.basename(source))
-  print source, "->", targetFile
-  shutil.copyfile(source, targetFile)
-  
+  print source, "->", target
+  shutil.copy2(source, target)
+
 def copyFileIfExists(source, target):
   if os.path.exists(source):
     copyFile(source, target)
-    
+
 def copySvn(source, target):
   assertMessage(os.path.isdir(source), "failed to find directory: " + source)
   if not os.path.exists(target):
@@ -57,7 +54,7 @@ def copySvn(source, target):
         copySvn(absolute, absTarget)
     else:
       copyFile(absolute, absTarget)
-      
+
 def copyGame(source, game, target):
   assertMessage(os.path.isdir(source), "failed to find directory: " + source)
   assertMessage(os.path.isdir(target), "failed to find directory: " + target)
@@ -68,15 +65,15 @@ def copyGame(source, game, target):
     gamesDir = os.path.join(target, "games")
     if not os.path.exists(gamesDir):
       os.mkdir(gamesDir)
-    copyFile(os.path.join(root, "games", gamename), os.path.join(gamesDir, gamename))  
-  
+    copyFile(os.path.join(root, "games", gamename), os.path.join(gamesDir, gamename))
+
 thisDir = os.path.dirname(__file__)
 gamesRoot = os.path.join(thisDir, "games")
 installRoot = os.path.join(thisDir, "install")
 
 if not os.path.exists(installRoot):
   os.mkdir(installRoot)
-  
+
 # copy generic data
 copySvn(os.path.join(thisDir, os.path.normpath("setup/data/tools")), installRoot)
 
@@ -94,7 +91,9 @@ games = [
   ("Q4Pack/tools", "q4"),
   ("Sof2Pack", "sof2"),
   ("STVEFPack", "stvef"),
-  ("WolfPack/bin", "wolf")
+  ("WolfPack/bin", "wolf"),
+  ("NexuizPack", "nexuiz"),
+  ("DarkPlacesPack", "darkplaces")
 ]
 
 # copy games
@@ -105,16 +104,19 @@ for game in games:
 gtk2Root = os.path.normpath(os.path.join(thisDir, "../gtk2-2.4"))
 if os.path.exists(gtk2Root):
   copySvn(os.path.join(gtk2Root, "install"), installRoot)
-  
-libxml2 = os.path.normpath(os.path.join(thisDir, "../libxml2-2.6/win32/install/libxml2.dll"))
+
+iconv = os.path.normpath(os.path.join(thisDir, "../iconv-1.9/bin/iconv.dll"))
+copyFileIfExists(iconv, installRoot)
+
+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)