Merge pull request #3647 from Mailaender/ip2geo

Show locations of client and servers using a local GeoIP database

packaging/package-all.sh

@@ -34,7 +34,7 @@ FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' \
 'cg' 'glsl' 'mods/ra' 'mods/cnc' 'mods/d2k' \
 'AUTHORS' 'COPYING' 'HACKING' 'INSTALL' 'CHANGELOG' \
 'README.html' 'CONTRIBUTING.html' 'DOCUMENTATION.html' \
-'global mix database.dat')
+'global mix database.dat' 'GeoIP.dll' 'GeoIP.dat')
 
 echo "Copying files..."
 for i in "${FILES[@]}"; do

packaging/windows/OpenRA.nsi

@@ -94,6 +94,8 @@ Section "Client" Client
 	File "${SRCDIR}\Tao.*.dll"
 	File "${SRCDIR}\SharpFont.dll"
 	File "${SRCDIR}\global mix database.dat"
+	File "${SRCDIR}\GeoIP.dll
+	File "${SRCDIR}\GeoIP.dat"
 
 	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 		CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
@@ -281,6 +283,8 @@ Function ${UN}Clean
 	Delete $INSTDIR\cgGL.dll
 	Delete $INSTDIR\zlib1.dll
 	Delete "$INSTDIR\global mix database.dat"
+	Delete $INSTDIR\GeoIP.dat
+	Delete $INSTDIR\GeoIP.dll
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenRA"
 	Delete $INSTDIR\uninstaller.exe
 	RMDir $INSTDIR