From b0df7ed3731093ccb643252cf6a674263806f82c Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sun, 28 Oct 2012 05:42:03 +0000 Subject: [PATCH] - fixed custom flag handling for 7z in windows --- mk/windoze/make-binary-archive.bat | 6 +++++- mk/windoze/make-data-archive.bat | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mk/windoze/make-binary-archive.bat b/mk/windoze/make-binary-archive.bat index 1c0f43ad..02cdea78 100644 --- a/mk/windoze/make-binary-archive.bat +++ b/mk/windoze/make-binary-archive.bat @@ -36,7 +36,11 @@ cd /d ..\..\data\glest_game\ echo creating [%PACKAGE%] ... if exist "%PACKAGE%" del "%PACKAGE%" -7z a -mmt -mx=9 %7Z_MG_COMPRESS_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 +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 dir "%PACKAGE%" cd /d "%~dp0" diff --git a/mk/windoze/make-data-archive.bat b/mk/windoze/make-data-archive.bat index 73fc4a78..23ca251b 100644 --- a/mk/windoze/make-data-archive.bat +++ b/mk/windoze/make-data-archive.bat @@ -74,7 +74,11 @@ if exist release-data%PACKAGE% del release-data%PACKAGE% cd /d %RELEASEDIR% rem echo Current directory[%CD%] -..\..\..\..\data\glest_game\7z.exe a -mmt -mx=9 %7Z_MG_COMPRESS_PARAMS% -ms=on -mhc=on ..\%PACKAGE% * +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%] ... + +..\..\..\..\data\glest_game\7z.exe a -mmt -mx=9 %custom_sevenZ_params% -ms=on -mhc=on ..\%PACKAGE% * dir "..\%PACKAGE%" cd /d "%~dp0"