diff --git a/.gitignore b/.gitignore index e661545..031619b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -/*.opensdf -/*.sdf -/*.suo -/ipch +/.vs *.user temp diff --git a/MSI/MSIBuild b/MSI/MSIBuild index 951fbec..3701db4 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit 951fbec79dc7ad60026d0a4c10ca329bad7d3458 +Subproject commit 3701db4606d3a12b0df949698696487509d07bc7 diff --git a/MSI/MSICA b/MSI/MSICA index 04d84ba..ba6cedd 160000 --- a/MSI/MSICA +++ b/MSI/MSICA @@ -1 +1 @@ -Subproject commit 04d84baa78b904a0c1202e51480729e07916e6be +Subproject commit ba6cedd1212d00b37e39ce66b62804ea764e6306 diff --git a/MSI/MSM/.gitignore b/MSI/MSM/.gitignore deleted file mode 100644 index 5b7d856..0000000 --- a/MSI/MSM/.gitignore +++ /dev/null @@ -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 diff --git a/MSI/MSM/Microsoft_VC100_CRT_x64.lst b/MSI/MSM/Microsoft_VC100_CRT_x64.lst deleted file mode 100644 index b9ea228..0000000 --- a/MSI/MSM/Microsoft_VC100_CRT_x64.lst +++ /dev/null @@ -1,2 +0,0 @@ -Win\System64\msvcp100.dll -Win\System64\msvcr100.dll diff --git a/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg b/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg deleted file mode 100644 index efee5fb..0000000 --- a/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg +++ /dev/null @@ -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 . -# - -[splosno] -jezik=0 -deli=featZRCola featUpdCheck - -[parametri] diff --git a/MSI/MSM/Microsoft_VC100_CRT_x86.lst b/MSI/MSM/Microsoft_VC100_CRT_x86.lst deleted file mode 100644 index f701abb..0000000 --- a/MSI/MSM/Microsoft_VC100_CRT_x86.lst +++ /dev/null @@ -1,2 +0,0 @@ -Win\System\msvcp100.dll -Win\System\msvcr100.dll diff --git a/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg b/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg deleted file mode 100644 index efee5fb..0000000 --- a/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg +++ /dev/null @@ -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 . -# - -[splosno] -jezik=0 -deli=featZRCola featUpdCheck - -[parametri] diff --git a/MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst b/MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst deleted file mode 100644 index d561666..0000000 --- a/MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst +++ /dev/null @@ -1,2 +0,0 @@ -Win\System64\msvcp100d.dll -Win\System64\msvcr100d.dll diff --git a/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg b/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg deleted file mode 100644 index efee5fb..0000000 --- a/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg +++ /dev/null @@ -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 . -# - -[splosno] -jezik=0 -deli=featZRCola featUpdCheck - -[parametri] diff --git a/MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst b/MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst deleted file mode 100644 index ad3ed3f..0000000 --- a/MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst +++ /dev/null @@ -1,2 +0,0 @@ -Win\System\msvcp100d.dll -Win\System\msvcr100d.dll diff --git a/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg b/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg deleted file mode 100644 index efee5fb..0000000 --- a/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg +++ /dev/null @@ -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 . -# - -[splosno] -jezik=0 -deli=featZRCola featUpdCheck - -[parametri] diff --git a/MSI/ZRCola/wxWidgets/.gitignore b/MSI/ZRCola/wxWidgets/.gitignore deleted file mode 100644 index 80ea676..0000000 --- a/MSI/ZRCola/wxWidgets/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/*-1.idt -/*-2.idt -/*-2.idtx -/*.Binary-1 -/*.Binary-2 -/*.Icon-1 -/*.Icon-2 -/*.lst -/*.msm diff --git a/MSI/ZRCola/wxWidgets/Makefile b/MSI/ZRCola/wxWidgets/Makefile deleted file mode 100644 index 4327c6e..0000000 --- a/MSI/ZRCola/wxWidgets/Makefile +++ /dev/null @@ -1,94 +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 . -# - -!INCLUDE "..\..\..\include\MSIBuildCfg.mak" - -# Note: When changing WXWIDGETS_VER or WXWIDGETS_COMPILER, the DLL filenames will change. -# Then, you MUST change the component GUIDs as well. -WXWIDGETS_VER=311 -WXWIDGETS_COMPILER=_vc100 - -!IF "$(PLAT)" == "x64" -WXWIDGETS_PLAT=_x64 -!ELSE -WXWIDGETS_PLAT= -!ENDIF - -!IF "$(CFG)" == "Debug" -WXWIDGETS_CFG=ud -!ELSE -WXWIDGETS_CFG=u -!ENDIF - - -###################################################################### -# 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" -compwxbase.dll.Win32 {4C7F5A16-5B74-47D5-A405-57C7BD96F090} ZRCOLABINDIR 0 filewxbase.dll.Win32 -compwxbase_net.dll.Win32 {00534942-B21F-4401-BFE4-C7677F4BE3E5} ZRCOLABINDIR 0 filewxbase_net.dll.Win32 -compwxbase_xml.dll.Win32 {71E30748-DD22-4D8B-B26F-60C5150D9AAE} ZRCOLABINDIR 0 filewxbase_xml.dll.Win32 -compwxmsw_core.dll.Win32 {FB8D46B9-86DC-4590-8F0A-8294F6A45E6A} ZRCOLABINDIR 0 filewxwxmsw_core.dll.Win32 -compwxmsw_adv.dll.Win32 {7B7DB31D-1760-493A-BBE9-35237A6EF9E0} ZRCOLABINDIR 0 filewxmsw_adv.dll.Win32 -compwxmsw_aui.dll.Win32 {49CF9864-63B6-4F43-8EC7-7294B966B419} ZRCOLABINDIR 0 filewxmsw_aui.dll.Win32 -!ENDIF -!IF "$(PLAT)" == "x64" -compwxbase.dll.x64 {905D8859-BFD2-410A-81DB-93231088C066} ZRCOLABINDIR 256 filewxbase.dll.x64 -compwxbase_net.dll.x64 {8A0A49C8-DAEB-4983-8E8D-9DE30AE1D0B6} ZRCOLABINDIR 256 filewxbase_net.dll.x64 -compwxbase_xml.dll.x64 {24A5F181-EFE7-4542-8AAB-1D21DB74E954} ZRCOLABINDIR 256 filewxbase_xml.dll.x64 -compwxmsw_core.dll.x64 {F5B3F6E6-4FFB-4A79-A794-202D6F93F716} ZRCOLABINDIR 256 filewxwxmsw_core.dll.x64 -compwxmsw_adv.dll.x64 {D7722FB9-59BB-498F-93C3-78451471A023} ZRCOLABINDIR 256 filewxmsw_adv.dll.x64 -compwxmsw_aui.dll.x64 {FB703979-0E3D-458E-82DD-DAC33329FA9D} ZRCOLABINDIR 256 filewxmsw_aui.dll.x64 -!ENDIF -< 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 -filewxbase.dll.$(PLAT) compwxbase.dll.$(PLAT) WXBASE~1.DLL|wxbase$(WXWIDGETS_VER)$(WXWIDGETS_CFG)$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll 0 0 512 1 -filewxbase_net.dll.$(PLAT) compwxbase_net.dll.$(PLAT) WXBASE~2.DLL|wxbase$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_net$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll 0 0 512 1 -filewxbase_xml.dll.$(PLAT) compwxbase_xml.dll.$(PLAT) WXBASE~3.DLL|wxbase$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_xml$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll 0 0 512 1 -filewxwxmsw_core.dll.$(PLAT) compwxmsw_core.dll.$(PLAT) WXMSW3~1.DLL|wxmsw$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_core$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll 0 0 512 1 -filewxmsw_adv.dll.$(PLAT) compwxmsw_adv.dll.$(PLAT) WXMSW3~2.DLL|wxmsw$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_adv$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll 0 0 512 1 -filewxmsw_aui.dll.$(PLAT) compwxmsw_aui.dll.$(PLAT) WXMSW3~3.DLL|wxmsw$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_aui$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll 0 0 512 1 -< NUL reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" /v "00 ZRCola" /t REG_SZ /d "ZRCola" $(REG_FLAGS) > NUL -InstallwxWidgets :: \ - InstallwxWidgets_Debug_Win32 \ - InstallwxWidgets_Release_Win32 \ - InstallwxWidgets_Debug_x64 \ - InstallwxWidgets_Release_x64 - -InstallwxWidgets_Debug_Win32 :: \ - "$(OUTPUT_DIR)\Win32.Debug" \ - "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.dll" \ - "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.pdb" \ - "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.dll" \ - "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.pdb" \ - "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.dll" \ - "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.pdb" \ - "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.dll" \ - "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.pdb" \ - "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.dll" \ - "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.pdb" \ - "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.dll" \ - "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.pdb" - -InstallwxWidgets_Release_Win32 :: \ - "$(OUTPUT_DIR)\Win32.Release" \ - "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.dll" \ - "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.pdb" \ - "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.dll" \ - "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.pdb" \ - "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.dll" \ - "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.pdb" \ - "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.dll" \ - "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.pdb" \ - "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.dll" \ - "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.pdb" \ - "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.dll" \ - "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.pdb" - -InstallwxWidgets_Debug_x64 :: \ - "$(OUTPUT_DIR)\x64.Debug" \ - "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.dll" \ - "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.pdb" \ - "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.dll" \ - "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.pdb" \ - "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.dll" \ - "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.pdb" \ - "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.dll" \ - "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.pdb" \ - "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.dll" \ - "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.pdb" \ - "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.dll" \ - "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.pdb" - -InstallwxWidgets_Release_x64 :: \ - "$(OUTPUT_DIR)\x64.Release" \ - "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.dll" \ - "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.pdb" \ - "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.dll" \ - "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.pdb" \ - "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.dll" \ - "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.pdb" \ - "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.dll" \ - "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.pdb" \ - "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.dll" \ - "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.pdb" \ - "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.dll" \ - "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.pdb" - 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 @@ -408,150 +293,6 @@ Localization :: \ "$(WINDIR)\Fonts\ZRCola_BI.otf" : "$(OUTPUT_DIR)\ZRCola_BI.otf" copy /y $** $@ > NUL -"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_vc100.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_vc100.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311u_vc100.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311u_vc100.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_vc100_x64.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_vc100_x64.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_vc100_x64.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_vc100_x64.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_net_vc100.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_net_vc100.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311u_net_vc100.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311u_net_vc100.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_net_vc100_x64.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_net_vc100_x64.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_net_vc100_x64.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_net_vc100_x64.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_xml_vc100.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_xml_vc100.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311u_xml_vc100.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311u_xml_vc100.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_xml_vc100_x64.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_xml_vc100_x64.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_xml_vc100_x64.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_xml_vc100_x64.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_core_vc100.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_core_vc100.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_core_vc100.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_core_vc100.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_core_vc100_x64.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_core_vc100_x64.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_core_vc100_x64.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_core_vc100_x64.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_adv_vc100.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_adv_vc100.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_adv_vc100.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_adv_vc100.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_adv_vc100_x64.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_adv_vc100_x64.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_adv_vc100_x64.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_adv_vc100_x64.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_aui_vc100.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_aui_vc100.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_aui_vc100.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_aui_vc100.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_aui_vc100_x64.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_aui_vc100_x64.pdb" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_aui_vc100_x64.dll" - copy /y $** $@ > NUL - -"$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_aui_vc100_x64.pdb" - copy /y $** $@ > NUL - ###################################################################### # Shortcut creation @@ -583,57 +324,25 @@ Localization :: \ "$(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 InstallwxWidgets +"$(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 InstallwxWidgets_Release_Win32 +"$(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 InstallwxWidgets_Release_x64 +"$(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 InstallwxWidgets_Debug_x64 +"$(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" :: - "$(DEVENV10)" "ZRCola.sln" /build "Release|Win32" + msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln" /t:Build /p:Configuration=Release /p:Platform=x86 -"$(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" :: - "$(DEVENV10)" "ZRCola.sln" /build "Debug|Win32" + msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln" /t:Build /p:Configuration=Debug /p:Platform=x86 -"$(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" :: - "$(DEVENV10)" "ZRCola.sln" /build "Release|x64" + msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln" /t:Build /p:Configuration=Release /p:Platform=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" :: - "$(DEVENV10)" "ZRCola.sln" /build "Debug|x64" + msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln" /t:Build /p:Configuration=Debug /p:Platform=x64 "$(OUTPUT_DIR)\ZRCola32.ddf" : \ # "$(OUTPUT_DIR)\ZRCola.de_DE.32.2.msi" \ diff --git a/Updater b/Updater index c160d4b..ab2ff99 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit c160d4b9ebe586a199ae879c18aeb6f3ccfb0539 +Subproject commit ab2ff99b0d1aba2ac0caf34ccd2cb69915845944 diff --git a/ZRCola.sln b/ZRCola.sln index 34c7f91..3b09107 100644 --- a/ZRCola.sln +++ b/ZRCola.sln @@ -1,11 +1,13 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2016 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRCola", "ZRCola\ZRCola.vcxproj", "{CD9E4170-92DD-440E-980C-D15F62032249}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendDll-10.0.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-15.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CFEBC17E-C840-4507-BDE6-1EF5B52DDCC5}" ProjectSection(SolutionItems) = preProject @@ -16,86 +18,89 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\ 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-10.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-15.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updater", "Updater\Updater\build\Updater.vcxproj", "{990D8CF9-4457-4DC0-AA18-4968EF434741}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-10.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-15.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 + Debug|x86 = Debug|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CD9E4170-92DD-440E-980C-D15F62032249}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD9E4170-92DD-440E-980C-D15F62032249}.Debug|Win32.Build.0 = Debug|Win32 {CD9E4170-92DD-440E-980C-D15F62032249}.Debug|x64.ActiveCfg = Debug|x64 {CD9E4170-92DD-440E-980C-D15F62032249}.Debug|x64.Build.0 = Debug|x64 - {CD9E4170-92DD-440E-980C-D15F62032249}.Release|Win32.ActiveCfg = Release|Win32 - {CD9E4170-92DD-440E-980C-D15F62032249}.Release|Win32.Build.0 = Release|Win32 + {CD9E4170-92DD-440E-980C-D15F62032249}.Debug|x86.ActiveCfg = Debug|Win32 + {CD9E4170-92DD-440E-980C-D15F62032249}.Debug|x86.Build.0 = Debug|Win32 {CD9E4170-92DD-440E-980C-D15F62032249}.Release|x64.ActiveCfg = Release|x64 {CD9E4170-92DD-440E-980C-D15F62032249}.Release|x64.Build.0 = Release|x64 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.ActiveCfg = Debug|Win32 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.Build.0 = Debug|Win32 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.ActiveCfg = Debug|x64 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.Build.0 = Debug|x64 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.ActiveCfg = Release|Win32 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.Build.0 = Release|Win32 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.ActiveCfg = Release|x64 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.Build.0 = Release|x64 - {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|Win32.ActiveCfg = Debug|Win32 - {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|Win32.Build.0 = Debug|Win32 + {CD9E4170-92DD-440E-980C-D15F62032249}.Release|x86.ActiveCfg = Release|Win32 + {CD9E4170-92DD-440E-980C-D15F62032249}.Release|x86.Build.0 = Release|Win32 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.ActiveCfg = Debug|x64 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.Build.0 = Debug|x64 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x86.ActiveCfg = Debug|Win32 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x86.Build.0 = Debug|Win32 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.ActiveCfg = Release|x64 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.Build.0 = Release|x64 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x86.ActiveCfg = Release|Win32 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x86.Build.0 = Release|Win32 {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|x64.ActiveCfg = Debug|x64 {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|x64.Build.0 = Debug|x64 - {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|Win32.ActiveCfg = Release|Win32 - {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|Win32.Build.0 = Release|Win32 + {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|x86.ActiveCfg = Debug|Win32 + {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|x86.Build.0 = Debug|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 + {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x86.ActiveCfg = Release|Win32 + {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x86.Build.0 = Release|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}.Debug|x86.ActiveCfg = Debug|Win32 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x86.Build.0 = Debug|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 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x86.ActiveCfg = Release|Win32 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x86.Build.0 = Release|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}.Debug|x86.ActiveCfg = Debug|Win32 + {518777CC-0A59-4415-A12A-82751ED75343}.Debug|x86.Build.0 = Debug|Win32 {518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.ActiveCfg = Release|x64 {518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.Build.0 = Release|x64 - {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.ActiveCfg = Debug|Win32 - {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.Build.0 = Debug|Win32 + {518777CC-0A59-4415-A12A-82751ED75343}.Release|x86.ActiveCfg = Release|Win32 + {518777CC-0A59-4415-A12A-82751ED75343}.Release|x86.Build.0 = Release|Win32 {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x64.ActiveCfg = Debug|x64 {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x64.Build.0 = Debug|x64 - {990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|Win32.ActiveCfg = Release|Win32 - {990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|Win32.Build.0 = Release|Win32 + {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x86.ActiveCfg = Debug|Win32 + {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x86.Build.0 = Debug|Win32 {990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x64.ActiveCfg = Release|x64 {990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x64.Build.0 = Release|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32 + {990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x86.ActiveCfg = Release|Win32 + {990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x86.Build.0 = Release|Win32 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x86.ActiveCfg = Debug|Win32 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x86.Build.0 = Debug|Win32 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x86.ActiveCfg = Release|Win32 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {A3A36689-AC35-4026-93DA-A3BA0C0E767C} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} + {D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {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} {990D8CF9-4457-4DC0-AA18-4968EF434741} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} {47399D91-7EB9-41DE-B521-514BA5DB0C43} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {EECB5329-0607-4D77-8BC0-48BD8C08BEF9} + EndGlobalSection EndGlobal diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile index 490e12a..8edaff3 100644 --- a/ZRCola/MSIBuild/Makefile +++ b/ZRCola/MSIBuild/Makefile @@ -241,16 +241,6 @@ 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 compUpdater.dll.$(PLAT) -featZRCola compwxbase.dll.$(PLAT) -featZRCola compwxbase_net.dll.$(PLAT) -featZRCola compwxbase_xml.dll.$(PLAT) -featZRCola compwxmsw_core.dll.$(PLAT) -featZRCola compwxmsw_adv.dll.$(PLAT) -featZRCola compwxmsw_aui.dll.$(PLAT) featZRCola compLocalizationRepositoryPath featZRCola compLanguage featZRCola compDatabasePath diff --git a/ZRCola/ZRCola.vcxproj b/ZRCola/ZRCola.vcxproj index 99db214..c2f6a62 100644 --- a/ZRCola/ZRCola.vcxproj +++ b/ZRCola/ZRCola.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,55 +21,60 @@ {CD9E4170-92DD-440E-980C-D15F62032249} ZRCola + 10.0.17134.0 Application true Unicode + v141 Application true Unicode + v141 Application false true Unicode + v141 Application false true Unicode + v141 - - + + - - + + - - + + - - + + @@ -117,11 +122,11 @@ {3c61929e-7289-4101-8d0a-da22d6e1aea8} - + {47399d91-7eb9-41de-b521-514ba5db0c43} - - {a3a36689-ac35-4026-93da-a3ba0c0e767c} + + {D3E29951-D9F5-486D-A167-20AE8E90B1FA} {990d8cf9-4457-4dc0-aa18-4968ef434741} diff --git a/ZRColaCompile/ZRColaCompile.vcxproj b/ZRColaCompile/ZRColaCompile.vcxproj index 3ba751c..2ae2915 100644 --- a/ZRColaCompile/ZRColaCompile.vcxproj +++ b/ZRColaCompile/ZRColaCompile.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -13,32 +13,35 @@ {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4} ZRColaCompile + 10.0.17134.0 Application true Unicode + v141 Application false true Unicode + v141 - - + + - - + + @@ -63,11 +66,11 @@ {3c61929e-7289-4101-8d0a-da22d6e1aea8} - + {47399d91-7eb9-41de-b521-514ba5db0c43} - - {a3a36689-ac35-4026-93da-a3ba0c0e767c} + + {D3E29951-D9F5-486D-A167-20AE8E90B1FA} diff --git a/ZRColaInstall/ZRColaInstallDe.vcxproj b/ZRColaInstall/ZRColaInstallDe.vcxproj index dcc9ac9..0337e2f 100644 --- a/ZRColaInstall/ZRColaInstallDe.vcxproj +++ b/ZRColaInstall/ZRColaInstallDe.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {620D6AC0-C8FF-4185-B820-DB1503ACB95C} Win32Proj ZRColaInstallDe + 10.0.17134.0 Application true Unicode + v141 Application false true Unicode + v141 diff --git a/ZRColaInstall/ZRColaInstallEn.vcxproj b/ZRColaInstall/ZRColaInstallEn.vcxproj index 394bf03..9ba9271 100644 --- a/ZRColaInstall/ZRColaInstallEn.vcxproj +++ b/ZRColaInstall/ZRColaInstallEn.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {5BD95B95-38B0-4C7D-9471-F99CA1203DF4} Win32Proj ZRColaInstallEn + 10.0.17134.0 Application true Unicode + v141 Application false true Unicode + v141 diff --git a/ZRColaInstall/ZRColaInstallRu.vcxproj b/ZRColaInstall/ZRColaInstallRu.vcxproj index 0d1c445..88ece33 100644 --- a/ZRColaInstall/ZRColaInstallRu.vcxproj +++ b/ZRColaInstall/ZRColaInstallRu.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {2551B561-5E5B-497E-AE01-11519F91EF19} Win32Proj ZRColaInstallRu + 10.0.17134.0 Application true Unicode + v141 Application false true Unicode + v141 diff --git a/ZRColaInstall/ZRColaInstallSl.vcxproj b/ZRColaInstall/ZRColaInstallSl.vcxproj index d1f1883..61f3c3e 100644 --- a/ZRColaInstall/ZRColaInstallSl.vcxproj +++ b/ZRColaInstall/ZRColaInstallSl.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -14,18 +14,21 @@ {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A} Win32Proj ZRColaInstallSl + 10.0.17134.0 Application true Unicode + v141 Application false true Unicode + v141 diff --git a/ZRColaUtils.sln b/ZRColaUtils.sln index 7d97e12..b0a3ecb 100644 --- a/ZRColaUtils.sln +++ b/ZRColaUtils.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2016 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\build\libZRCola.vcxproj", "{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}" @@ -12,9 +14,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaCompile", "ZRColaCompile\ZRColaCompile.vcxproj", "{87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendDll-10.0.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-15.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-10.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-15.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}" EndProject @@ -28,99 +30,70 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallEn", "ZRColaIn EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallRu", "ZRColaInstall\ZRColaInstallRu.vcxproj", "{2551B561-5E5B-497E-AE01-11519F91EF19}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-10.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-15.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|Win32.ActiveCfg = Debug|Win32 - {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|Win32.Build.0 = Debug|Win32 - {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|x64.ActiveCfg = Debug|x64 - {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|x64.Build.0 = Debug|x64 - {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|Win32.ActiveCfg = Release|Win32 - {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 - {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}.Debug|Win32.ActiveCfg = Debug|Win32 - {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}.Debug|Win32.Build.0 = Debug|Win32 - {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}.Debug|x64.ActiveCfg = Debug|Win32 - {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}.Release|Win32.ActiveCfg = Release|Win32 - {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}.Release|Win32.Build.0 = Release|Win32 - {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}.Release|x64.ActiveCfg = Release|Win32 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.ActiveCfg = Debug|Win32 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.Build.0 = Debug|Win32 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.ActiveCfg = Debug|x64 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.Build.0 = Debug|x64 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.ActiveCfg = Release|Win32 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.Build.0 = Release|Win32 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.ActiveCfg = Release|x64 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.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 - {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 - {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Debug|Win32.ActiveCfg = Debug|Win32 - {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Debug|Win32.Build.0 = Debug|Win32 - {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Debug|x64.ActiveCfg = Debug|Win32 - {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Release|Win32.ActiveCfg = Release|Win32 - {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Release|Win32.Build.0 = Release|Win32 - {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Release|x64.ActiveCfg = Release|Win32 - {620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Debug|Win32.ActiveCfg = Debug|Win32 - {620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Debug|Win32.Build.0 = Debug|Win32 - {620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Debug|x64.ActiveCfg = Debug|Win32 - {620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Release|Win32.ActiveCfg = Release|Win32 - {620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Release|Win32.Build.0 = Release|Win32 - {620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Release|x64.ActiveCfg = Release|Win32 - {5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Debug|Win32.ActiveCfg = Debug|Win32 - {5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Debug|Win32.Build.0 = Debug|Win32 - {5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Debug|x64.ActiveCfg = Debug|Win32 - {5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Release|Win32.ActiveCfg = Release|Win32 - {5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Release|Win32.Build.0 = Release|Win32 - {5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Release|x64.ActiveCfg = Release|Win32 - {2551B561-5E5B-497E-AE01-11519F91EF19}.Debug|Win32.ActiveCfg = Debug|Win32 - {2551B561-5E5B-497E-AE01-11519F91EF19}.Debug|Win32.Build.0 = Debug|Win32 - {2551B561-5E5B-497E-AE01-11519F91EF19}.Debug|x64.ActiveCfg = Debug|Win32 - {2551B561-5E5B-497E-AE01-11519F91EF19}.Release|Win32.ActiveCfg = Release|Win32 - {2551B561-5E5B-497E-AE01-11519F91EF19}.Release|Win32.Build.0 = Release|Win32 - {2551B561-5E5B-497E-AE01-11519F91EF19}.Release|x64.ActiveCfg = Release|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64 + {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|x86.ActiveCfg = Debug|Win32 + {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|x86.Build.0 = Debug|Win32 + {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x86.ActiveCfg = Release|Win32 + {3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x86.Build.0 = Release|Win32 + {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}.Debug|x86.ActiveCfg = Debug|Win32 + {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}.Debug|x86.Build.0 = Debug|Win32 + {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}.Release|x86.ActiveCfg = Release|Win32 + {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}.Release|x86.Build.0 = Release|Win32 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x86.ActiveCfg = Debug|Win32 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x86.Build.0 = Debug|Win32 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x86.ActiveCfg = Release|Win32 + {D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x86.Build.0 = Release|Win32 + {518777CC-0A59-4415-A12A-82751ED75343}.Debug|x86.ActiveCfg = Debug|Win32 + {518777CC-0A59-4415-A12A-82751ED75343}.Debug|x86.Build.0 = Debug|Win32 + {518777CC-0A59-4415-A12A-82751ED75343}.Release|x86.ActiveCfg = Release|Win32 + {518777CC-0A59-4415-A12A-82751ED75343}.Release|x86.Build.0 = Release|Win32 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x86.ActiveCfg = Debug|Win32 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x86.Build.0 = Debug|Win32 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x86.ActiveCfg = Release|Win32 + {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x86.Build.0 = Release|Win32 + {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Debug|x86.ActiveCfg = Debug|Win32 + {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Debug|x86.Build.0 = Debug|Win32 + {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Release|x86.ActiveCfg = Release|Win32 + {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Release|x86.Build.0 = Release|Win32 + {620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Debug|x86.ActiveCfg = Debug|Win32 + {620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Debug|x86.Build.0 = Debug|Win32 + {620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Release|x86.ActiveCfg = Release|Win32 + {620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Release|x86.Build.0 = Release|Win32 + {5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Debug|x86.ActiveCfg = Debug|Win32 + {5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Debug|x86.Build.0 = Debug|Win32 + {5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Release|x86.ActiveCfg = Release|Win32 + {5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Release|x86.Build.0 = Release|Win32 + {2551B561-5E5B-497E-AE01-11519F91EF19}.Debug|x86.ActiveCfg = Debug|Win32 + {2551B561-5E5B-497E-AE01-11519F91EF19}.Debug|x86.Build.0 = Debug|Win32 + {2551B561-5E5B-497E-AE01-11519F91EF19}.Release|x86.ActiveCfg = Release|Win32 + {2551B561-5E5B-497E-AE01-11519F91EF19}.Release|x86.Build.0 = Release|Win32 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x86.ActiveCfg = Debug|Win32 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x86.Build.0 = Debug|Win32 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x86.ActiveCfg = Release|Win32 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {3C61929E-7289-4101-8D0A-DA22D6E1AEA8} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} - {A3A36689-AC35-4026-93DA-A3BA0C0E767C} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} + {D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} {518777CC-0A59-4415-A12A-82751ED75343} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} {C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} - {47399D91-7EB9-41DE-B521-514BA5DB0C43} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A} = {7F5D45A3-B3D2-4B1D-B258-9B83395786E6} {620D6AC0-C8FF-4185-B820-DB1503ACB95C} = {7F5D45A3-B3D2-4B1D-B258-9B83395786E6} {5BD95B95-38B0-4C7D-9471-F99CA1203DF4} = {7F5D45A3-B3D2-4B1D-B258-9B83395786E6} {2551B561-5E5B-497E-AE01-11519F91EF19} = {7F5D45A3-B3D2-4B1D-B258-9B83395786E6} + {47399D91-7EB9-41DE-B521-514BA5DB0C43} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {22B0355E-423C-4ACC-81F8-DAD72A8BEC0E} EndGlobalSection EndGlobal diff --git a/include/Debug.props b/include/Debug.props index c03b7d3..305af2b 100644 --- a/include/Debug.props +++ b/include/Debug.props @@ -1,6 +1,6 @@