From 6bec2894edb04850553b2758b86f26ba3fc603a6 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 24 Mar 2016 10:27:02 +0100 Subject: [PATCH] Microsoft Visual Studio 2010 C++ run-time libraries added to setup --- MSI/MSM/.gitignore | 4 ++++ MSI/MSM/Microsoft_VC100_CRT_x64.lst | 2 ++ MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg | 24 ++++++++++++++++++++ MSI/MSM/Microsoft_VC100_CRT_x86.lst | 2 ++ MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg | 24 ++++++++++++++++++++ MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst | 2 ++ MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg | 24 ++++++++++++++++++++ MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst | 2 ++ MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg | 24 ++++++++++++++++++++ MSI/include/MSIBuildCfg.mak | Bin 11016 -> 11364 bytes 10 files changed, 108 insertions(+) create mode 100644 MSI/MSM/Microsoft_VC100_CRT_x64.lst create mode 100644 MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg create mode 100644 MSI/MSM/Microsoft_VC100_CRT_x86.lst create mode 100644 MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg create mode 100644 MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst create mode 100644 MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg create mode 100644 MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst create mode 100644 MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg diff --git a/MSI/MSM/.gitignore b/MSI/MSM/.gitignore index 50e1322..5b7d856 100644 --- a/MSI/MSM/.gitignore +++ b/MSI/MSM/.gitignore @@ -1 +1,5 @@ /*.log +/Microsoft_VC100_CRT_x64.msm +/Microsoft_VC100_CRT_x86.msm +/Microsoft_VC100_DebugCRT_x64.msm +/Microsoft_VC100_DebugCRT_x86.msm diff --git a/MSI/MSM/Microsoft_VC100_CRT_x64.lst b/MSI/MSM/Microsoft_VC100_CRT_x64.lst new file mode 100644 index 0000000..b9ea228 --- /dev/null +++ b/MSI/MSM/Microsoft_VC100_CRT_x64.lst @@ -0,0 +1,2 @@ +Win\System64\msvcp100.dll +Win\System64\msvcr100.dll diff --git a/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg b/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg new file mode 100644 index 0000000..efed822 --- /dev/null +++ b/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg @@ -0,0 +1,24 @@ +# +# Copyright 1991-2016 Amebis +# +# This file is part of ZRCola. +# +# ZRCola is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ZRCola is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ZRCola. If not, see . +# + +[splosno] +jezik=0 +deli=featZRCola + +[parametri] diff --git a/MSI/MSM/Microsoft_VC100_CRT_x86.lst b/MSI/MSM/Microsoft_VC100_CRT_x86.lst new file mode 100644 index 0000000..f701abb --- /dev/null +++ b/MSI/MSM/Microsoft_VC100_CRT_x86.lst @@ -0,0 +1,2 @@ +Win\System\msvcp100.dll +Win\System\msvcr100.dll diff --git a/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg b/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg new file mode 100644 index 0000000..efed822 --- /dev/null +++ b/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg @@ -0,0 +1,24 @@ +# +# Copyright 1991-2016 Amebis +# +# This file is part of ZRCola. +# +# ZRCola is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ZRCola is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ZRCola. If not, see . +# + +[splosno] +jezik=0 +deli=featZRCola + +[parametri] diff --git a/MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst b/MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst new file mode 100644 index 0000000..d561666 --- /dev/null +++ b/MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst @@ -0,0 +1,2 @@ +Win\System64\msvcp100d.dll +Win\System64\msvcr100d.dll diff --git a/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg b/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg new file mode 100644 index 0000000..efed822 --- /dev/null +++ b/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg @@ -0,0 +1,24 @@ +# +# Copyright 1991-2016 Amebis +# +# This file is part of ZRCola. +# +# ZRCola is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ZRCola is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ZRCola. If not, see . +# + +[splosno] +jezik=0 +deli=featZRCola + +[parametri] diff --git a/MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst b/MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst new file mode 100644 index 0000000..ad3ed3f --- /dev/null +++ b/MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst @@ -0,0 +1,2 @@ +Win\System\msvcp100d.dll +Win\System\msvcr100d.dll diff --git a/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg b/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg new file mode 100644 index 0000000..efed822 --- /dev/null +++ b/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg @@ -0,0 +1,24 @@ +# +# Copyright 1991-2016 Amebis +# +# This file is part of ZRCola. +# +# ZRCola is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ZRCola is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ZRCola. If not, see . +# + +[splosno] +jezik=0 +deli=featZRCola + +[parametri] diff --git a/MSI/include/MSIBuildCfg.mak b/MSI/include/MSIBuildCfg.mak index aac2aed0a10ccd6aa23645e2746c1ac9de0a3dd4..86b52b3ad622f4380b1b01748db5658d972a993c 100644 GIT binary patch delta 236 zcmeAOdlIoBKz;HDH7R{xhD?TJh9ZW1hGHO2V<=&WX9#0(W-w$h0K#|%7lu@ZB!*Ik zbf8!eL&#)X^`nzlsY{uYs1ImT1%m~H+2-%+oQxogRS6jYvF@$LL6CL2M5%^ZGWol@ O^5k8-D<n=`tTu}P delta 44 rcmaD7(Gj*GKz;HW^-Vy`F?km+&*XC&uYhc)$v#>+FtN>Y+HQ;hyG#+)