Version set to 2.0-beta

(closes #21)

.gitignore

@@ -1,13 +1,6 @@
-/ipch
-/output/Win32.Debug
-/output/Win32.Release
-/output/x64.Debug
-/output/x64.Release
+/*.opensdf
 /*.sdf
 /*.suo
+/ipch
 *.user
 temp
-/*.opensdf
-/ZRCola/locale/*.mo
-/output/locale/sl/ZRCola.mo
-/output/locale/sl/wxExtend.mo

.gitmodules

@@ -1,3 +1,21 @@
 [submodule "lib/wxExtend"]
 	path = lib/wxExtend
 	url = https://github.com/Amebis/wxExtend.git
+[submodule "lib/stdex"]
+	path = lib/stdex
+	url = https://github.com/Amebis/stdex.git
+[submodule "MSI/MSIBuild"]
+	path = MSI/MSIBuild
+	url = https://github.com/Amebis/MSIBuild.git
+[submodule "MSI/MSICA"]
+	path = MSI/MSICA
+	url = https://github.com/Amebis/MSICA.git
+[submodule "lib/atlex"]
+	path = lib/atlex
+	url = https://github.com/Amebis/atlex.git
+[submodule "lib/MSICALib"]
+	path = lib/MSICALib
+	url = https://github.com/Amebis/MSICALib.git
+[submodule "Updater"]
+	path = Updater
+	url = https://github.com/Amebis/Updater.git

MSI/MSM/.gitignore

@@ -0,0 +1,5 @@
+/*.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

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

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

MSI/MSM/Microsoft_VC100_CRT_x86.lst

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

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

MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst

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

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

MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst

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

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

MSI/MSM/wxMSW_wxbase30u_net_vc100.lst

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

MSI/MSM/wxMSW_wxbase30u_net_vc100.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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.lst

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

MSI/MSM/wxMSW_wxbase30u_net_vc100_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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_vc100.lst

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

MSI/MSM/wxMSW_wxbase30u_vc100.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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_vc100_x64.lst

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

MSI/MSM/wxMSW_wxbase30u_vc100_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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_xml_vc100.lst

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

MSI/MSM/wxMSW_wxbase30u_xml_vc100.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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.lst

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

MSI/MSM/wxMSW_wxbase30u_xml_vc100_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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_net_vc100.lst

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

MSI/MSM/wxMSW_wxbase30ud_net_vc100.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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.lst

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

MSI/MSM/wxMSW_wxbase30ud_net_vc100_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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_vc100.lst

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

MSI/MSM/wxMSW_wxbase30ud_vc100.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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_vc100_x64.lst

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

MSI/MSM/wxMSW_wxbase30ud_vc100_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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_xml_vc100.lst

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

MSI/MSM/wxMSW_wxbase30ud_xml_vc100.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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.lst

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

MSI/MSM/wxMSW_wxbase30ud_xml_vc100_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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_adv_vc100.lst

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

MSI/MSM/wxMSW_wxmsw30u_adv_vc100.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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.lst

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

MSI/MSM/wxMSW_wxmsw30u_adv_vc100_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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_aui_vc100.lst

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

MSI/MSM/wxMSW_wxmsw30u_aui_vc100.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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.lst

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

MSI/MSM/wxMSW_wxmsw30u_aui_vc100_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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_core_vc100.lst

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

MSI/MSM/wxMSW_wxmsw30u_core_vc100.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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.lst

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

MSI/MSM/wxMSW_wxmsw30u_core_vc100_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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.lst

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

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.lst

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

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.lst

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

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.lst

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

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_core_vc100.lst

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

MSI/MSM/wxMSW_wxmsw30ud_core_vc100.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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.lst

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

MSI/MSM/wxMSW_wxmsw30ud_core_vc100_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 <http://www.gnu.org/licenses/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/ZRCola/Main/.gitignore

@@ -0,0 +1,9 @@
+/*-1.idt
+/*-2.idt
+/*-2.idtx
+/*.Binary-1
+/*.Binary-2
+/*.Icon-1
+/*.Icon-2
+/*.lst
+/*.msm

MSI/ZRCola/Makefile

@@ -0,0 +1,21 @@
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+
+!INCLUDE "..\..\include\MSIBuildCfg.mak"
+!INCLUDE "..\MSIBuild\Makefile"

MSI/ZRCola/locale/.gitignore

@@ -0,0 +1 @@
+/*.mo

Makefile

@@ -0,0 +1,388 @@
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+
+OUTPUT_DIR=output
+PUBLISH_DIR=\\amebis.doma\Splet\WWW\Apache\www.amebis.si-prenos\ZRCola
+
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+PLAT=x64
+REG_FLAGS=/f /reg:64
+REG_FLAGS32=/f /reg:32
+!ELSE
+PLAT=Win32
+REG_FLAGS=/f
+!ENDIF
+
+
+All ::
+
+Clean ::
+	cd "MSI\MSIBuild\Version"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean
+	cd "$(MAKEDIR)"
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=Win32 CFG=Release
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=Win32 CFG=Debug
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=x64   CFG=Release
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=x64   CFG=Debug
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=Win32 CFG=Release
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=Win32 CFG=Debug
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=x64   CFG=Release
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=x64   CFG=Debug
+	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)\Setup\ZRColaEn32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl32.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"
+	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi"
+	-if exist "$(OUTPUT_DIR)\catalog.xml"           del /f /q "$(OUTPUT_DIR)\catalog.xml"
+
+!IFNDEF HAS_VERSION
+
+######################################################################
+# 1st Phase
+# - Version info parsing
+######################################################################
+
+All \
+Setup \
+SetupDebug \
+Register \
+Unregister \
+PublishPre \
+Publish :: "MSI\MSIBuild\Version\Version.mak"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@
+
+"MSI\MSIBuild\Version\Version.mak" ::
+	cd "MSI\MSIBuild\Version"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Version
+	cd "$(MAKEDIR)"
+
+!ELSE
+
+######################################################################
+# 2nd Phase
+# - The version is known, do the rest.
+######################################################################
+
+!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)
+
+REDIST_EN_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaEn32.msi"
+REDIST_EN_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaEn64.msi"
+REDIST_SL_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaSl32.msi"
+REDIST_SL_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaSl64.msi"
+
+
+######################################################################
+# Main targets
+######################################################################
+
+All :: \
+	Setup
+
+Setup :: \
+	"$(OUTPUT_DIR)\Setup" \
+	"$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" \
+	"$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" \
+	"$(OUTPUT_DIR)\Setup\ZRColaSl32.msi" \
+	"$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"
+
+SetupDebug :: \
+	"$(OUTPUT_DIR)\Setup" \
+	"$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" \
+	"$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" \
+	"$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi" \
+	"$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi"
+
+Register :: \
+	RegisterSettings \
+	InstallFonts \
+	RegisterShortcuts
+
+Unregister :: \
+	UnregisterShortcuts \
+	UninstallFonts \
+	UnregisterSettings
+
+RegisterSettings ::
+	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"
+	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 "LocalizationRepositoryPath" $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               $(REG_FLAGS) > NUL
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+	-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
+
+InstallFonts :: \
+	"$(WINDIR)\Fonts\00_ZRCola_Re.ttf" \
+	"$(WINDIR)\Fonts\00_ZRCola_It.ttf" \
+	"$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" \
+	"$(WINDIR)\Fonts\00_ZRCola_BI.ttf"
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)"             /t REG_SZ /d "00_ZRCola_Re.ttf" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Italic (TrueType)"      /t REG_SZ /d "00_ZRCola_It.ttf" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold (TrueType)"        /t REG_SZ /d "00_ZRCola_Bd.ttf" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold Italic (TrueType)" /t REG_SZ /d "00_ZRCola_BI.ttf" $(REG_FLAGS) > NUL
+
+UninstallFonts::
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)"             $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Italic (TrueType)"      $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold (TrueType)"        $(REG_FLAGS) > NUL
+	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold Italic (TrueType)" $(REG_FLAGS) > NUL
+	-if exist "$(WINDIR)\Fonts\00_ZRCola_Re.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Re.ttf"
+	-if exist "$(WINDIR)\Fonts\00_ZRCola_It.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_It.ttf"
+	-if exist "$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Bd.ttf"
+	-if exist "$(WINDIR)\Fonts\00_ZRCola_BI.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_BI.ttf"
+
+RegisterShortcuts :: \
+	"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" \
+	"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola\ZRCola.lnk"
+
+UnregisterShortcuts ::
+	-if exist "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" rd /s /q "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola"
+
+PublishPre :: \
+	"$(PUBLISH_PACKAGE_DIR)" \
+	$(REDIST_EN_WIN32) \
+	$(REDIST_EN_X64) \
+	$(REDIST_SL_WIN32) \
+	$(REDIST_SL_X64)
+
+Publish :: \
+	PublishPre \
+	"$(PUBLISH_DIR)\catalog-0000.xml"
+
+
+######################################################################
+# Folder creation
+######################################################################
+
+"$(OUTPUT_DIR)" \
+"$(OUTPUT_DIR)\Keys" \
+"$(OUTPUT_DIR)\Setup" \
+"$(PUBLISH_DIR)" \
+"$(PUBLISH_PACKAGE_DIR)" \
+"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" :
+	if not exist $@ md $@
+
+"$(OUTPUT_DIR)\Keys" \
+"$(OUTPUT_DIR)\Setup" : "$(OUTPUT_DIR)"
+
+"$(PUBLISH_PACKAGE_DIR)" : "$(PUBLISH_DIR)"
+
+
+######################################################################
+# File copy
+######################################################################
+
+"$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" \
+$(REDIST_EN_WIN32) : "$(OUTPUT_DIR)\ZRColaEn32.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" : "$(OUTPUT_DIR)\ZRColaEn32D.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" \
+$(REDIST_EN_X64) : "$(OUTPUT_DIR)\ZRColaEn64.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" : "$(OUTPUT_DIR)\ZRColaEn64D.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaSl32.msi" \
+$(REDIST_SL_WIN32) : "$(OUTPUT_DIR)\ZRColaSl32.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi" : "$(OUTPUT_DIR)\ZRColaSl32D.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaSl64.msi" \
+$(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
+	copy /y $** $@ > NUL
+
+"$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi" : "$(OUTPUT_DIR)\ZRColaSl64D.3.msi"
+	copy /y $** $@ > NUL
+
+"$(WINDIR)\Fonts\00_ZRCola_Re.ttf" : "$(OUTPUT_DIR)\00_ZRCola_Re.ttf"
+	copy /y $** $@ > NUL
+
+"$(WINDIR)\Fonts\00_ZRCola_It.ttf" : "$(OUTPUT_DIR)\00_ZRCola_It.ttf"
+	copy /y $** $@ > NUL
+
+"$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" : "$(OUTPUT_DIR)\00_ZRCola_Bd.ttf"
+	copy /y $** $@ > NUL
+
+"$(WINDIR)\Fonts\00_ZRCola_BI.ttf" : "$(OUTPUT_DIR)\00_ZRCola_BI.ttf"
+	copy /y $** $@ > NUL
+
+
+######################################################################
+# Shortcut creation
+######################################################################
+
+"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola\ZRCola.lnk" : "$(OUTPUT_DIR)\$(PLAT).Debug\ZRCola.exe"
+	cscript.exe "bin\MkLnk.wsf" //Nologo $@ "$(MAKEDIR)\$(OUTPUT_DIR)\$(PLAT).Debug\ZRCola.exe"
+
+
+######################################################################
+# Building
+######################################################################
+
+"$(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" \
+"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
+	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" \
+"$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
+	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" \
+"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
+	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" \
+"$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
+	devenv.com "ZRCola.sln" /build "Debug|x64"
+
+"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
+	devenv.com "MSI\MSICA\MSICA.sln" /build "Release|Win32"
+	devenv.com "Updater\Updater.sln" /build "Release|Win32"
+
+"$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
+	devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|Win32"
+	devenv.com "Updater\Updater.sln" /build "Debug|Win32"
+
+"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
+	devenv.com "MSI\MSICA\MSICA.sln" /build "Release|x64"
+	devenv.com "Updater\Updater.sln" /build "Release|x64"
+
+"$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \
+"$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
+	devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|x64"
+	devenv.com "Updater\Updater.sln" /build "Debug|x64"
+
+"$(OUTPUT_DIR)\ZRColaEn32.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=Win32 CFG=Release
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaEn32D.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=Win32 CFG=Debug
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaEn64.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=x64 CFG=Release
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaEn64D.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=x64 CFG=Debug
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=Win32 CFG=Release
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=Win32 CFG=Debug
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=x64 CFG=Release
+	cd "$(MAKEDIR)"
+
+"$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=x64 CFG=Debug
+	cd "$(MAKEDIR)"
+
+"$(PUBLISH_DIR)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml"
+	if exist $@  del /f /q $@
+	output\$(PLAT).Release\UpdSignXML.exe $** $@
+
+"$(OUTPUT_DIR)\catalog.xml" : \
+	"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
+	"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl32.3.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl64.3.msi"
+	-if exist $@ del /f /q $@
+	-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   en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.3.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.3.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.3.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
+	move /y "$(@:"=).tmp" $@ > NUL
+
+!ENDIF

ZRCola.sln

@@ -14,6 +14,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\build\libZRCola.vcxproj", "{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -46,6 +50,22 @@ Global
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|Win32.Build.0 = Release|Win32
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x64.ActiveCfg = Release|x64
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x64.Build.0 = Release|x64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.Build.0 = Debug|Win32
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x64.ActiveCfg = Debug|x64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x64.Build.0 = Debug|x64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.ActiveCfg = Release|Win32
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.Build.0 = Release|Win32
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x64.ActiveCfg = Release|x64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x64.Build.0 = Release|x64
+		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.ActiveCfg = Debug|Win32
+		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.Build.0 = Debug|Win32
+		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|x64.ActiveCfg = Debug|x64
+		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|x64.Build.0 = Debug|x64
+		{518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.ActiveCfg = Release|Win32
+		{518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.Build.0 = Release|Win32
+		{518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.ActiveCfg = Release|x64
+		{518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -53,5 +73,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{A3A36689-AC35-4026-93DA-A3BA0C0E767C} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
+		{518777CC-0A59-4415-A12A-82751ED75343} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 	EndGlobalSection
 EndGlobal

ZRCola/MSIBuild/.gitignore

@@ -0,0 +1,9 @@
+/*-1.idt
+/*-2.idt
+/*-2.idtx
+/*.Binary-1
+/*.Binary-2
+/*.Icon-1
+/*.Icon-2
+/*.lst
+/*.msm

ZRCola/MSIBuild/Makefile

@@ -0,0 +1,224 @@
+#
+#    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 <http://www.gnu.org/licenses/>.
+#
+
+!INCLUDE "..\..\include\MSIBuildCfg.mak"
+
+MSIBUILD_IS_LOCALIZEABLE=1
+
+
+######################################################################
+# AppSearch
+
+All :: "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Property	Signature_
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)
+AppSearch	Property	Signature_
+OLDZRCOLADIR	clZRCola.exe.$(PLAT)
+<<NOKEEP
+
+
+######################################################################
+# CompLocator
+
+All :: "$(LANG).$(PLAT).$(CFG).CompLocator-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Signature_	ComponentId	Type
+s$(MSIBUILD_LENGTH_ID)	s38	I2
+CompLocator	Signature_
+!IF "$(PLAT)" == "Win32"
+clZRCola.exe.Win32	{F30B6545-6203-4B7D-8575-85245A0F90E5}	1
+!ENDIF
+!IF "$(PLAT)" == "x64"
+clZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	1
+!ENDIF
+<<NOKEEP
+
+
+######################################################################
+# Component
+
+All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Component	ComponentId	Directory_	Attributes	Condition	KeyPath
+s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
+Component	Component
+!IF "$(PLAT)" == "Win32"
+compZRCola.exe.Win32	{F30B6545-6203-4B7D-8575-85245A0F90E5}	ZRCOLABINDIR	0		fileZRCola.exe.Win32
+!ENDIF
+!IF "$(PLAT)" == "x64"
+compZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	ZRCOLABINDIR	256		fileZRCola.exe.x64
+!ENDIF
+!IF "$(LANG)" == "Sl"
+compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.sl_SI
+!ENDIF
+<<NOKEEP
+
+
+######################################################################
+# Feature
+
+All :: "$(LANG).$(PLAT).$(CFG).Feature-2.idt"
+
+"En.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Feature	Feature_Parent	Title	Description	Display	Level	Directory_	Attributes
+s$(MSIBUILD_LENGTH_ID)	S$(MSIBUILD_LENGTH_ID)	L64	L255	I2	i2	S$(MSIBUILD_LENGTH_ID)	i2
+1252	Feature	Feature
+featZRCola		ZRCola	Input system for linguistic use	1	1	ZRCOLADIR	8
+<<NOKEEP
+
+"De.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\de_DE.po"
+	rcxgettext.exe idtp $@ $**
+
+"En.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx"
+	copy /y $** $@ > NUL
+
+"It.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\it_IT.po"
+	rcxgettext.exe idtp $@ $**
+
+"Sl.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\sl_SI.po"
+	rcxgettext.exe idtp $@ $**
+
+
+######################################################################
+# FeatureComponents
+
+All :: "$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Feature_	Component_
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)
+FeatureComponents	Feature_	Component_
+featZRCola	compZRCola.exe.$(PLAT)
+featZRCola	complibZRCola.dll.$(PLAT)
+featZRCola	complibZRColaUI.dll.$(PLAT)
+featZRCola	compwxExtend.dll.$(PLAT)
+featZRCola	compLocalizationRepositoryPath
+featZRCola	compLanguage
+featZRCola	compDatabasePath
+featZRCola	compZRCola.zrcdb
+featZRCola	comp00_ZRCola_Re.ttf
+!IF "$(LANG)" == "Sl"
+featZRCola	compZRCola.mo.sl_SI
+featZRCola	compZRCola.zrcdb.mo.sl_SI
+featZRCola	complibZRColaUI.mo.sl_SI
+featZRCola	compwxExtend.mo.sl_SI
+featZRCola	compwxstd.mo.sl_SI
+!ENDIF
+<<NOKEEP
+
+
+######################################################################
+# File
+
+All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
+File	File
+fileZRCola.exe.$(PLAT)	compZRCola.exe.$(PLAT)	ZRCola.exe	0		0	1536	1
+!IF "$(LANG)" == "Sl"
+fileZRCola.mo.sl_SI	compZRCola.mo.sl_SI	ZRCola.mo	0		1060	0	1
+!ENDIF
+<<NOKEEP
+
+
+######################################################################
+# Icon
+
+All :: \
+	"$(LANG).$(PLAT).$(CFG).Icon-1.idt" \
+	"$(LANG).$(PLAT).$(CFG).Icon-1\ZRCola.ico"
+
+"$(LANG).$(PLAT).$(CFG).Icon-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Icon-1"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Name	Data
+s$(MSIBUILD_LENGTH_ID)	v0
+Icon	Name
+iconZRCola.ico	ZRCola.ico
+<<NOKEEP
+
+"$(LANG).$(PLAT).$(CFG).Icon-1\ZRCola.ico" : "..\res\zrcola.ico"
+	copy /y $** $@ > NUL
+
+
+######################################################################
+# RemoveFile
+
+All :: "$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+FileKey	Component_	FileName	DirProperty	InstallMode
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	L255	s$(MSIBUILD_LENGTH_ID)	i2
+RemoveFile	FileKey
+rmfiZRCola	compZRCola.exe.$(PLAT)		ZRColaShortcutDir	2
+<<NOKEEP
+
+
+######################################################################
+# Shortcut
+
+All :: "$(LANG).$(PLAT).$(CFG).Shortcut-2.idt"
+
+"En.$(PLAT).$(CFG).Shortcut-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Shortcut	Directory_	Name	Component_	Target	Arguments	Description	Hotkey	Icon_	IconIndex	ShowCmd	WkDir
+s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l128	s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	S255	L255	I2	S$(MSIBUILD_LENGTH_ID)	I2	I2	S$(MSIBUILD_LENGTH_ID)
+1252	Shortcut	Shortcut
+shctZRCola	ZRColaShortcutDir	ZRCola	compZRCola.exe.$(PLAT)	featZRCola		Input system for linguistic use		iconZRCola.ico			ZRCOLABINDIR
+<<NOKEEP
+
+"De.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\de_DE.po"
+	rcxgettext.exe idtp $@ $**
+
+"En.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx"
+	copy /y $** $@ > NUL
+
+"It.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\it_IT.po"
+	rcxgettext.exe idtp $@ $**
+
+"Sl.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\sl_SI.po"
+	rcxgettext.exe idtp $@ $**
+
+
+######################################################################
+# Build MSM module!
+######################################################################
+
+!INCLUDE "..\..\MSI\MSIBuild\MSM.mak"

ZRCola/ZRCola.props

@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\lib\libZRCola\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\lib\stdex\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />