Set version to 2.5.2

Signed-off-by: Simon Rozman <simon@rozman.si>

.gitignore

@@ -1,6 +1,3 @@
-/*.opensdf
-/*.sdf
-/*.suo
-/ipch
+/.vs
 *.user
 temp

LOCALIZATION.md

@@ -1,17 +1,18 @@
-# Localization of ZRCola
+# Localization of ZRCola
 
 In order to get ZRCola experience in your language the following resources should be translated:
 
-1. [ZRCola](https://poeditor.com/join/project/NTidhEPdDM)
-2. [ZRCola-zrcdb](https://poeditor.com/join/project/QBuYsTwk0d)
-3. [libZRColaUI](https://poeditor.com/join/project/vrnIvk5IOM)
-4. [Updater](https://poeditor.com/join/project/oDK4ktH3ZV)
-5. [wxExtend](https://poeditor.com/join/project/YmsdlC3CBv)
+1. [ZRCola Application](https://www.transifex.com/amebis/zrcola/app/)
+2. [ZRCola Database](https://www.transifex.com/amebis/zrcola/database/)
+3. [ZRCola Core](https://www.transifex.com/amebis/zrcola/core/)
+4. [Updater](https://www.transifex.com/amebis/updater/updater/) and [Updater UpdCheck](https://www.transifex.com/amebis/updater/updcheck/)
+5. [wxExtend](https://www.transifex.com/amebis/wxextend/wxextend/)
 6. Setup
-   - [MSIBuildUI](https://poeditor.com/join/project/ikxWBlq1o5)
-   - [MSIBuildCore](https://poeditor.com/join/project/RSCSsz9fXi)
-   - [MSICALib](https://poeditor.com/join/project/cKP0wwBrHU)
-   - [MSICA](https://poeditor.com/join/project/gCNPagUQvn)
+   - [ZRCola Setup](https://www.transifex.com/amebis/zrcola/setup/)
+   - [MSIBuild UI](https://www.transifex.com/amebis/msibuild/ui/)
+   - [MSIBuild Core](https://www.transifex.com/amebis/msibuild/core/)
+   - [MSICALib](https://www.transifex.com/amebis/msicalib/msicalib/)
+   - [MSICA](https://www.transifex.com/amebis/msica/msica/)
 
 ## General Guidelines
 

MSI/MSM/.gitignore

@@ -1,5 +0,0 @@
-/*.log
-/Microsoft_VC100_CRT_x64.msm
-/Microsoft_VC100_CRT_x86.msm
-/Microsoft_VC100_DebugCRT_x64.msm
-/Microsoft_VC100_DebugCRT_x86.msm

MSI/MSM/Microsoft_VC100_CRT_x64.lst

@@ -1,2 +0,0 @@
-Win\System64\msvcp100.dll
-Win\System64\msvcr100.dll

MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/Microsoft_VC100_CRT_x86.lst

@@ -1,2 +0,0 @@
-Win\System\msvcp100.dll
-Win\System\msvcr100.dll

MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst

@@ -1,2 +0,0 @@
-Win\System64\msvcp100d.dll
-Win\System64\msvcr100d.dll

MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst

@@ -1,2 +0,0 @@
-Win\System\msvcp100d.dll
-Win\System\msvcr100d.dll

MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxbase30u_net_vc100.lst

@@ -1 +0,0 @@
-System Folder\wxbase30u_net_vc100.dll

MSI/MSM/wxMSW_wxbase30u_net_vc100.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.lst

@@ -1 +0,0 @@
-System (64-bit) Folder\wxbase30u_net_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxbase30u_vc100.lst

@@ -1 +0,0 @@
-System Folder\wxbase30u_vc100.dll

MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxbase30u_vc100_x64.lst

@@ -1 +0,0 @@
-System (64-bit) Folder\wxbase30u_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxbase30u_xml_vc100.lst

@@ -1 +0,0 @@
-System Folder\wxbase30u_xml_vc100.dll

MSI/MSM/wxMSW_wxbase30u_xml_vc100.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.lst

@@ -1 +0,0 @@
-System (64-bit) Folder\wxbase30u_xml_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxbase30ud_net_vc100.lst

@@ -1 +0,0 @@
-System Folder\wxbase30ud_net_vc100.dll

MSI/MSM/wxMSW_wxbase30ud_net_vc100.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.lst

@@ -1 +0,0 @@
-System (64-bit) Folder\wxbase30ud_net_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxbase30ud_vc100.lst

@@ -1 +0,0 @@
-System Folder\wxbase30ud_vc100.dll

MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxbase30ud_vc100_x64.lst

@@ -1 +0,0 @@
-System (64-bit) Folder\wxbase30ud_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxbase30ud_xml_vc100.lst

@@ -1 +0,0 @@
-System Folder\wxbase30ud_xml_vc100.dll

MSI/MSM/wxMSW_wxbase30ud_xml_vc100.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.lst

@@ -1 +0,0 @@
-System (64-bit) Folder\wxbase30ud_xml_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxmsw30u_adv_vc100.lst

@@ -1 +0,0 @@
-System Folder\wxmsw30u_adv_vc100.dll

MSI/MSM/wxMSW_wxmsw30u_adv_vc100.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola
-
-[parametri]

MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.lst

@@ -1 +0,0 @@
-System (64-bit) Folder\wxmsw30u_adv_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola
-
-[parametri]

MSI/MSM/wxMSW_wxmsw30u_aui_vc100.lst

@@ -1 +0,0 @@
-System Folder\wxmsw30u_aui_vc100.dll

MSI/MSM/wxMSW_wxmsw30u_aui_vc100.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.lst

@@ -1 +0,0 @@
-System (64-bit) Folder\wxmsw30u_aui_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxmsw30u_core_vc100.lst

@@ -1 +0,0 @@
-System Folder\wxmsw30u_core_vc100.dll

MSI/MSM/wxMSW_wxmsw30u_core_vc100.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.lst

@@ -1 +0,0 @@
-System (64-bit) Folder\wxmsw30u_core_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.lst

@@ -1 +0,0 @@
-System Folder\wxmsw30ud_adv_vc100.dll

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola
-
-[parametri]

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.lst

@@ -1 +0,0 @@
-System (64-bit) Folder\wxmsw30ud_adv_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola
-
-[parametri]

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.lst

@@ -1 +0,0 @@
-System Folder\wxmsw30ud_aui_vc100.dll

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.lst

@@ -1 +0,0 @@
-System (64-bit) Folder\wxmsw30ud_aui_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxmsw30ud_core_vc100.lst

@@ -1 +0,0 @@
-System Folder\wxmsw30ud_core_vc100.dll

MSI/MSM/wxMSW_wxmsw30ud_core_vc100.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.lst

@@ -1 +0,0 @@
-System (64-bit) Folder\wxmsw30ud_core_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.msmcfg

@@ -1,24 +0,0 @@
-#
-#    Copyright 1991-2017 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 <http://www.gnu.org/licenses/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]

MSI/ZRCola/Makefile

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2017 Amebis
+#    Copyright © 1991-2021 Amebis
 #
 #    This file is part of ZRCola.
 #

Makefile

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2017 Amebis
+#    Copyright © 1991-2021 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -18,61 +18,38 @@
 #
 
 OUTPUT_DIR=output
-PUBLISH_DIR=\\amebis.doma\Splet\WWW\Apache\www.amebis.si-prenos\ZRCola
+PUBLISH_DIR=\\amebis.doma\Splet\WWW\IIS-ext\prenos.amebis.si\ZRCola
 
 !IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
 PLAT=x64
 REG_FLAGS=/f /reg:64
 REG_FLAGS32=/f /reg:32
+PROGRAM_FILES_32=C:\Program Files (x86)
+!ELSEIF "$(PROCESSOR_ARCHITECTURE)" == "ARM64"
+PLAT=ARM64
+REG_FLAGS=/f /reg:64
+REG_FLAGS32=/f /reg:32
+PROGRAM_FILES_32=C:\Program Files (x86)
 !ELSE
 PLAT=Win32
 REG_FLAGS=/f
+PROGRAM_FILES_32=C:\Program Files
 !ENDIF
+MSBUILDFLAGS=/v:m /m
 
 
 All ::
 
-Clean ::
-	cd "MSI\MSIBuild\Version"
+Clean :: \
+	CleanSetup
+
+CleanSetup ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean
+	cd "$(MAKEDIR)\MSI\MSIBuild\Version"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean
 	cd "$(MAKEDIR)"
-	devenv.com "ZRCola.sln"          /clean "Release|Win32"
-	devenv.com "ZRCola.sln"          /clean "Debug|Win32"
-	devenv.com "ZRCola.sln"          /clean "Release|x64"
-	devenv.com "ZRCola.sln"          /clean "Debug|x64"
-	devenv.com "ZRColaUtils.sln"     /clean "Release|Win32"
-	devenv.com "ZRColaUtils.sln"     /clean "Debug|Win32"
-	devenv.com "MSI\MSICA\MSICA.sln" /clean "Release|Win32"
-	devenv.com "MSI\MSICA\MSICA.sln" /clean "Debug|Win32"
-	devenv.com "MSI\MSICA\MSICA.sln" /clean "Release|x64"
-	devenv.com "MSI\MSICA\MSICA.sln" /clean "Debug|x64"
-	devenv.com "Updater\Updater.sln" /clean "Release|Win32"
-	devenv.com "Updater\Updater.sln" /clean "Debug|Win32"
-	devenv.com "Updater\Updater.sln" /clean "Release|x64"
-	devenv.com "Updater\Updater.sln" /clean "Debug|x64"
-	-if exist "$(OUTPUT_DIR)\locale\de_DE\wxstd.mo"        del /f /q "$(OUTPUT_DIR)\locale\de_DE\wxstd.mo"
-	-if exist "$(OUTPUT_DIR)\locale\ru_RU\wxstd.mo"        del /f /q "$(OUTPUT_DIR)\locale\ru_RU\wxstd.mo"
-	-if exist "$(OUTPUT_DIR)\locale\sl_SI\wxstd.mo"        del /f /q "$(OUTPUT_DIR)\locale\sl_SI\wxstd.mo"
-	-if exist "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo"
-	-if exist "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo"
-	-if exist "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo"
-	-if exist "$(OUTPUT_DIR)\ZRCola32.ddf"                 del /f /q "$(OUTPUT_DIR)\ZRCola32.ddf"
-	-if exist "$(OUTPUT_DIR)\ZRCola32D.ddf"                del /f /q "$(OUTPUT_DIR)\ZRCola32D.ddf"
-	-if exist "$(OUTPUT_DIR)\ZRCola64.ddf"                 del /f /q "$(OUTPUT_DIR)\ZRCola64.ddf"
-	-if exist "$(OUTPUT_DIR)\ZRCola64D.ddf"                del /f /q "$(OUTPUT_DIR)\ZRCola64D.ddf"
-	-if exist "$(OUTPUT_DIR)\ZRCola32.cab"                 del /f /q "$(OUTPUT_DIR)\ZRCola32.cab"
-	-if exist "$(OUTPUT_DIR)\ZRCola32.inf"                 del /f /q "$(OUTPUT_DIR)\ZRCola32.inf"
-	-if exist "$(OUTPUT_DIR)\ZRCola32.rpt"                 del /f /q "$(OUTPUT_DIR)\ZRCola32.rpt"
-	-if exist "$(OUTPUT_DIR)\ZRCola32D.cab"                del /f /q "$(OUTPUT_DIR)\ZRCola32D.cab"
-	-if exist "$(OUTPUT_DIR)\ZRCola32D.inf"                del /f /q "$(OUTPUT_DIR)\ZRCola32D.inf"
-	-if exist "$(OUTPUT_DIR)\ZRCola32D.rpt"                del /f /q "$(OUTPUT_DIR)\ZRCola32D.rpt"
-	-if exist "$(OUTPUT_DIR)\ZRCola64.cab"                 del /f /q "$(OUTPUT_DIR)\ZRCola64.cab"
-	-if exist "$(OUTPUT_DIR)\ZRCola64.inf"                 del /f /q "$(OUTPUT_DIR)\ZRCola64.inf"
-	-if exist "$(OUTPUT_DIR)\ZRCola64.rpt"                 del /f /q "$(OUTPUT_DIR)\ZRCola64.rpt"
-	-if exist "$(OUTPUT_DIR)\ZRCola64D.cab"                del /f /q "$(OUTPUT_DIR)\ZRCola64D.cab"
-	-if exist "$(OUTPUT_DIR)\ZRCola64D.inf"                del /f /q "$(OUTPUT_DIR)\ZRCola64D.inf"
-	-if exist "$(OUTPUT_DIR)\ZRCola64D.rpt"                del /f /q "$(OUTPUT_DIR)\ZRCola64D.rpt"
-	-if exist "$(OUTPUT_DIR)\catalog.xml"                  del /f /q "$(OUTPUT_DIR)\catalog.xml"
+	-if exist "$(OUTPUT_DIR)\catalog.xml" del /f /q "$(OUTPUT_DIR)\catalog.xml"
 
 !IFNDEF HAS_VERSION
 
@@ -88,13 +65,11 @@ Register \
 Unregister \
 Localization \
 PublishPre \
-Publish :: "MSI\MSIBuild\Version\Version.mak"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@
-
-"MSI\MSIBuild\Version\Version.mak" ::
+Publish ::
 	cd "MSI\MSIBuild\Version"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Version
 	cd "$(MAKEDIR)"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@
 
 !ELSE
 
@@ -106,8 +81,7 @@ Publish :: "MSI\MSIBuild\Version\Version.mak"
 !INCLUDE "MSI\MSIBuild\Version\Version.mak"
 !INCLUDE "include\MSIBuildCfg.mak"
 
-PUBLISH_PACKAGE_DIR=$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)
-PUBLISH_PACKAGE_URL=http://www.amebis.si/prenos/ZRCola/$(MSIBUILD_VERSION_STR)
+PUBLISH_PACKAGE_URL=http://prenos.amebis.si/ZRCola/$(MSIBUILD_VERSION_STR)
 
 ######################################################################
 # Main targets
@@ -116,50 +90,30 @@ PUBLISH_PACKAGE_URL=http://www.amebis.si/prenos/ZRCola/$(MSIBUILD_VERSION_STR)
 All :: \
 	Setup
 
+
+######################################################################
+# Setup
+######################################################################
+
 Setup :: \
-#	"$(OUTPUT_DIR)\ZRColaDe32.msi" \
-#	"$(OUTPUT_DIR)\ZRColaDe64.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn32.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn64.msi" \
-	"$(OUTPUT_DIR)\ZRColaRu32.msi" \
-	"$(OUTPUT_DIR)\ZRColaRu64.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl32.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl64.msi"
+	Localization \
+	SetupCompile \
+	SetupPackage \
 
 SetupDebug :: \
-#	"$(OUTPUT_DIR)\ZRColaDe32D.msi" \
-#	"$(OUTPUT_DIR)\ZRColaDe64D.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn32D.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn64D.msi" \
-	"$(OUTPUT_DIR)\ZRColaRu32D.msi" \
-	"$(OUTPUT_DIR)\ZRColaRu64D.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl32D.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl64D.msi"
+	Localization \
+	SetupDebugCompile \
+	SetupDebugPackage \
 
 
 ######################################################################
 # Publishing
 ######################################################################
 
-PublishPre :: \
-	"$(PUBLISH_PACKAGE_DIR)" \
-#	"$(PUBLISH_PACKAGE_DIR)\ZRColaDe32.msi" \
-#	"$(PUBLISH_PACKAGE_DIR)\ZRColaDe64.msi" \
-	"$(PUBLISH_PACKAGE_DIR)\ZRColaEn32.msi" \
-	"$(PUBLISH_PACKAGE_DIR)\ZRColaEn64.msi" \
-	"$(PUBLISH_PACKAGE_DIR)\ZRColaRu32.msi" \
-	"$(PUBLISH_PACKAGE_DIR)\ZRColaRu64.msi" \
-	"$(PUBLISH_PACKAGE_DIR)\ZRColaSl32.msi" \
-	"$(PUBLISH_PACKAGE_DIR)\ZRColaSl64.msi" \
-	"$(PUBLISH_DIR)" \
-#	"$(PUBLISH_DIR)\ZRColaInstallDe.exe" \
-	"$(PUBLISH_DIR)\ZRColaInstallEn.exe" \
-	"$(PUBLISH_DIR)\ZRColaInstallRu.exe" \
-	"$(PUBLISH_DIR)\ZRColaInstallSl.exe"
-
 Publish :: \
 	PublishPre \
-	"$(PUBLISH_DIR)\catalog-0000.xml"
+	"$(PUBLISH_DIR)" \
+	"$(PUBLISH_DIR)\catalog-0001.xml"
 
 
 ######################################################################
@@ -167,6 +121,8 @@ Publish :: \
 ######################################################################
 
 Register :: \
+	Localization \
+	RegisterCompile \
 	RegisterSettings \
 	InstallFonts \
 	RegisterShortcuts
@@ -176,18 +132,25 @@ Unregister :: \
 	UninstallFonts \
 	UnregisterSettings
 
+RegisterCompile ::
+	msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln" /t:Build /p:Platform=$(PLAT) /p:Configuration=Debug
+
 RegisterSettings ::
+	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "Language"                   /t REG_SZ /d "en_US"                           $(REG_FLAGS) > NUL
 	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS) > NUL
 	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\data"   $(REG_FLAGS) > NUL
-!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" || "$(PROCESSOR_ARCHITECTURE)" == "ARM64"
+	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "Language"                   /t REG_SZ /d "en_US"                           $(REG_FLAGS32) > NUL
 	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS32) > NUL
 	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\data"   $(REG_FLAGS32) > NUL
 !ENDIF
 
 UnregisterSettings ::
+	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "Language"                   $(REG_FLAGS) > NUL
 	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" $(REG_FLAGS) > NUL
 	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               $(REG_FLAGS) > NUL
-!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" || "$(PROCESSOR_ARCHITECTURE)" == "ARM64"
+	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "Language"                   $(REG_FLAGS32) > NUL
 	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" $(REG_FLAGS32) > NUL
 	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               $(REG_FLAGS32) > NUL
 !ENDIF
@@ -203,16 +166,16 @@ InstallFonts :: \
 	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Bold Italic (TrueType)" /t REG_SZ /d "ZRCola_BI.otf" $(REG_FLAGS) > NUL
 	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" /v "00 ZRCola"                     /t REG_SZ /d "ZRCola"        $(REG_FLAGS) > NUL
 
-UninstallFonts::
+UninstallFonts ::
 	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola (TrueType)"             $(REG_FLAGS) > NUL
 	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Italic (TrueType)"      $(REG_FLAGS) > NUL
 	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Bold (TrueType)"        $(REG_FLAGS) > NUL
 	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Bold Italic (TrueType)" $(REG_FLAGS) > NUL
 	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" /v "00 ZRCola"                     $(REG_FLAGS) > NUL
-	-if exist "$(WINDIR)\Fonts\ZRCola_Re.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_Re.otf"
-	-if exist "$(WINDIR)\Fonts\ZRCola_It.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_It.otf"
-	-if exist "$(WINDIR)\Fonts\ZRCola_Bd.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_Bd.otf"
-	-if exist "$(WINDIR)\Fonts\ZRCola_BI.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_BI.otf"
+	-if exist "$(WINDIR)\Fonts\ZRCola_Re.otf" del /f /q "$(WINDIR)\Fonts\ZRCola_Re.otf"
+	-if exist "$(WINDIR)\Fonts\ZRCola_It.otf" del /f /q "$(WINDIR)\Fonts\ZRCola_It.otf"
+	-if exist "$(WINDIR)\Fonts\ZRCola_Bd.otf" del /f /q "$(WINDIR)\Fonts\ZRCola_Bd.otf"
+	-if exist "$(WINDIR)\Fonts\ZRCola_BI.otf" del /f /q "$(WINDIR)\Fonts\ZRCola_BI.otf"
 
 RegisterShortcuts :: \
 	"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" \
@@ -221,21 +184,6 @@ RegisterShortcuts :: \
 UnregisterShortcuts ::
 	-if exist "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" rd /s /q "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola"
 
-######################################################################
-# Localization
-######################################################################
-
-Localization :: \
-	"$(OUTPUT_DIR)\locale\de_DE" \
-	"$(OUTPUT_DIR)\locale\de_DE\wxstd.mo" \
-	"$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo" \
-	"$(OUTPUT_DIR)\locale\ru_RU" \
-	"$(OUTPUT_DIR)\locale\ru_RU\wxstd.mo" \
-	"$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo" \
-	"$(OUTPUT_DIR)\locale\sl_SI" \
-	"$(OUTPUT_DIR)\locale\sl_SI\wxstd.mo" \
-	"$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo"
-
 
 ######################################################################
 # Folder creation
@@ -244,22 +192,17 @@ Localization :: \
 "$(OUTPUT_DIR)" \
 "$(OUTPUT_DIR)\Keys" \
 "$(OUTPUT_DIR)\locale" \
-"$(OUTPUT_DIR)\locale\de_DE" \
-"$(OUTPUT_DIR)\locale\ru_RU" \
-"$(OUTPUT_DIR)\locale\sl_SI" \
 "$(PUBLISH_DIR)" \
-"$(PUBLISH_PACKAGE_DIR)" \
+"$(PUBLISH_DIR)\_latest" \
+"$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)" \
 "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" :
 	if not exist $@ md $@
 
 "$(OUTPUT_DIR)\Keys" \
 "$(OUTPUT_DIR)\locale" : "$(OUTPUT_DIR)"
 
-"$(OUTPUT_DIR)\locale\de_DE" \
-"$(OUTPUT_DIR)\locale\ru_RU" \
-"$(OUTPUT_DIR)\locale\sl_SI" : "$(OUTPUT_DIR)\locale"
-
-"$(PUBLISH_PACKAGE_DIR)" : "$(PUBLISH_DIR)"
+"$(PUBLISH_DIR)\_latest" \
+"$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)" : "$(PUBLISH_DIR)"
 
 
 ######################################################################
@@ -291,177 +234,66 @@ Localization :: \
 # Building
 ######################################################################
 
-"$(OUTPUT_DIR)\locale\de_DE\wxstd.mo" : "$(WXWIN)\locale\de.po"
-	msgfmt.exe --output-file=$@ --alignment=1 --endianness=little $**
-
-"$(OUTPUT_DIR)\locale\ru_RU\wxstd.mo" : "$(WXWIN)\locale\ru.po"
-	msgfmt.exe --output-file=$@ --alignment=1 --endianness=little $**
-
-"$(OUTPUT_DIR)\locale\sl_SI\wxstd.mo" : "$(WXWIN)\locale\sl.po"
-	msgfmt.exe --output-file=$@ --alignment=1 --endianness=little $**
-
-"$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo" : "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.po"
-	msgfmt.exe --output-file=$@ --alignment=1 --endianness=little $**
-
-"$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo" : "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.po"
-	msgfmt.exe --output-file=$@ --alignment=1 --endianness=little $**
-
-"$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo" : "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.po"
-	msgfmt.exe --output-file=$@ --alignment=1 --endianness=little $**
-
-"$(OUTPUT_DIR)\Win32.Release\libZRCola10u_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Release\libZRColaUI10u_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Release\stdex10u_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Release\wxExtend10u_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Release\ZRCola.exe" :: Localization
-
-"$(OUTPUT_DIR)\Win32.Debug\libZRCola10ud_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Debug\libZRColaUI10ud_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Debug\stdex10ud_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Debug\wxExtend10ud_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Debug\ZRCola.exe" :: Localization
-
-"$(OUTPUT_DIR)\x64.Release\libZRCola10u_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Release\libZRColaUI10u_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Release\stdex10u_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Release\wxExtend10u_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Release\ZRCola.exe" :: Localization
-
-"$(OUTPUT_DIR)\x64.Debug\libZRCola10ud_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Debug\libZRColaUI10ud_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Debug\stdex10ud_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Debug\wxExtend10ud_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Debug\ZRCola.exe" :: Localization
-
-"$(OUTPUT_DIR)\Win32.Release\libZRCola10u_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Release\libZRColaUI10u_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Release\stdex10u_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Release\wxExtend10u_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Release\ZRCola.exe" ::
-	devenv.com "ZRCola.sln" /build "Release|Win32"
-
-"$(OUTPUT_DIR)\Win32.Debug\libZRCola10ud_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Debug\libZRColaUI10ud_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Debug\stdex10ud_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Debug\wxExtend10ud_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Debug\ZRCola.exe" ::
-	devenv.com "ZRCola.sln" /build "Debug|Win32"
-
-"$(OUTPUT_DIR)\x64.Release\libZRCola10u_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Release\libZRColaUI10u_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Release\stdex10u_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Release\wxExtend10u_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Release\ZRCola.exe" ::
-	devenv.com "ZRCola.sln" /build "Release|x64"
-
-"$(OUTPUT_DIR)\x64.Debug\libZRCola10ud_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Debug\libZRColaUI10ud_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Debug\stdex10ud_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Debug\wxExtend10ud_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Debug\ZRCola.exe" ::
-	devenv.com "ZRCola.sln" /build "Debug|x64"
-
-"$(OUTPUT_DIR)\ZRCola32.ddf" : \
-#	"$(OUTPUT_DIR)\ZRCola.de_DE.32.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.en_US.32.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.ru_RU.32.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.sl_SI.32.2.msi"
-	-if exist $@ del /f /q $@
-	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola32" /C:LZX
-	move /y "$(@:"=).tmp" $@ > NUL
-
-"$(OUTPUT_DIR)\ZRCola32D.ddf" : \
-#	"$(OUTPUT_DIR)\ZRCola.de_DE.32D.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.en_US.32D.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.ru_RU.32D.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.sl_SI.32D.2.msi"
-	-if exist $@ del /f /q $@
-	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola32D" /C:LZX
-	move /y "$(@:"=).tmp" $@ > NUL
-
-"$(OUTPUT_DIR)\ZRCola64.ddf" : \
-#	"$(OUTPUT_DIR)\ZRCola.de_DE.64.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.en_US.64.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.ru_RU.64.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.sl_SI.64.2.msi"
-	-if exist $@ del /f /q $@
-	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola64" /C:LZX
-	move /y "$(@:"=).tmp" $@ > NUL
-
-"$(OUTPUT_DIR)\ZRCola64D.ddf" : \
-#	"$(OUTPUT_DIR)\ZRCola.de_DE.64D.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.en_US.64D.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.ru_RU.64D.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.sl_SI.64D.2.msi"
-	-if exist $@ del /f /q $@
-	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola64D" /C:LZX
-	move /y "$(@:"=).tmp" $@ > NUL
-
-"$(OUTPUT_DIR)\ZRCola32.cab" \
-"$(OUTPUT_DIR)\ZRCola32.inf" \
-"$(OUTPUT_DIR)\ZRCola32.rpt" : "$(OUTPUT_DIR)\ZRCola32.ddf"
-	makecab.exe /F $**
-
-"$(OUTPUT_DIR)\ZRCola32D.cab" \
-"$(OUTPUT_DIR)\ZRCola32D.inf" \
-"$(OUTPUT_DIR)\ZRCola32D.rpt" : "$(OUTPUT_DIR)\ZRCola32D.ddf"
-	makecab.exe /F $**
-
-"$(OUTPUT_DIR)\ZRCola64.cab" \
-"$(OUTPUT_DIR)\ZRCola64.inf" \
-"$(OUTPUT_DIR)\ZRCola64.rpt" : "$(OUTPUT_DIR)\ZRCola64.ddf"
-	makecab.exe /F $**
-
-"$(OUTPUT_DIR)\ZRCola64D.cab" \
-"$(OUTPUT_DIR)\ZRCola64D.inf" \
-"$(OUTPUT_DIR)\ZRCola64D.rpt" : "$(OUTPUT_DIR)\ZRCola64D.ddf"
-	makecab.exe /F $**
-
-"$(PUBLISH_DIR)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml"
-	if exist $@  del /f /q $@
-	output\$(PLAT).Release\UpdSignXML.exe $** $@
+"$(PUBLISH_DIR)\catalog-0001.xml" : "$(OUTPUT_DIR)\catalog.xml"
+	copy /y $** $@ > NUL
 
 "$(OUTPUT_DIR)\catalog.xml" : \
-#	"$(OUTPUT_DIR)\ZRColaDe32.msi" \
-#	"$(OUTPUT_DIR)\ZRColaDe64.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn32.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn64.msi" \
-	"$(OUTPUT_DIR)\ZRColaRu32.msi" \
-	"$(OUTPUT_DIR)\ZRColaRu64.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl32.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl64.msi"
-	-if exist $@ del /f /q $@
+	"$(OUTPUT_DIR)\ZRColaEn-x86.msi" \
+	"$(OUTPUT_DIR)\ZRColaEn-amd64.msi" \
+	"$(OUTPUT_DIR)\ZRColaEn-arm64.msi" \
+	"$(OUTPUT_DIR)\ZRColaRu-x86.msi" \
+	"$(OUTPUT_DIR)\ZRColaRu-amd64.msi" \
+	"$(OUTPUT_DIR)\ZRColaRu-arm64.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl-x86.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl-amd64.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl-arm64.msi"
+	copy /y "$(PUBLISH_DIR)\catalog-0001.xml" "$(@:"=).tmp" > NUL
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn-x86.msi"   -f "$(OUTPUT_DIR)\ZRColaEn-x86.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn-amd64.msi" -f "$(OUTPUT_DIR)\ZRColaEn-amd64.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-arm64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn-arm64.msi" -f "$(OUTPUT_DIR)\ZRColaEn-arm64.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu-x86.msi"   -f "$(OUTPUT_DIR)\ZRColaRu-x86.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu-amd64.msi" -f "$(OUTPUT_DIR)\ZRColaRu-amd64.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-arm64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu-arm64.msi" -f "$(OUTPUT_DIR)\ZRColaRu-arm64.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl-x86.msi"   -f "$(OUTPUT_DIR)\ZRColaSl-x86.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl-amd64.msi" -f "$(OUTPUT_DIR)\ZRColaSl-amd64.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-arm64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl-arm64.msi" -f "$(OUTPUT_DIR)\ZRColaSl-arm64.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdSignXML.exe" "$(@:"=).tmp" $@
 	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	copy /y "$(PUBLISH_DIR)\catalog-0000.xml" "$(@:"=).tmp" > NUL
-#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe32.msi" -f "$(OUTPUT_DIR)\ZRColaDe32.msi"
-#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe64.msi" -f "$(OUTPUT_DIR)\ZRColaDe64.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu32.msi" -f "$(OUTPUT_DIR)\ZRColaRu32.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu64.msi" -f "$(OUTPUT_DIR)\ZRColaRu64.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.msi"
-	move /y "$(@:"=).tmp" $@ > NUL
 
 !ENDIF
 
+######################################################################
+# Platform Specific
+######################################################################
 
-#LANG=de_DE
-#LANG_OUT=De
-#!INCLUDE "MSILocal.mak"
+PLAT=Win32
+PLAT_SUFFIX=-x86
+!INCLUDE "MakefilePlat.mak"
+
+PLAT=x64
+PLAT_SUFFIX=-amd64
+!INCLUDE "MakefilePlat.mak"
+
+PLAT=ARM64
+PLAT_SUFFIX=-arm64
+!INCLUDE "MakefilePlat.mak"
+
+
+######################################################################
+# Language Specific
+######################################################################
 
 LANG=en_US
-LANG_OUT=En
-!INCLUDE "MSILocal.mak"
+LANG_BASE=en
+LANG_SUFFIX=En
+!INCLUDE "MakefileLang.mak"
 
 LANG=ru_RU
-LANG_OUT=Ru
-!INCLUDE "MSILocal.mak"
+LANG_BASE=ru
+LANG_SUFFIX=Ru
+!INCLUDE "MakefileLang.mak"
 
 LANG=sl_SI
-LANG_OUT=Sl
-!INCLUDE "MSILocal.mak"
+LANG_BASE=sl
+LANG_SUFFIX=Sl
+!INCLUDE "MakefileLang.mak"

MakefilePlatCfg.mak

@@ -0,0 +1,58 @@
+#
+#    Copyright © 1991-2021 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 <http://www.gnu.org/licenses/>.
+#
+
+Clean ::
+	msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln"          /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT)
+!IF "$(PLAT)" == "Win32"
+	msbuild.exe $(MSBUILDFLAGS) "ZRColaUtils.sln"     /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT)
+!ENDIF
+	msbuild.exe $(MSBUILDFLAGS) "MSI\MSICA\MSICA.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT)
+	msbuild.exe $(MSBUILDFLAGS) "Updater\Updater.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT)
+	-if exist "$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf"
+	-if exist "$(OUTPUT_DIR)\$(PLAT).$(CFG).cab" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).cab"
+	-if exist "$(OUTPUT_DIR)\$(PLAT).$(CFG).inf" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).inf"
+	-if exist "$(OUTPUT_DIR)\$(PLAT).$(CFG).rpt" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).rpt"
+
+
+!IFDEF HAS_VERSION
+
+######################################################################
+# 2nd Phase
+# - The version is known, do the rest.
+######################################################################
+
+######################################################################
+# Building
+######################################################################
+
+"$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf" : \
+#	"$(OUTPUT_DIR)\de_DE.$(PLAT).$(CFG).2.msi" \
+	"$(OUTPUT_DIR)\en_US.$(PLAT).$(CFG).2.msi" \
+	"$(OUTPUT_DIR)\ru_RU.$(PLAT).$(CFG).2.msi" \
+	"$(OUTPUT_DIR)\sl_SI.$(PLAT).$(CFG).2.msi"
+	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
+	cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\$(PLAT).$(CFG)" /C:LZX
+	move /y "$(@:"=).tmp" $@ > NUL
+
+"$(OUTPUT_DIR)\$(PLAT).$(CFG).cab" \
+"$(OUTPUT_DIR)\$(PLAT).$(CFG).inf" \
+"$(OUTPUT_DIR)\$(PLAT).$(CFG).rpt" : "$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf"
+	makecab.exe /F $**
+
+!ENDIF

README.md

@@ -1,4 +1,4 @@
-# ZRCola
+# ZRCola
 
 A Microsoft Windows application for composing texts using a wide range of Slavic (and general) letters from or beyond Unicode.
 
@@ -6,30 +6,47 @@ A Microsoft Windows application for composing texts using a wide range of Slavic
 http://zrcola.zrc-sazu.si/en/
 
 ## Binaries for Download
-https://www.amebis.si/prenos/ZRCola/
+https://prenos.amebis.si/ZRCola/
 
 ## Building
 
 ### Building Environment Requirements
 - Microsoft Windows Vista or later
-- Microsoft Visual Studio 2010 SP1
+- Microsoft Visual Studio 2017
 - _sed.exe_ and _grep.exe_
 - Command line utilities from Microsoft Windows SDK Bin folder: distributed with Visual Studio, add Bin folder to path manually.
 - Additional command line utilities from project's bin folder: add bin folder to path. The source code is provided on request.
-- wxWidgets 3.0 - set `WXWIN` environment variable to the folder where wxWidgets include and lib files are located. Official binary builds are required.
+
+### wxWidgets
+ZRCola is using wxWidgets static libraries. You have to compile static libraries yourself.
+
+#### Compiling wxWidgets Win32 static libraries
+1. Start _x86 Native Tools Command Prompt for VS 2017_
+2. Change working folder to `build\msw`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 BUILD=release`
+
+#### Compiling wxWidgets x64 static libraries
+1. Start _x64 Native Tools Command Prompt for VS 2017_
+2. Change working folder to `build\msw`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64 BUILD=release`
+
+#### Specifying wxWidgets path
+ZRCola compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (e.g. `C:\SDK\wxWidgets`).
 
 ### Digital Signing of Build Outputs
 In order to have the build process digitally sign output files, one should provide the following:
 
 1. A signing certificate installed in the current user's certificate store.
 2. The following variables in the environment:
-  - `ManifestCertificateThumbprint` - set the value to certificate's SHA1 thumbprint (hexadecimal, without spaces, i.e. `bc0d8da45f9eeefcbe4e334e1fc262804df88d7e`).
-  - `ManifestTimestampUrl`          - set the value to URL used to perform timestamp signature (i.e. `http://timestamp.verisign.com/scripts/timstamp.dll`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.
+  - `ManifestCertificateThumbprint` - set the value to certificate's SHA1 thumbprint (hexadecimal, without spaces, e.g. `f61b973226c502a732d24f41aa85e192b009e7c0`).
+  - `ManifestTimestampRFC3161Url`   - set the value to URL used to perform RFC3161 timestamp signature (e.g. `http://time.certum.pl`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.
 
 Please note that only Release builds are configured for timestamp signing. Debug configurations do not attempt to timestamp sign the resulting DLL and EXE files in order to speed up the building process and enable offline building.
 
 ### Building
-Use Microsoft NMAKE to build the project. The resulting files can be found in output subfolder.
+Use Microsoft NMAKE to build the project. The resulting files can be found in output subfolder. Open _x64 Native Tools Command Prompt for VS 2017_ for building.
 
 - `nmake Clean`	Delete all intermediate and output files.
 - `nmake Setup`	Build a release version of project and release MSI setup files.
@@ -37,7 +54,7 @@ Use Microsoft NMAKE to build the project. The resulting files can be found in ou
 - `nmake Register`	Build a debug version of project, install fonts (reboot required), and Start Menu shortcuts. For development purposes only!
 - `nmake Unregister`	Remove Start Menu shortcuts, and fonts. For development purposes only!
 
-The `/ls` flag can be appended to the commands above to reduce NMAKE's verbosity. You can combine multiple targets (i.e. nmake Unregister Clean). Please, see NMAKE reference for further reading.
+The `/ls` flag can be appended to the commands above to reduce NMAKE's verbosity. You can combine multiple targets (e.g. nmake Unregister Clean). Please, see NMAKE reference for further reading.
 
 ## Translating ZRCola
 Instructions how to translate ZRCola to your language can be found [here](LOCALIZATION.md).