From 288341d926474dba9684ae621f0d10378263a6e9 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Wed, 26 Jan 2011 09:12:43 +0000
Subject: [PATCH] - windows installer now adds country flags for internet lobby

---
 mk/windoze/Installer/MegaGlestInstaller.nsi | 13 ++++++++-----
 mk/windoze/Installer/MegaGlestUpdater.nsi   | 10 +++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windoze/Installer/MegaGlestInstaller.nsi
index 761789eb..56b15e43 100644
--- a/mk/windoze/Installer/MegaGlestInstaller.nsi
+++ b/mk/windoze/Installer/MegaGlestInstaller.nsi
@@ -3,8 +3,8 @@
 
 !define APNAME MegaGlest
 !define APNAME_OLD Mega-Glest
-!define APVER_OLD 3.3.7
-!define APVER 3.3.7.2
+!define APVER_OLD 3.3.7.2
+!define APVER 3.4.0
 
 Name "${APNAME} ${APVER}"
 SetCompressor /FINAL /SOLID lzma
@@ -23,12 +23,12 @@ RequestExecutionLevel none
 
 PageEx license
        LicenseText "Megaglest License"
-       LicenseData "..\..\..\data\glest_game\docs\license.txt"
+       LicenseData "..\..\..\data\glest_game\docs\LICENSE"
 PageExEnd
 
 PageEx license
        LicenseText "Megaglest README"
-       LicenseData "..\..\..\data\glest_game\docs\readme.txt"
+       LicenseData "..\..\..\data\glest_game\docs\README"
 PageExEnd
 
 ;--------------------------------
@@ -170,7 +170,10 @@ Section "${APNAME} (required)"
   File /r /x .svn /x mydata "..\..\..\data\glest_game\tilesets"
   File /r /x .svn /x mydata "..\..\..\data\glest_game\tutorials"
 #  File /r /x .svn "..\..\..\data\glest_game\screens"
-
+  SetOutPath "$INSTDIR\data\core\misc_textures\"
+  File /r /x .svn /x mydata "..\..\..\source\masterserver\flags"
+  SetOutPath $INSTDIR
+  
   ; Write the installation path into the registry
   WriteRegStr HKLM Software\${APNAME} "Install_Dir" "$INSTDIR"
   WriteRegStr HKLM Software\${APNAME} "Version" "${APVER}"
diff --git a/mk/windoze/Installer/MegaGlestUpdater.nsi b/mk/windoze/Installer/MegaGlestUpdater.nsi
index b64d003d..848762c0 100644
--- a/mk/windoze/Installer/MegaGlestUpdater.nsi
+++ b/mk/windoze/Installer/MegaGlestUpdater.nsi
@@ -2,10 +2,10 @@
 ; General Attributes
 
 !define APNAME MegaGlest
-!define APVER 3.3.7.2
+!define APVER 3.4.0
 !define APNAME_OLD Mega-Glest
-!define APVER_OLD 3.3.7
-!define APVER_UPDATE 3.3.7.2
+!define APVER_OLD 3.3.7.2
+!define APVER_UPDATE 3.4.0
 
 Name "${APNAME} ${APVER_UPDATE}"
 SetCompressor /FINAL /SOLID lzma
@@ -25,12 +25,12 @@ RequestExecutionLevel admin
 
 PageEx license
        LicenseText "Megaglest License"
-       LicenseData "..\..\..\data\glest_game\docs\license.txt"
+       LicenseData "..\..\..\data\glest_game\docs\LICENSE"
 PageExEnd
 
 PageEx license
        LicenseText "Megaglest README"
-       LicenseData "..\..\..\data\glest_game\docs\readme.txt"
+       LicenseData "..\..\..\data\glest_game\docs\README"
 PageExEnd
 
 ;--------------------------------