diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windoze/Installer/MegaGlestInstaller.nsi index bb841f2c6..b734e452a 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.6.0.3 -!define APVER 3.7.0-beta2 +!define APVER_OLD 3.6.0.3 +!define APVER 3.7.0-beta2 Name "${APNAME} ${APVER}" SetCompressor /FINAL /SOLID lzma @@ -225,7 +225,6 @@ Section "${APNAME} (required)" File "..\..\..\data\glest_game\glestkeys.ini" File "..\..\..\data\glest_game\servers.ini" File "..\..\..\data\glest_game\openal32.dll" - File "..\..\..\data\glest_game\xerces-c_3_0.dll" File "..\..\..\data\glest_game\libvlccore.dll" File "..\..\..\data\glest_game\libvlc.dll" @@ -236,12 +235,6 @@ Section "${APNAME} (required)" File "..\..\..\data\glest_game\xml2g.exe" File "..\..\..\data\glest_game\g2xml.exe" File /r /x .svn /x mydata "..\..\..\source\tools\glexemel\*.*" -# File "..\..\..\data\glest_game\xml2g.exe" -# File "..\..\..\data\glest_game\g2xml.exe" -# File "..\..\..\source\tools\glexemel\g3d_support.py" -# File "..\..\..\source\tools\glexemel\g3d_xml_exporter.py" -# File "..\..\..\source\tools\glexemel\g3d.dtd" -# File "..\..\..\source\tools\glexemel\g3d_logo.png" SetOutPath $INSTDIR File /r /x .svn /x mydata "..\..\..\data\glest_game\data" @@ -251,7 +244,6 @@ Section "${APNAME} (required)" File /r /x .svn /x mydata "..\..\..\data\glest_game\techs" 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\docs\" File /r /x .svn /x mydata "..\..\..\docs\*.*" @@ -278,7 +270,6 @@ Section "${APNAME} (required)" CreateDirectory $INSTDIR\techs CreateDirectory $INSTDIR\tilesets CreateDirectory $INSTDIR\tutorials -# CreateDirectory $INSTDIR\screens CreateDirectory $INSTDIR\blender AccessControl::GrantOnFile "$INSTDIR" "(BU)" "FullAccess" @@ -322,7 +313,6 @@ Section "Uninstall" Delete "$INSTDIR\glestkeys.ini" Delete "$INSTDIR\servers.ini" Delete "$INSTDIR\openal32.dll" - Delete "$INSTDIR\xerces-c_3_0.dll" Delete "$INSTDIR\*.log" Delete "$INSTDIR\data\*.*" diff --git a/mk/windoze/make-binary-archive.bat b/mk/windoze/make-binary-archive.bat index 02cdea788..1a783ae1f 100644 --- a/mk/windoze/make-binary-archive.bat +++ b/mk/windoze/make-binary-archive.bat @@ -40,7 +40,7 @@ set custom_sevenZ_params= if not "%SEVENZ_MG_COMPRESS_PARAMS%." == "." set custom_sevenZ_params=%SEVENZ_MG_COMPRESS_PARAMS% echo custom_sevenZ_params [%custom_sevenZ_params%] ... -7z a -mmt -mx=9 %custom_sevenZ_params% -ms=on -mhc=on "%PACKAGE%" megaglest.exe megaglest_g3dviewer.exe megaglest_editor.exe xerces-c_3_0.dll libvlc.dll libvlccore.dll lua plugins 7z.exe 7z.dll xml2g.exe openal32.dll g2xml.exe glest.ini glestkeys.ini servers.ini +7z a -mmt -mx=9 %custom_sevenZ_params% -ms=on -mhc=on "%PACKAGE%" megaglest.exe megaglest_g3dviewer.exe megaglest_editor.exe libvlc.dll libvlccore.dll lua plugins 7z.exe 7z.dll xml2g.exe openal32.dll g2xml.exe glest.ini glestkeys.ini servers.ini dir "%PACKAGE%" cd /d "%~dp0"