summaryrefslogtreecommitdiff
path: root/tools/build_scripts
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2017-11-07 22:52:26 +0300
committerGeorge Hazan <ghazan@miranda.im>2017-11-07 22:52:26 +0300
commitb8a3d458465f4a2fc05cc5ba54d3bd272e78e027 (patch)
tree0407638f2da08f15f0797869f13394d8355cae60 /tools/build_scripts
parentc35c88f0a9bd186805355a9ae6d49d1ad04095dc (diff)
we should use redist folder from git
Diffstat (limited to 'tools/build_scripts')
-rw-r--r--tools/build_scripts/z1_ReBuild_Full.bat6
-rw-r--r--tools/build_scripts/z3_PackArchivesStable.bat1
2 files changed, 3 insertions, 4 deletions
diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat
index ce533ef07b..4c050a3b95 100644
--- a/tools/build_scripts/z1_ReBuild_Full.bat
+++ b/tools/build_scripts/z1_ReBuild_Full.bat
@@ -89,7 +89,7 @@ copy /V /Y ..\plugins\RemovePersonalSettings\docs\RemovePersonalSettings.ini "Re
if /i '%tp%' == '32' (
md "Release32\Plugins\Importtxt"
copy /V /Y ..\plugins\ImportTXT\importtxt\*.ini "Release32\Plugins\Importtxt\"
- copy /V /Y ..\redist\pcre3.dll "Release32\Libs"
+ copy /V /Y %SourceDir%\tools\build_scripts\redist\pcre3.dll "Release32\Libs"
)
rem xcopy /S /V /Y "..\delphi\%tp%" "Release%tp%"
@@ -109,8 +109,8 @@ call :checksum Plugins dll
call :checksum Icons dll
copy /V /Y ..\..\docs\mirandaboot.ini
-copy /V /Y ..\..\redist\x%tp%\DbChecker.bat
-copy /V /Y ..\..\redist\x%tp%\bass\*.dll "Plugins\BASS"
+copy /V /Y %SourceDir%\tools\build_scripts\redist\x%tp%\DbChecker.bat
+copy /V /Y %SourceDir%\tools\build_scripts\redist\x%tp%\bass\*.dll "Plugins\BASS"
popd
exit
diff --git a/tools/build_scripts/z3_PackArchivesStable.bat b/tools/build_scripts/z3_PackArchivesStable.bat
index adce700323..96d1ac7ce6 100644
--- a/tools/build_scripts/z3_PackArchivesStable.bat
+++ b/tools/build_scripts/z3_PackArchivesStable.bat
@@ -47,7 +47,6 @@ Tools\wget.exe -O tmp\MNG_Sounds.7z https://miranda-ng.org/distr/addons/Sounds/M
popd
rem end
-copy /V /Y ..\..\redist\x%tp%\"%comp%"\*.dll %StableInstDir%\InnoNG_%tp%\Files
copy /V /Y Languages\langpack_czech.txt %StableInstDir%\InnoNG_%tp%\Files\Languages
copy /V /Y Languages\langpack_german.txt %StableInstDir%\InnoNG_%tp%\Files\Languages
copy /V /Y Languages\langpack_polish.txt %StableInstDir%\InnoNG_%tp%\Files\Languages