diff --git a/MSI/MSIBuild b/MSI/MSIBuild index a53c4e2..50a0c09 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit a53c4e2b8786023fd3afdb89932d84129521710d +Subproject commit 50a0c09ec69ec18f6529b9b09c417703af6fc17c diff --git a/MSI/MSICA b/MSI/MSICA index b9dbb7f..f98cfef 160000 --- a/MSI/MSICA +++ b/MSI/MSICA @@ -1 +1 @@ -Subproject commit b9dbb7f904f8dc2db2a7ca11ea8eed71fccdbf3a +Subproject commit f98cfef1e7a38bea6ab70547712f4ad2d930d06a diff --git a/MakefileLang.mak b/MakefileLang.mak index 4a6097d..009c0c8 100644 Binary files a/MakefileLang.mak and b/MakefileLang.mak differ diff --git a/Updater b/Updater index 5b1c1fc..0ba186c 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit 5b1c1fc23d603c5aa8192baca6e09f3aab0d18ac +Subproject commit 0ba186c9846ca05a4b867ac8842ce8b7ace25d15 diff --git a/ZRCola.sln b/ZRCola.sln index 3f4c211..7b4656d 100644 --- a/ZRCola.sln +++ b/ZRCola.sln @@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRCola", "ZRCola\ZRCola.vcx 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\wxExtendLib-16.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib.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 @@ -18,11 +18,11 @@ 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-16.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.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-16.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/ZRCola/ZRCola.props b/ZRCola/ZRCola.props deleted file mode 100644 index b1f4d67..0000000 --- a/ZRCola/ZRCola.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - ..\output\$(Platform).$(Configuration)\ - - - - ..\lib\wxExtend\include;..\Updater\Updater\include;..\lib\stdex\include;..\lib\WinStd\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include - - - true - - - ..\Updater\Updater\include;%(AdditionalIncludeDirectories) - - - - \ No newline at end of file diff --git a/ZRCola/ZRCola.vcxproj b/ZRCola/ZRCola.vcxproj index 228e372..2656413 100644 --- a/ZRCola/ZRCola.vcxproj +++ b/ZRCola/ZRCola.vcxproj @@ -29,98 +29,47 @@ {CD9E4170-92DD-440E-980C-D15F62032249} ZRCola - 10.0 - + Application + Unicode + $(DefaultPlatformToolset) + + true - Unicode - v142 - - Application - true - Unicode - v142 - - - Application - true - Unicode - v142 - true - - - Application - false + true - Unicode - v142 - - Application - false - true - Unicode - v142 - - - Application - false - true - Unicode - v142 + true - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + ..\output\$(Platform).$(Configuration)\ + + + + ..\lib\wxExtend\include;..\Updater\Updater\include;..\lib\stdex\include;..\lib\WinStd\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include + + + true + + + ..\Updater\Updater\include;%(AdditionalIncludeDirectories) + + - Create - Create - Create - Create - Create - Create + Create @@ -159,10 +108,10 @@ {3c61929e-7289-4101-8d0a-da22d6e1aea8} - + {47399d91-7eb9-41de-b521-514ba5db0c43} - + {D3E29951-D9F5-486D-A167-20AE8E90B1FA} diff --git a/ZRColaCompile/ZRColaCompile.props b/ZRColaCompile/ZRColaCompile.props deleted file mode 100644 index 1e9a373..0000000 --- a/ZRColaCompile/ZRColaCompile.props +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - ..\output\$(Platform).$(Configuration)\ - - - - ..\lib\wxExtend\include;..\lib\WinStd\include;..\lib\stdex\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include;%(AdditionalIncludeDirectories) - _CONSOLE;%(PreprocessorDefinitions) - - - Console - - - - \ No newline at end of file diff --git a/ZRColaCompile/ZRColaCompile.vcxproj b/ZRColaCompile/ZRColaCompile.vcxproj index fcabcb0..e477871 100644 --- a/ZRColaCompile/ZRColaCompile.vcxproj +++ b/ZRColaCompile/ZRColaCompile.vcxproj @@ -13,45 +13,45 @@ {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4} ZRColaCompile - 10.0 - + Application - true Unicode - v142 + $(DefaultPlatformToolset) - - Application - false + + true + + true - Unicode - v142 - - - + + - - - - - - - + + ..\output\$(Platform).$(Configuration)\ + + + + ..\lib\wxExtend\include;..\lib\WinStd\include;..\lib\stdex\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include;%(AdditionalIncludeDirectories) + _CONSOLE;%(PreprocessorDefinitions) + + + Console + + - Create - Create + Create @@ -66,10 +66,10 @@ {3c61929e-7289-4101-8d0a-da22d6e1aea8} - + {47399d91-7eb9-41de-b521-514ba5db0c43} - + {D3E29951-D9F5-486D-A167-20AE8E90B1FA} diff --git a/ZRColaInstall/ZRColaInstall.props b/ZRColaInstall/ZRColaInstall.props deleted file mode 100644 index a39c463..0000000 --- a/ZRColaInstall/ZRColaInstall.props +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - ..\output\$(Platform).$(Configuration)\ - - - - MultiThreadedDebug - - - - - MultiThreaded - - - - - - Create - Create - - - - - - - - - \ No newline at end of file diff --git a/ZRColaInstall/ZRColaInstall.vcxproj b/ZRColaInstall/ZRColaInstall.vcxproj new file mode 100644 index 0000000..2dea25a --- /dev/null +++ b/ZRColaInstall/ZRColaInstall.vcxproj @@ -0,0 +1,74 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + En + + + {5BD95B95-38B0-4C7D-9471-F99CA1203DF4} + ZRColaInstall$(Language) + ZRColaInstall$(Language) + + + + Application + Unicode + $(DefaultPlatformToolset) + + + true + + + true + + + + + + + + + + + temp\$(ProjectName).$(Platform).$(Configuration).$(PlatformToolset)\ + ..\output\$(Platform).$(Configuration)\ + + + + ZRCOLA_INSTALL_LANG="$(Language)";%(PreprocessorDefinitions) + + + + + MultiThreadedDebug + + + + + MultiThreaded + + + + + + Create + + + + + + + + + + + \ No newline at end of file diff --git a/ZRColaInstall/ZRColaInstallDe.vcxproj.filters b/ZRColaInstall/ZRColaInstall.vcxproj.filters similarity index 100% rename from ZRColaInstall/ZRColaInstallDe.vcxproj.filters rename to ZRColaInstall/ZRColaInstall.vcxproj.filters diff --git a/ZRColaInstall/ZRColaInstallDe.vcxproj b/ZRColaInstall/ZRColaInstallDe.vcxproj deleted file mode 100644 index 77020c9..0000000 --- a/ZRColaInstall/ZRColaInstallDe.vcxproj +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {620D6AC0-C8FF-4185-B820-DB1503ACB95C} - Win32Proj - ZRColaInstallDe - 10.0 - - - - Application - true - Unicode - v142 - - - Application - false - true - Unicode - v142 - - - - - - - - - - - - - - - - ZRCOLA_INSTALL_LANG="De";%(PreprocessorDefinitions) - - - - - ZRCOLA_INSTALL_LANG="De";%(PreprocessorDefinitions) - - - - - - - \ No newline at end of file diff --git a/ZRColaInstall/ZRColaInstallEn.vcxproj b/ZRColaInstall/ZRColaInstallEn.vcxproj deleted file mode 100644 index 584464e..0000000 --- a/ZRColaInstall/ZRColaInstallEn.vcxproj +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {5BD95B95-38B0-4C7D-9471-F99CA1203DF4} - Win32Proj - ZRColaInstallEn - 10.0 - - - - Application - true - Unicode - v142 - - - Application - false - true - Unicode - v142 - - - - - - - - - - - - - - - - ZRCOLA_INSTALL_LANG="En";%(PreprocessorDefinitions) - - - - - ZRCOLA_INSTALL_LANG="En";%(PreprocessorDefinitions) - - - - - - - \ No newline at end of file diff --git a/ZRColaInstall/ZRColaInstallEn.vcxproj.filters b/ZRColaInstall/ZRColaInstallEn.vcxproj.filters deleted file mode 100644 index 82069d8..0000000 --- a/ZRColaInstall/ZRColaInstallEn.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/ZRColaInstall/ZRColaInstallRu.vcxproj b/ZRColaInstall/ZRColaInstallRu.vcxproj deleted file mode 100644 index 92b036e..0000000 --- a/ZRColaInstall/ZRColaInstallRu.vcxproj +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {2551B561-5E5B-497E-AE01-11519F91EF19} - Win32Proj - ZRColaInstallRu - 10.0 - - - - Application - true - Unicode - v142 - - - Application - false - true - Unicode - v142 - - - - - - - - - - - - - - - - ZRCOLA_INSTALL_LANG="Ru";%(PreprocessorDefinitions) - - - - - ZRCOLA_INSTALL_LANG="Ru";%(PreprocessorDefinitions) - - - - - - - \ No newline at end of file diff --git a/ZRColaInstall/ZRColaInstallRu.vcxproj.filters b/ZRColaInstall/ZRColaInstallRu.vcxproj.filters deleted file mode 100644 index 82069d8..0000000 --- a/ZRColaInstall/ZRColaInstallRu.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/ZRColaInstall/ZRColaInstallSl.vcxproj b/ZRColaInstall/ZRColaInstallSl.vcxproj deleted file mode 100644 index 4f240b9..0000000 --- a/ZRColaInstall/ZRColaInstallSl.vcxproj +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A} - Win32Proj - ZRColaInstallSl - 10.0 - - - - Application - true - Unicode - v142 - - - Application - false - true - Unicode - v142 - - - - - - - - - - - - - - - - ZRCOLA_INSTALL_LANG="Sl";%(PreprocessorDefinitions) - - - - - ZRCOLA_INSTALL_LANG="Sl";%(PreprocessorDefinitions) - - - - - - - \ No newline at end of file diff --git a/ZRColaInstall/ZRColaInstallSl.vcxproj.filters b/ZRColaInstall/ZRColaInstallSl.vcxproj.filters deleted file mode 100644 index 82069d8..0000000 --- a/ZRColaInstall/ZRColaInstallSl.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/ZRColaUtils.sln b/ZRColaUtils.sln index 4b8fc60..dead029 100644 --- a/ZRColaUtils.sln +++ b/ZRColaUtils.sln @@ -14,23 +14,15 @@ 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\wxExtendLib-16.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-16.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.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 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ZRColaInstall", "ZRColaInstall", "{7F5D45A3-B3D2-4B1D-B258-9B83395786E6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstall", "ZRColaInstall\ZRColaInstall.vcxproj", "{5BD95B95-38B0-4C7D-9471-F99CA1203DF4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallSl", "ZRColaInstall\ZRColaInstallSl.vcxproj", "{0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallDe", "ZRColaInstall\ZRColaInstallDe.vcxproj", "{620D6AC0-C8FF-4185-B820-DB1503ACB95C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallEn", "ZRColaInstall\ZRColaInstallEn.vcxproj", "{5BD95B95-38B0-4C7D-9471-F99CA1203DF4}" -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-16.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -58,20 +50,10 @@ Global {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.Build.0 = Debug|Win32 {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.ActiveCfg = Release|Win32 {C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.Build.0 = Release|Win32 - {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}.Release|Win32.ActiveCfg = Release|Win32 - {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A}.Release|Win32.Build.0 = Release|Win32 - {620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Debug|Win32.ActiveCfg = Debug|Win32 - {620D6AC0-C8FF-4185-B820-DB1503ACB95C}.Release|Win32.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}.Release|Win32.ActiveCfg = Release|Win32 {5BD95B95-38B0-4C7D-9471-F99CA1203DF4}.Release|Win32.Build.0 = 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}.Release|Win32.ActiveCfg = Release|Win32 - {2551B561-5E5B-497E-AE01-11519F91EF19}.Release|Win32.Build.0 = 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}.Release|Win32.ActiveCfg = Release|Win32 @@ -85,10 +67,6 @@ Global {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} - {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 diff --git a/include/ARM64.props b/include/ARM64.props index 02678b3..a429c5d 100644 --- a/include/ARM64.props +++ b/include/ARM64.props @@ -21,7 +21,6 @@ - <_PropertySheetDisplayName>ZRCola ARM64 $(WXWIN)\lib\vc$(PlatformToolsetVersion)_arm64_lib;$(LibraryPath) @@ -39,5 +38,4 @@ advapi32.lib;ole32.lib;shell32.lib;%(AdditionalDependencies) - \ No newline at end of file diff --git a/include/Debug.props b/include/Debug.props index 068e9e9..5ffdce7 100644 --- a/include/Debug.props +++ b/include/Debug.props @@ -19,7 +19,6 @@ --> - <_PropertySheetDisplayName>ZRCola Debug @@ -37,7 +36,6 @@ false - diff --git a/include/Release.props b/include/Release.props index 554bd58..329bd86 100644 --- a/include/Release.props +++ b/include/Release.props @@ -19,7 +19,6 @@ --> - <_PropertySheetDisplayName>ZRCola Release @@ -39,7 +38,6 @@ NDEBUG;%(PreprocessorDefinitions) - diff --git a/include/Win32.props b/include/Win32.props index 1cafd16..d58421b 100644 --- a/include/Win32.props +++ b/include/Win32.props @@ -21,7 +21,6 @@ - <_PropertySheetDisplayName>ZRCola Win32 $(WXWIN)\lib\vc$(PlatformToolsetVersion)_lib;$(LibraryPath) @@ -35,5 +34,4 @@ MachineX86 - \ No newline at end of file diff --git a/include/common.props b/include/common.props index 5cbee1b..6c33685 100644 --- a/include/common.props +++ b/include/common.props @@ -59,5 +59,4 @@ $(OutDir)..\locale\%(Filename)\$(ProjectName).mo - \ No newline at end of file diff --git a/include/x64.props b/include/x64.props index b5c03b7..4ee7b1c 100644 --- a/include/x64.props +++ b/include/x64.props @@ -21,7 +21,6 @@ - <_PropertySheetDisplayName>ZRCola x64 $(WXWIN)\lib\vc$(PlatformToolsetVersion)_x64_lib;$(LibraryPath) @@ -35,5 +34,4 @@ MachineX64 - \ No newline at end of file diff --git a/lib/WinStd b/lib/WinStd index 82935bd..27f3946 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 82935bd8e0b10f1c29149d2c1639b64392f575cd +Subproject commit 27f3946c4feaaf5a9387366a41262d3e97ea08d9 diff --git a/lib/libZRCola/build/libZRCola.props b/lib/libZRCola/build/libZRCola.props deleted file mode 100644 index 33ec591..0000000 --- a/lib/libZRCola/build/libZRCola.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - 10 - - - ..\..\..\output\$(Platform).$(Configuration)\ - - - - ..\..\stdex\include;%(AdditionalIncludeDirectories) - - - - - $(libZRColaVersion) - - - \ No newline at end of file diff --git a/lib/libZRCola/build/libZRCola.vcxproj b/lib/libZRCola/build/libZRCola.vcxproj index 741351a..2aecd35 100644 --- a/lib/libZRCola/build/libZRCola.vcxproj +++ b/lib/libZRCola/build/libZRCola.vcxproj @@ -26,18 +26,45 @@ x64 + + {3C61929E-7289-4101-8D0A-DA22D6E1AEA8} + libZRCola + + + + StaticLibrary + Unicode + $(DefaultPlatformToolset) + + + true + + + true + + + true + + + + + + + + + + + + ..\..\stdex\include;%(AdditionalIncludeDirectories) + + - Create - Create - Create - Create - Create - Create + Create @@ -50,100 +77,6 @@ - - {3C61929E-7289-4101-8D0A-DA22D6E1AEA8} - libZRCola - 10.0 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - true - - - StaticLibrary - false - true - Unicode - v142 - - - StaticLibrary - false - true - Unicode - v142 - - - StaticLibrary - false - true - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/lib/libZRColaUI/build/libZRColaUI.props b/lib/libZRColaUI/build/libZRColaUI.props deleted file mode 100644 index b0ce79d..0000000 --- a/lib/libZRColaUI/build/libZRColaUI.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - 10 - - - ..\..\..\output\$(Platform).$(Configuration)\ - - - - ..\..\stdex\include;..\..\wxExtend\include;..\..\libZRCola\include;%(AdditionalIncludeDirectories) - - - - - $(libZRColaUIVersion) - - - \ No newline at end of file diff --git a/lib/libZRColaUI/build/libZRColaUI.vcxproj b/lib/libZRColaUI/build/libZRColaUI.vcxproj index 657ba39..0dffeb1 100644 --- a/lib/libZRColaUI/build/libZRColaUI.vcxproj +++ b/lib/libZRColaUI/build/libZRColaUI.vcxproj @@ -26,15 +26,45 @@ x64 + + {C0A84BD2-3870-4CD6-B281-0AB322E3C579} + libZRColaUI + + + + StaticLibrary + Unicode + $(DefaultPlatformToolset) + + + true + + + true + + + true + + + + + + + + + + + ..\..\..\output\$(Platform).$(Configuration)\ + + + + ..\..\stdex\include;..\..\wxExtend\include;..\..\libZRCola\include;%(AdditionalIncludeDirectories) + + - Create - Create - Create - Create - Create - Create + Create @@ -50,99 +80,6 @@ - - {C0A84BD2-3870-4CD6-B281-0AB322E3C579} - libZRColaUI - 10.0 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - true - - - StaticLibrary - false - true - Unicode - v142 - - - StaticLibrary - false - true - Unicode - v142 - - - StaticLibrary - false - true - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/stdex b/lib/stdex index 3d90357..c694b22 160000 --- a/lib/stdex +++ b/lib/stdex @@ -1 +1 @@ -Subproject commit 3d903579052ee07e3c4ee5b0c97daa3fee000b64 +Subproject commit c694b22faec6f1d1626b18ceb399df0aae26bf10 diff --git a/lib/wxExtend b/lib/wxExtend index 22acac4..bbfb70f 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit 22acac44f1010ff2d27eb50e7b94a537ae06cb61 +Subproject commit bbfb70f7116273feac35d60462112569c6e635ca