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 aac2aed..86b52b3 100644 Binary files a/MSI/include/MSIBuildCfg.mak and b/MSI/include/MSIBuildCfg.mak differ diff --git a/output/.gitignore b/output/.gitignore index a00082c..1fd1baa 100644 --- a/output/.gitignore +++ b/output/.gitignore @@ -12,3 +12,4 @@ /ZRCola*.msi /ZRCola*.out /ZRCola*.rpt +/Win