diff --git a/musikcube.sln b/musikcube.sln index 534eaad3e..dee39986d 100644 --- a/musikcube.sln +++ b/musikcube.sln @@ -58,156 +58,304 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_c_demo", "src\core_c_d EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 + Debug-Con|Win32 = Debug-Con|Win32 + Debug-Con|Win64 = Debug-Con|Win64 + Debug-Win|Win32 = Debug-Win|Win32 + Debug-Win|Win64 = Debug-Win|Win64 + Release-Con|Win32 = Release-Con|Win32 + Release-Con|Win64 = Release-Con|Win64 + Release-Win|Win32 = Release-Win|Win32 + Release-Win|Win64 = Release-Win|Win64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug|Win32.ActiveCfg = Debug|Win32 - {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug|Win32.Build.0 = Debug|Win32 - {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug|x64.ActiveCfg = Debug|x64 - {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug|x64.Build.0 = Debug|x64 - {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release|Win32.ActiveCfg = Release|Win32 - {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release|Win32.Build.0 = Release|Win32 - {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release|x64.ActiveCfg = Release|x64 - {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release|x64.Build.0 = Release|x64 - {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug|Win32.ActiveCfg = Debug|Win32 - {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug|Win32.Build.0 = Debug|Win32 - {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug|x64.ActiveCfg = Debug|x64 - {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug|x64.Build.0 = Debug|x64 - {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release|Win32.ActiveCfg = Release|Win32 - {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release|Win32.Build.0 = Release|Win32 - {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release|x64.ActiveCfg = Release|x64 - {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release|x64.Build.0 = Release|x64 - {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Debug|Win32.ActiveCfg = Debug|Win32 - {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Debug|Win32.Build.0 = Debug|Win32 - {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Debug|x64.ActiveCfg = Debug|x64 - {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Debug|x64.Build.0 = Debug|x64 - {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Release|Win32.ActiveCfg = Release|Win32 - {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Release|Win32.Build.0 = Release|Win32 - {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Release|x64.ActiveCfg = Release|x64 - {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Release|x64.Build.0 = Release|x64 - {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Debug|Win32.ActiveCfg = Debug|Win32 - {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Debug|Win32.Build.0 = Debug|Win32 - {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Debug|x64.ActiveCfg = Debug|x64 - {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Debug|x64.Build.0 = Debug|x64 - {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release|Win32.ActiveCfg = Release|Win32 - {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release|Win32.Build.0 = Release|Win32 - {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release|x64.ActiveCfg = Release|x64 - {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release|x64.Build.0 = Release|x64 - {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug|Win32.ActiveCfg = Debug|Win32 - {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug|Win32.Build.0 = Debug|Win32 - {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug|x64.ActiveCfg = Debug|x64 - {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug|x64.Build.0 = Debug|x64 - {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release|Win32.ActiveCfg = Release|Win32 - {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release|Win32.Build.0 = Release|Win32 - {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release|x64.ActiveCfg = Release|x64 - {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release|x64.Build.0 = Release|x64 - {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug|Win32.ActiveCfg = Debug|Win32 - {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug|Win32.Build.0 = Debug|Win32 - {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug|x64.ActiveCfg = Debug|x64 - {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug|x64.Build.0 = Debug|x64 - {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release|Win32.ActiveCfg = Release|Win32 - {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release|Win32.Build.0 = Release|Win32 - {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release|x64.ActiveCfg = Release|x64 - {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release|x64.Build.0 = Release|x64 - {3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug|Win32.ActiveCfg = Debug|Win32 - {3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug|Win32.Build.0 = Debug|Win32 - {3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug|x64.ActiveCfg = Debug|x64 - {3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug|x64.Build.0 = Debug|x64 - {3E30064E-B9C4-4690-8AC2-2C694176A319}.Release|Win32.ActiveCfg = Release|Win32 - {3E30064E-B9C4-4690-8AC2-2C694176A319}.Release|Win32.Build.0 = Release|Win32 - {3E30064E-B9C4-4690-8AC2-2C694176A319}.Release|x64.ActiveCfg = Release|x64 - {3E30064E-B9C4-4690-8AC2-2C694176A319}.Release|x64.Build.0 = Release|x64 - {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug|Win32.ActiveCfg = Debug|Win32 - {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug|Win32.Build.0 = Debug|Win32 - {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug|x64.ActiveCfg = Debug|x64 - {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug|x64.Build.0 = Debug|x64 - {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release|Win32.ActiveCfg = Release|Win32 - {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release|Win32.Build.0 = Release|Win32 - {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release|x64.ActiveCfg = Release|x64 - {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release|x64.Build.0 = Release|x64 - {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug|Win32.ActiveCfg = Debug|Win32 - {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug|Win32.Build.0 = Debug|Win32 - {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug|x64.ActiveCfg = Debug|x64 - {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug|x64.Build.0 = Debug|x64 - {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release|Win32.ActiveCfg = Release|Win32 - {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release|Win32.Build.0 = Release|Win32 - {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release|x64.ActiveCfg = Release|x64 - {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release|x64.Build.0 = Release|x64 - {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug|Win32.ActiveCfg = Debug|Win32 - {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug|Win32.Build.0 = Debug|Win32 - {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug|x64.ActiveCfg = Debug|x64 - {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug|x64.Build.0 = Debug|x64 - {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release|Win32.ActiveCfg = Release|Win32 - {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release|Win32.Build.0 = Release|Win32 - {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release|x64.ActiveCfg = Release|x64 - {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release|x64.Build.0 = Release|x64 - {BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug|Win32.ActiveCfg = Debug|Win32 - {BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug|Win32.Build.0 = Debug|Win32 - {BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug|x64.ActiveCfg = Debug|x64 - {BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug|x64.Build.0 = Debug|x64 - {BA3902E0-8915-4E59-AD3B-F9960507F234}.Release|Win32.ActiveCfg = Release|Win32 - {BA3902E0-8915-4E59-AD3B-F9960507F234}.Release|Win32.Build.0 = Release|Win32 - {BA3902E0-8915-4E59-AD3B-F9960507F234}.Release|x64.ActiveCfg = Release|x64 - {BA3902E0-8915-4E59-AD3B-F9960507F234}.Release|x64.Build.0 = Release|x64 - {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug|Win32.ActiveCfg = Debug|Win32 - {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug|Win32.Build.0 = Debug|Win32 - {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug|x64.ActiveCfg = Debug|x64 - {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug|x64.Build.0 = Debug|x64 - {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release|Win32.ActiveCfg = Release|Win32 - {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release|Win32.Build.0 = Release|Win32 - {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release|x64.ActiveCfg = Release|x64 - {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release|x64.Build.0 = Release|x64 - {FA74D37C-8184-4596-BFE9-766C159045E1}.Debug|Win32.ActiveCfg = Debug|Win32 - {FA74D37C-8184-4596-BFE9-766C159045E1}.Debug|Win32.Build.0 = Debug|Win32 - {FA74D37C-8184-4596-BFE9-766C159045E1}.Debug|x64.ActiveCfg = Debug|x64 - {FA74D37C-8184-4596-BFE9-766C159045E1}.Debug|x64.Build.0 = Debug|x64 - {FA74D37C-8184-4596-BFE9-766C159045E1}.Release|Win32.ActiveCfg = Release|Win32 - {FA74D37C-8184-4596-BFE9-766C159045E1}.Release|Win32.Build.0 = Release|Win32 - {FA74D37C-8184-4596-BFE9-766C159045E1}.Release|x64.ActiveCfg = Release|x64 - {FA74D37C-8184-4596-BFE9-766C159045E1}.Release|x64.Build.0 = Release|x64 - {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug|Win32.ActiveCfg = Debug|Win32 - {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug|Win32.Build.0 = Debug|Win32 - {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug|x64.ActiveCfg = Debug|x64 - {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug|x64.Build.0 = Debug|x64 - {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release|Win32.ActiveCfg = Release|Win32 - {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release|Win32.Build.0 = Release|Win32 - {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release|x64.ActiveCfg = Release|x64 - {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release|x64.Build.0 = Release|x64 - {F1C18D01-9173-41C6-8C73-DC501582F227}.Debug|Win32.ActiveCfg = Debug|Win32 - {F1C18D01-9173-41C6-8C73-DC501582F227}.Debug|Win32.Build.0 = Debug|Win32 - {F1C18D01-9173-41C6-8C73-DC501582F227}.Debug|x64.ActiveCfg = Debug|x64 - {F1C18D01-9173-41C6-8C73-DC501582F227}.Debug|x64.Build.0 = Debug|x64 - {F1C18D01-9173-41C6-8C73-DC501582F227}.Release|Win32.ActiveCfg = Release|Win32 - {F1C18D01-9173-41C6-8C73-DC501582F227}.Release|Win32.Build.0 = Release|Win32 - {F1C18D01-9173-41C6-8C73-DC501582F227}.Release|x64.ActiveCfg = Release|x64 - {F1C18D01-9173-41C6-8C73-DC501582F227}.Release|x64.Build.0 = Release|x64 - {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug|Win32.ActiveCfg = Debug|Win32 - {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug|Win32.Build.0 = Debug|Win32 - {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug|x64.ActiveCfg = Debug|x64 - {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug|x64.Build.0 = Debug|x64 - {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release|Win32.ActiveCfg = Release|Win32 - {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release|Win32.Build.0 = Release|Win32 - {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release|x64.ActiveCfg = Release|x64 - {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release|x64.Build.0 = Release|x64 - {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug|Win32.ActiveCfg = Debug|Win32 - {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug|Win32.Build.0 = Debug|Win32 - {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug|x64.ActiveCfg = Debug|x64 - {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug|x64.Build.0 = Debug|x64 - {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release|Win32.ActiveCfg = Release|Win32 - {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release|Win32.Build.0 = Release|Win32 - {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release|x64.ActiveCfg = Release|x64 - {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release|x64.Build.0 = Release|x64 - {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Debug|Win32.ActiveCfg = Debug|Win32 - {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Debug|Win32.Build.0 = Debug|Win32 - {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Debug|x64.ActiveCfg = Debug|x64 - {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Debug|x64.Build.0 = Debug|x64 - {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Release|Win32.ActiveCfg = Release|Win32 - {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Release|Win32.Build.0 = Release|Win32 - {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Release|x64.ActiveCfg = Release|x64 - {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Release|x64.Build.0 = Release|x64 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug-Win|Win32.Build.0 = Debug|Win32 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Debug-Win|Win64.Build.0 = Debug|x64 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release-Con|Win64.Build.0 = Release-Con|x64 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release-Win|Win32.ActiveCfg = Release|Win32 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release-Win|Win32.Build.0 = Release|Win32 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release-Win|Win64.ActiveCfg = Release|x64 + {C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release-Win|Win64.Build.0 = Release|x64 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Win|Win32.Build.0 = Debug|Win32 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Win|Win64.Build.0 = Debug|x64 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Con|Win64.Build.0 = Release-Con|x64 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Win|Win32.ActiveCfg = Release|Win32 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Win|Win32.Build.0 = Release|Win32 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Win|Win64.ActiveCfg = Release|x64 + {54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Win|Win64.Build.0 = Release|x64 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Debug-Win|Win32.Build.0 = Debug|Win32 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Debug-Win|Win64.Build.0 = Debug|x64 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Release-Con|Win64.Build.0 = Release-Con|x64 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Release-Win|Win32.ActiveCfg = Release|Win32 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Release-Win|Win32.Build.0 = Release|Win32 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Release-Win|Win64.ActiveCfg = Release|x64 + {B2165720-B4B2-4F4B-8888-8C390C3CB4DB}.Release-Win|Win64.Build.0 = Release|x64 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Debug-Win|Win32.Build.0 = Debug|Win32 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Debug-Win|Win64.Build.0 = Debug|x64 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release-Con|Win64.Build.0 = Release-Con|x64 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release-Win|Win32.ActiveCfg = Release|Win32 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release-Win|Win32.Build.0 = Release|Win32 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release-Win|Win64.ActiveCfg = Release|x64 + {B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release-Win|Win64.Build.0 = Release|x64 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Win|Win32.Build.0 = Debug|Win32 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Win|Win64.Build.0 = Debug|x64 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Con|Win64.Build.0 = Release-Con|x64 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Win|Win32.ActiveCfg = Release|Win32 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Win|Win32.Build.0 = Release|Win32 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Win|Win64.ActiveCfg = Release|x64 + {7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Win|Win64.Build.0 = Release|x64 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Win|Win32.Build.0 = Debug|Win32 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Win|Win64.Build.0 = Debug|x64 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Con|Win64.Build.0 = Release-Con|x64 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Win|Win32.ActiveCfg = Release|Win32 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Win|Win32.Build.0 = Release|Win32 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Win|Win64.ActiveCfg = Release|x64 + {4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Win|Win64.Build.0 = Release|x64 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Win|Win32.Build.0 = Debug|Win32 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Win|Win64.Build.0 = Debug|x64 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Con|Win64.Build.0 = Release-Con|x64 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Win|Win32.ActiveCfg = Release|Win32 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Win|Win32.Build.0 = Release|Win32 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Win|Win64.ActiveCfg = Release|x64 + {3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Win|Win64.Build.0 = Release|x64 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Win|Win32.Build.0 = Debug|Win32 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Win|Win64.Build.0 = Debug|x64 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Con|Win64.Build.0 = Release-Con|x64 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Win|Win32.ActiveCfg = Release|Win32 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Win|Win32.Build.0 = Release|Win32 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Win|Win64.ActiveCfg = Release|x64 + {68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Win|Win64.Build.0 = Release|x64 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Win|Win32.Build.0 = Debug|Win32 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Win|Win64.Build.0 = Debug|x64 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Con|Win64.Build.0 = Release-Con|x64 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Win|Win32.ActiveCfg = Release|Win32 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Win|Win32.Build.0 = Release|Win32 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Win|Win64.ActiveCfg = Release|x64 + {EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Win|Win64.Build.0 = Release|x64 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Win|Win32.Build.0 = Debug|Win32 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Win|Win64.Build.0 = Debug|x64 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Con|Win64.Build.0 = Release-Con|x64 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Win|Win32.ActiveCfg = Release|Win32 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Win|Win32.Build.0 = Release|Win32 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Win|Win64.ActiveCfg = Release|x64 + {51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Win|Win64.Build.0 = Release|x64 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Win|Win32.Build.0 = Debug|Win32 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Win|Win64.Build.0 = Debug|x64 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Con|Win64.Build.0 = Release-Con|x64 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Win|Win32.ActiveCfg = Release|Win32 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Win|Win32.Build.0 = Release|Win32 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Win|Win64.ActiveCfg = Release|x64 + {BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Win|Win64.Build.0 = Release|x64 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Win|Win32.Build.0 = Debug|Win32 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Win|Win64.Build.0 = Debug|x64 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Con|Win64.Build.0 = Release-Con|x64 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Win|Win32.ActiveCfg = Release|Win32 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Win|Win32.Build.0 = Release|Win32 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Win|Win64.ActiveCfg = Release|x64 + {43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Win|Win64.Build.0 = Release|x64 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Win|Win32.Build.0 = Debug|Win32 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Win|Win64.Build.0 = Debug|x64 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Con|Win64.Build.0 = Release-Con|x64 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Win|Win32.ActiveCfg = Release|Win32 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Win|Win32.Build.0 = Release|Win32 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Win|Win64.ActiveCfg = Release|x64 + {FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Win|Win64.Build.0 = Release|x64 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Win|Win32.Build.0 = Debug|Win32 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Win|Win64.Build.0 = Debug|x64 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Con|Win64.Build.0 = Release-Con|x64 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Win|Win32.ActiveCfg = Release|Win32 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Win|Win32.Build.0 = Release|Win32 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Win|Win64.ActiveCfg = Release|x64 + {8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Win|Win64.Build.0 = Release|x64 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Win|Win32.Build.0 = Debug|Win32 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Win|Win64.Build.0 = Debug|x64 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Con|Win64.Build.0 = Release-Con|x64 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Win|Win32.ActiveCfg = Release|Win32 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Win|Win32.Build.0 = Release|Win32 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Win|Win64.ActiveCfg = Release|x64 + {F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Win|Win64.Build.0 = Release|x64 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Win|Win32.Build.0 = Debug|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Win|Win64.Build.0 = Debug|x64 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Con|Win64.Build.0 = Release-Con|x64 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Win|Win32.ActiveCfg = Release|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Win|Win32.Build.0 = Release|Win32 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Win|Win64.ActiveCfg = Release|x64 + {ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Win|Win64.Build.0 = Release|x64 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Win|Win32.Build.0 = Debug|Win32 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Win|Win64.Build.0 = Debug|x64 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Con|Win64.Build.0 = Release-Con|x64 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Win|Win32.ActiveCfg = Release|Win32 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Win|Win32.Build.0 = Release|Win32 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Win|Win64.ActiveCfg = Release|x64 + {89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Win|Win64.Build.0 = Release|x64 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Debug-Con|Win32.Build.0 = Debug-Con|Win32 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Debug-Con|Win64.Build.0 = Debug-Con|x64 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Debug-Win|Win32.ActiveCfg = Debug|Win32 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Debug-Win|Win32.Build.0 = Debug|Win32 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Debug-Win|Win64.ActiveCfg = Debug|x64 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Debug-Win|Win64.Build.0 = Debug|x64 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Release-Con|Win32.ActiveCfg = Release-Con|Win32 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Release-Con|Win32.Build.0 = Release-Con|Win32 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Release-Con|Win64.ActiveCfg = Release-Con|x64 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Release-Con|Win64.Build.0 = Release-Con|x64 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Release-Win|Win32.ActiveCfg = Release|Win32 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Release-Win|Win32.Build.0 = Release|Win32 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Release-Win|Win64.ActiveCfg = Release|x64 + {DC9DBE2C-1277-4B5A-853C-8FBDF595E8FC}.Release-Win|Win64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/3rdparty/3rdparty.vcxproj b/src/3rdparty/3rdparty.vcxproj index ceaee02cb..684adf9b8 100755 --- a/src/3rdparty/3rdparty.vcxproj +++ b/src/3rdparty/3rdparty.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -30,72 +46,149 @@ true v141 + + StaticLibrary + Unicode + true + v141 + StaticLibrary Unicode true v141 + + StaticLibrary + Unicode + true + v141 + StaticLibrary Unicode v141 false + + StaticLibrary + Unicode + v141 + false + StaticLibrary Unicode v141 false + + StaticLibrary + Unicode + v141 + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + ./obj64/$(Configuration)/ ./obj64/$(Configuration)/ + + ./obj64/$(Configuration)/ + ./obj64/$(Configuration)/ + ./obj64/$(Configuration)/ ./obj64/$(Configuration)/ + + ./obj64/$(Configuration)/ + ./obj64/$(Configuration)/ + Disabled ./include/;./include/sqlite/;./win32_include/;%(AdditionalIncludeDirectories) - WIN32;PDC_FORCE_UTF8;PDC_WIDE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions) + WIN32;PDC_FORCE_UTF8;PDC_WIDE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;PDCURSES_WINGUI;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + pch.hpp + Level3 + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)$(ProjectName).pdb + + + + + Disabled + ./include/;./include/sqlite/;./win32_include/;%(AdditionalIncludeDirectories) + WIN32;PDC_FORCE_UTF8;PDC_WIDE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;PDCURSES_WINCON;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -112,7 +205,24 @@ Disabled ./include/;./include/sqlite/;./win32_include/;%(AdditionalIncludeDirectories) - WIN32;PDC_FORCE_UTF8;PDC_WIDE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions) + WIN32;PDC_FORCE_UTF8;PDC_WIDE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;PDCURSES_WINGUI;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + pch.hpp + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)$(ProjectName).pdb + + + + + Disabled + ./include/;./include/sqlite/;./win32_include/;%(AdditionalIncludeDirectories) + WIN32;PDC_FORCE_UTF8;PDC_WIDE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;PDCURSES_WINCON;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -132,7 +242,26 @@ true Speed ./include/;./include/sqlite;./win32_include/;%(AdditionalIncludeDirectories) - WIN32;PDC_FORCE_UTF8;PDC_WIDE;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions) + WIN32;PDC_FORCE_UTF8;PDC_WIDE;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;PDCURSES_WINGUI;%(PreprocessorDefinitions) + MultiThreaded + + + pch.hpp + $(IntDir) + $(IntDir) + $(IntDir)$(ProjectName).pdb + true + Sync + + + + + Full + Default + true + Speed + ./include/;./include/sqlite;./win32_include/;%(AdditionalIncludeDirectories) + WIN32;PDC_FORCE_UTF8;PDC_WIDE;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;PDCURSES_WINCON;%(PreprocessorDefinitions) MultiThreaded @@ -151,7 +280,26 @@ true Speed ./include/;./include/sqlite;./win32_include/;%(AdditionalIncludeDirectories) - WIN32;PDC_FORCE_UTF8;PDC_WIDE;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;COMPILED_FROM_DSP;XML_STATIC;%(PreprocessorDefinitions) + WIN32;PDC_FORCE_UTF8;PDC_WIDE;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;PDCURSES_WINGUI;%(PreprocessorDefinitions) + MultiThreaded + + + pch.hpp + $(IntDir) + $(IntDir) + $(IntDir)$(ProjectName).pdb + true + Sync + + + + + Full + Default + true + Speed + ./include/;./include/sqlite;./win32_include/;%(AdditionalIncludeDirectories) + WIN32;PDC_FORCE_UTF8;PDC_WIDE;_CRT_SECURE_NO_DEPRECATE;SQLITE_THREADSAFE;PDCURSES_WINCON;%(PreprocessorDefinitions) MultiThreaded @@ -169,7 +317,9 @@ Level1 + Level1 Level1 + Level1 @@ -203,13 +353,8 @@ - - - - - - - + + diff --git a/src/3rdparty/3rdparty.vcxproj.filters b/src/3rdparty/3rdparty.vcxproj.filters index 10792ff75..a4d3f7a69 100755 --- a/src/3rdparty/3rdparty.vcxproj.filters +++ b/src/3rdparty/3rdparty.vcxproj.filters @@ -139,27 +139,6 @@ src\pdcurses - - src\pdcurses - - - src\pdcurses - - - src\pdcurses - - - src\pdcurses - - - src\pdcurses - - - src\pdcurses - - - src\pdcurses - src\pdcurses @@ -184,6 +163,12 @@ src + + src\pdcurses + + + src\pdcurses + diff --git a/src/3rdparty/win32_src/pdcurses/pdcwincon.c b/src/3rdparty/win32_src/pdcurses/pdcwincon.c new file mode 100644 index 000000000..920d9c2f0 --- /dev/null +++ b/src/3rdparty/win32_src/pdcurses/pdcwincon.c @@ -0,0 +1,9 @@ +#ifdef PDCURSES_WINCON + #include "wincon/pdcclip.c" + #include "wincon/pdcdisp.c" + #include "wincon/pdcgetsc.c" + #include "wincon/pdckbd.c" + #include "wincon/pdcscrn.c" + #include "wincon/pdcsetsc.c" + #include "wincon/pdcutil.c" +#endif \ No newline at end of file diff --git a/src/3rdparty/win32_src/pdcurses/pdcwingui.c b/src/3rdparty/win32_src/pdcurses/pdcwingui.c new file mode 100644 index 000000000..95701476b --- /dev/null +++ b/src/3rdparty/win32_src/pdcurses/pdcwingui.c @@ -0,0 +1,9 @@ +#ifdef PDCURSES_WINGUI + #include "wingui/pdcclip.c" + #include "wingui/pdcdisp.c" + #include "wingui/pdcgetsc.c" + #include "wingui/pdckbd.c" + #include "wingui/pdcscrn.c" + #include "wingui/pdcsetsc.c" + #include "wingui/pdcutil.c" +#endif \ No newline at end of file diff --git a/src/3rdparty/win32_src/pdcurses/pdcclip.c b/src/3rdparty/win32_src/pdcurses/wincon/pdcclip.c similarity index 100% rename from src/3rdparty/win32_src/pdcurses/pdcclip.c rename to src/3rdparty/win32_src/pdcurses/wincon/pdcclip.c diff --git a/src/3rdparty/win32_src/pdcurses/wincon/pdcdisp.c b/src/3rdparty/win32_src/pdcurses/wincon/pdcdisp.c new file mode 100644 index 000000000..59bc69850 --- /dev/null +++ b/src/3rdparty/win32_src/pdcurses/wincon/pdcdisp.c @@ -0,0 +1,120 @@ +/* Public Domain Curses */ + +#include "pdcwin.h" + +#include +#include + +#ifdef CHTYPE_LONG + +#ifdef PDC_WIDE + #define USE_UNICODE_ACS_CHARS 1 +#else + #define USE_UNICODE_ACS_CHARS 0 +#endif + +#include "acs_defs.h" + +#endif + +/* position hardware cursor at (y, x) */ + +void PDC_gotoyx(int row, int col) +{ + COORD coord; + + PDC_LOG(("PDC_gotoyx() - called: row %d col %d from row %d col %d\n", + row, col, SP->cursrow, SP->curscol)); + + coord.X = col; + coord.Y = row; + + SetConsoleCursorPosition(pdc_con_out, coord); +} + +/* update the given physical line to look like the corresponding line in + curscr */ + +/* NOTE: the original indexing into pdc_atrtab[] relied on three or five + attribute bits in 'chtype' being adjacent to the color bits. Such is + not the case for 64-bit chtypes (CHTYPE_LONG == 2), so we have to do + additional bit-fiddling for that situation. Code is similar in Win32 + and DOS flavors. (BJG) */ +#define MAX_UNICODE 0x10ffff +#define DUMMY_CHAR_NEXT_TO_FULLWIDTH (MAX_UNICODE + 1) + +/* see 'addch.c' for an explanation of how combining chars are handled. */ + +#if defined( CHTYPE_LONG) && CHTYPE_LONG >= 2 && defined( PDC_WIDE) + #define USING_COMBINING_CHARACTER_SCHEME + int PDC_expand_combined_characters( const cchar_t c, cchar_t *added); /* addch.c */ +#endif + +void PDC_transform_line(int lineno, int x, int len, const chtype *srcp) +{ + CHAR_INFO ci[512]; + int src, dst; + COORD bufSize, bufPos; + SMALL_RECT sr; + + PDC_LOG(("PDC_transform_line() - called: lineno=%d\n", lineno)); + + bufPos.X = bufPos.Y = 0; + + sr.Top = lineno; + sr.Bottom = lineno; + sr.Left = x; + sr.Right = x + len - 1; + + for (src = dst = 0; src < len; src++) +// if( (srcp[src] & A_CHARTEXT) != DUMMY_CHAR_NEXT_TO_FULLWIDTH) + { + const chtype ch = srcp[src]; + chtype char_out = ch & A_CHARTEXT; + +#if defined( CHTYPE_LONG) && (CHTYPE_LONG >= 2) + ci[dst].Attributes = pdc_atrtab[((ch >> PDC_ATTR_SHIFT) & 0x1f) + | (((ch >> PDC_COLOR_SHIFT) & 0xff) << 5)]; +#else + ci[dst].Attributes = pdc_atrtab[ch >> PDC_ATTR_SHIFT]; +#endif + +#ifdef CHTYPE_LONG + if( char_out == DUMMY_CHAR_NEXT_TO_FULLWIDTH) + char_out = ' '; + else if (ch & A_ALTCHARSET && !(ch & 0xff80)) + char_out = acs_map[ch & 0x7f]; + +#ifdef USING_COMBINING_CHARACTER_SCHEME + /* We can't actually display combining characters in cmd.exe. So + show the 'base' character and throw away the modifying marks. */ + if( char_out > MAX_UNICODE) + { + cchar_t added; + int n_combined = 0; + + while( (char_out = PDC_expand_combined_characters( char_out, + &added)) > MAX_UNICODE) + { + n_combined++; + } + } +#endif + if( char_out > 0xffff) /* SMP chars: use surrogates */ + { + ci[dst].Char.UnicodeChar = (WCHAR)( 0xd800 | (char_out>>10)); + ci[dst + 1] = ci[dst]; + dst++; + char_out = (chtype)( 0xdc00 | (char_out & 0x3ff)); + } +#endif + ci[dst].Char.UnicodeChar = (WCHAR)char_out; + + dst++; + } + + bufSize.X = dst; + bufSize.Y = 1; + + WriteConsoleOutput(pdc_con_out, ci, bufSize, bufPos, &sr); +} diff --git a/src/3rdparty/win32_src/pdcurses/wincon/pdcgetsc.c b/src/3rdparty/win32_src/pdcurses/wincon/pdcgetsc.c new file mode 100644 index 000000000..3e9d86824 --- /dev/null +++ b/src/3rdparty/win32_src/pdcurses/wincon/pdcgetsc.c @@ -0,0 +1,55 @@ +/* Public Domain Curses */ + +#include "pdcwin.h" + +/* get the cursor size/shape */ + +int PDC_get_cursor_mode(void) +{ + CONSOLE_CURSOR_INFO ci; + + PDC_LOG(("PDC_get_cursor_mode() - called\n")); + + GetConsoleCursorInfo(pdc_con_out, &ci); + + return ci.dwSize; +} + +/* return number of screen rows */ + +int PDC_get_rows(void) +{ + CONSOLE_SCREEN_BUFFER_INFO scr; + + PDC_LOG(("PDC_get_rows() - called\n")); + + GetConsoleScreenBufferInfo(pdc_con_out, &scr); + + return scr.srWindow.Bottom - scr.srWindow.Top + 1; +} + +/* return number of buffer rows */ + +int PDC_get_buffer_rows(void) +{ + CONSOLE_SCREEN_BUFFER_INFO scr; + + PDC_LOG(("PDC_get_buffer_rows() - called\n")); + + GetConsoleScreenBufferInfo(pdc_con_out, &scr); + + return scr.dwSize.Y; +} + +/* return width of screen/viewport */ + +int PDC_get_columns(void) +{ + CONSOLE_SCREEN_BUFFER_INFO scr; + + PDC_LOG(("PDC_get_columns() - called\n")); + + GetConsoleScreenBufferInfo(pdc_con_out, &scr); + + return scr.srWindow.Right - scr.srWindow.Left + 1; +} diff --git a/src/3rdparty/win32_src/pdcurses/wincon/pdckbd.c b/src/3rdparty/win32_src/pdcurses/wincon/pdckbd.c new file mode 100644 index 000000000..125a9aece --- /dev/null +++ b/src/3rdparty/win32_src/pdcurses/wincon/pdckbd.c @@ -0,0 +1,791 @@ +/* Public Domain Curses */ + +#include "pdcwin.h" + +/*man-start************************************************************** + +pdckbd +------ + +### Synopsis + + unsigned long PDC_get_input_fd(void); + +### Description + + PDC_get_input_fd() returns the file descriptor that PDCurses + reads its input from. It can be used for select(). + +### Portability + X/Open BSD SYS V + PDC_get_input_fd - - - + +**man-end****************************************************************/ + +unsigned long pdc_key_modifiers = 0L; + +/* These variables are used to store information about the next + Input Event. */ + +static INPUT_RECORD save_ip; +static MOUSE_STATUS old_mouse_status; +static DWORD event_count = 0; +static SHORT left_key; +static int key_count = 0; +static int save_press = 0; + +#define KEV save_ip.Event.KeyEvent +#define MEV save_ip.Event.MouseEvent +#define REV save_ip.Event.WindowBufferSizeEvent + +/************************************************************************ + * Table for key code translation of function keys in keypad mode * + * These values are for strict IBM keyboard compatibles only * + ************************************************************************/ + +typedef struct +{ + unsigned short normal; + unsigned short shift; + unsigned short control; + unsigned short alt; + unsigned short extended; +} KPTAB; + +static KPTAB kptab[] = +{ + {0, 0, 0, 0, 0 }, /* 0 */ + {0, 0, 0, 0, 0 }, /* 1 VK_LBUTTON */ + {0, 0, 0, 0, 0 }, /* 2 VK_RBUTTON */ + {CTL_PAUSE, 0, 0, 0, 0 }, /* 3 VK_CANCEL */ + {0, 0, 0, 0, 0 }, /* 4 VK_MBUTTON */ + {0, 0, 0, 0, 0 }, /* 5 */ + {0, 0, 0, 0, 0 }, /* 6 */ + {0, 0, 0, 0, 0 }, /* 7 */ + {0x08, 0x08, 0x7F, ALT_BKSP, 0 }, /* 8 VK_BACK */ + {0x09, KEY_BTAB, CTL_TAB, ALT_TAB, 999 }, /* 9 VK_TAB */ + {0, 0, 0, 0, 0 }, /* 10 */ + {0, 0, 0, 0, 0 }, /* 11 */ + {KEY_B2, 0x35, CTL_PAD5, ALT_PAD5, 0 }, /* 12 VK_CLEAR */ + {0x0D, 0x0D, CTL_ENTER, ALT_ENTER, 1 }, /* 13 VK_RETURN */ + {0, 0, 0, 0, 0 }, /* 14 */ + {0, 0, 0, 0, 0 }, /* 15 */ + {0, 0, 0, 0, 0 }, /* 16 VK_SHIFT HANDLED SEPARATELY */ + {0, 0, 0, 0, 0 }, /* 17 VK_CONTROL HANDLED SEPARATELY */ + {0, 0, 0, 0, 0 }, /* 18 VK_MENU HANDLED SEPARATELY */ + {KEY_PAUSE, KEY_SPAUSE,CTL_PAUSE, 0, 0 }, /* 19 VK_PAUSE */ + {0, 0, 0, 0, 0 }, /* 20 VK_CAPITAL HANDLED SEPARATELY */ + {0, 0, 0, 0, 0 }, /* 21 VK_HANGUL */ + {0, 0, 0, 0, 0 }, /* 22 */ + {0, 0, 0, 0, 0 }, /* 23 VK_JUNJA */ + {0, 0, 0, 0, 0 }, /* 24 VK_FINAL */ + {0, 0, 0, 0, 0 }, /* 25 VK_HANJA */ + {0, 0, 0, 0, 0 }, /* 26 */ + {0x1B, 0x1B, 0x1B, ALT_ESC, 0 }, /* 27 VK_ESCAPE */ + {0, 0, 0, 0, 0 }, /* 28 VK_CONVERT */ + {0, 0, 0, 0, 0 }, /* 29 VK_NONCONVERT */ + {0, 0, 0, 0, 0 }, /* 30 VK_ACCEPT */ + {0, 0, 0, 0, 0 }, /* 31 VK_MODECHANGE */ + {0x20, 0x20, 0x20, 0x20, 0 }, /* 32 VK_SPACE */ + {KEY_A3, 0x39, CTL_PAD9, ALT_PAD9, 3 }, /* 33 VK_PRIOR */ + {KEY_C3, 0x33, CTL_PAD3, ALT_PAD3, 4 }, /* 34 VK_NEXT */ + {KEY_C1, 0x31, CTL_PAD1, ALT_PAD1, 5 }, /* 35 VK_END */ + {KEY_A1, 0x37, CTL_PAD7, ALT_PAD7, 6 }, /* 36 VK_HOME */ + {KEY_B1, 0x34, CTL_PAD4, ALT_PAD4, 7 }, /* 37 VK_LEFT */ + {KEY_A2, 0x38, CTL_PAD8, ALT_PAD8, 8 }, /* 38 VK_UP */ + {KEY_B3, 0x36, CTL_PAD6, ALT_PAD6, 9 }, /* 39 VK_RIGHT */ + {KEY_C2, 0x32, CTL_PAD2, ALT_PAD2, 10 }, /* 40 VK_DOWN */ + {0, 0, 0, 0, 0 }, /* 41 VK_SELECT */ + {0, 0, 0, 0, 0 }, /* 42 VK_PRINT */ + {0, 0, 0, 0, 0 }, /* 43 VK_EXECUTE */ + {KEY_PRINTSCREEN, 0, 0, ALT_PRINTSCREEN, 0 }, /* 44 VK_SNAPSHOT*/ + {PAD0, 0x30, CTL_PAD0, ALT_PAD0, 11 }, /* 45 VK_INSERT */ + {PADSTOP, 0x2E, CTL_PADSTOP, ALT_PADSTOP,12 }, /* 46 VK_DELETE */ + {0, 0, 0, 0, 0 }, /* 47 VK_HELP */ + {0x30, 0x29, CTL_0, ALT_0, 0 }, /* 48 */ + {0x31, 0x21, CTL_1, ALT_1, 0 }, /* 49 */ + {0x32, 0x40, CTL_2, ALT_2, 0 }, /* 50 */ + {0x33, 0x23, CTL_3, ALT_3, 0 }, /* 51 */ + {0x34, 0x24, CTL_4, ALT_4, 0 }, /* 52 */ + {0x35, 0x25, CTL_5, ALT_5, 0 }, /* 53 */ + {0x36, 0x5E, CTL_6, ALT_6, 0 }, /* 54 */ + {0x37, 0x26, CTL_7, ALT_7, 0 }, /* 55 */ + {0x38, 0x2A, CTL_8, ALT_8, 0 }, /* 56 */ + {0x39, 0x28, CTL_9, ALT_9, 0 }, /* 57 */ + {0, 0, 0, 0, 0 }, /* 58 */ + {0, 0, 0, 0, 0 }, /* 59 */ + {0, 0, 0, 0, 0 }, /* 60 */ + {0, 0, 0, 0, 0 }, /* 61 */ + {0, 0, 0, 0, 0 }, /* 62 */ + {0, 0, 0, 0, 0 }, /* 63 */ + {0, 0, 0, 0, 0 }, /* 64 */ + {0x61, 0x41, 0x01, ALT_A, 0 }, /* 65 */ + {0x62, 0x42, 0x02, ALT_B, 0 }, /* 66 */ + {0x63, 0x43, 0x03, ALT_C, 0 }, /* 67 */ + {0x64, 0x44, 0x04, ALT_D, 0 }, /* 68 */ + {0x65, 0x45, 0x05, ALT_E, 0 }, /* 69 */ + {0x66, 0x46, 0x06, ALT_F, 0 }, /* 70 */ + {0x67, 0x47, 0x07, ALT_G, 0 }, /* 71 */ + {0x68, 0x48, 0x08, ALT_H, 0 }, /* 72 */ + {0x69, 0x49, 0x09, ALT_I, 0 }, /* 73 */ + {0x6A, 0x4A, 0x0A, ALT_J, 0 }, /* 74 */ + {0x6B, 0x4B, 0x0B, ALT_K, 0 }, /* 75 */ + {0x6C, 0x4C, 0x0C, ALT_L, 0 }, /* 76 */ + {0x6D, 0x4D, 0x0D, ALT_M, 0 }, /* 77 */ + {0x6E, 0x4E, 0x0E, ALT_N, 0 }, /* 78 */ + {0x6F, 0x4F, 0x0F, ALT_O, 0 }, /* 79 */ + {0x70, 0x50, 0x10, ALT_P, 0 }, /* 80 */ + {0x71, 0x51, 0x11, ALT_Q, 0 }, /* 81 */ + {0x72, 0x52, 0x12, ALT_R, 0 }, /* 82 */ + {0x73, 0x53, 0x13, ALT_S, 0 }, /* 83 */ + {0x74, 0x54, 0x14, ALT_T, 0 }, /* 84 */ + {0x75, 0x55, 0x15, ALT_U, 0 }, /* 85 */ + {0x76, 0x56, 0x16, ALT_V, 0 }, /* 86 */ + {0x77, 0x57, 0x17, ALT_W, 0 }, /* 87 */ + {0x78, 0x58, 0x18, ALT_X, 0 }, /* 88 */ + {0x79, 0x59, 0x19, ALT_Y, 0 }, /* 89 */ + {0x7A, 0x5A, 0x1A, ALT_Z, 0 }, /* 90 */ + {0, 0, 0, 0, 0 }, /* 91 VK_LWIN */ + {0, 0, 0, 0, 0 }, /* 92 VK_RWIN */ + {KEY_APPS, KEY_SAPPS, CTL_APPS, ALT_APPS, 13 }, /* 93 VK_APPS */ + {0, 0, 0, 0, 0 }, /* 94 */ + {0, 0, 0, 0, 0 }, /* 95 */ + {0x30, 0, CTL_PAD0, ALT_PAD0, 0 }, /* 96 VK_NUMPAD0 */ + {0x31, 0, CTL_PAD1, ALT_PAD1, 0 }, /* 97 VK_NUMPAD1 */ + {0x32, 0, CTL_PAD2, ALT_PAD2, 0 }, /* 98 VK_NUMPAD2 */ + {0x33, 0, CTL_PAD3, ALT_PAD3, 0 }, /* 99 VK_NUMPAD3 */ + {0x34, 0, CTL_PAD4, ALT_PAD4, 0 }, /* 100 VK_NUMPAD4 */ + {0x35, 0, CTL_PAD5, ALT_PAD5, 0 }, /* 101 VK_NUMPAD5 */ + {0x36, 0, CTL_PAD6, ALT_PAD6, 0 }, /* 102 VK_NUMPAD6 */ + {0x37, 0, CTL_PAD7, ALT_PAD7, 0 }, /* 103 VK_NUMPAD7 */ + {0x38, 0, CTL_PAD8, ALT_PAD8, 0 }, /* 104 VK_NUMPAD8 */ + {0x39, 0, CTL_PAD9, ALT_PAD9, 0 }, /* 105 VK_NUMPAD9 */ + {PADSTAR, SHF_PADSTAR,CTL_PADSTAR, ALT_PADSTAR,999 }, /* 106 VK_MULTIPLY*/ + {PADPLUS, SHF_PADPLUS,CTL_PADPLUS, ALT_PADPLUS,999 }, /* 107 VK_ADD */ + {0, 0, 0, 0, 0 }, /* 108 VK_SEPARATOR */ + {PADMINUS, SHF_PADMINUS,CTL_PADMINUS,ALT_PADMINUS,999}, /* 109 VK_SUBTRACT*/ + {0x2E, 0, CTL_PADSTOP, ALT_PADSTOP,0 }, /* 110 VK_DECIMAL */ + {PADSLASH, SHF_PADSLASH,CTL_PADSLASH,ALT_PADSLASH,2 }, /* 111 VK_DIVIDE */ + {KEY_F(1), KEY_F(13), KEY_F(25), KEY_F(37), 0 }, /* 112 VK_F1 */ + {KEY_F(2), KEY_F(14), KEY_F(26), KEY_F(38), 0 }, /* 113 VK_F2 */ + {KEY_F(3), KEY_F(15), KEY_F(27), KEY_F(39), 0 }, /* 114 VK_F3 */ + {KEY_F(4), KEY_F(16), KEY_F(28), KEY_F(40), 0 }, /* 115 VK_F4 */ + {KEY_F(5), KEY_F(17), KEY_F(29), KEY_F(41), 0 }, /* 116 VK_F5 */ + {KEY_F(6), KEY_F(18), KEY_F(30), KEY_F(42), 0 }, /* 117 VK_F6 */ + {KEY_F(7), KEY_F(19), KEY_F(31), KEY_F(43), 0 }, /* 118 VK_F7 */ + {KEY_F(8), KEY_F(20), KEY_F(32), KEY_F(44), 0 }, /* 119 VK_F8 */ + {KEY_F(9), KEY_F(21), KEY_F(33), KEY_F(45), 0 }, /* 120 VK_F9 */ + {KEY_F(10), KEY_F(22), KEY_F(34), KEY_F(46), 0 }, /* 121 VK_F10 */ + {KEY_F(11), KEY_F(23), KEY_F(35), KEY_F(47), 0 }, /* 122 VK_F11 */ + {KEY_F(12), KEY_F(24), KEY_F(36), KEY_F(48), 0 }, /* 123 VK_F12 */ + + /* 124 through 218 */ + + {0, 0, 0, 0, 0}, /* 124 VK_F13 */ + {0, 0, 0, 0, 0}, /* 125 VK_F14 */ + {0, 0, 0, 0, 0}, /* 126 VK_F15 */ + {0, 0, 0, 0, 0}, /* 127 VK_F16 */ + {0, 0, 0, 0, 0}, /* 128 VK_F17 */ + {0, 0, 0, 0, 0}, /* 129 VK_F18 */ + {0, 0, 0, 0, 0}, /* 130 VK_F19 */ + {0, 0, 0, 0, 0}, /* 131 VK_F20 */ + {0, 0, 0, 0, 0}, /* 132 VK_F21 */ + {0, 0, 0, 0, 0}, /* 133 VK_F22 */ + {0, 0, 0, 0, 0}, /* 134 VK_F23 */ + {0, 0, 0, 0, 0}, /* 135 VK_F24 */ + {0, 0, 0, 0, 0}, /* 136 unassigned */ + {0, 0, 0, 0, 0}, /* 137 unassigned */ + {0, 0, 0, 0, 0}, /* 138 unassigned */ + {0, 0, 0, 0, 0}, /* 139 unassigned */ + {0, 0, 0, 0, 0}, /* 140 unassigned */ + {0, 0, 0, 0, 0}, /* 141 unassigned */ + {0, 0, 0, 0, 0}, /* 142 unassigned */ + {0, 0, 0, 0, 0}, /* 143 unassigned */ + {0, 0, 0, 0, 0}, /* 144 VK_NUMLOCK */ + {KEY_SCROLLLOCK, 0, 0, ALT_SCROLLLOCK, 0}, /* 145 VKSCROLL */ + {0, 0, 0, 0, 0}, /* 146 OEM specific */ + {0, 0, 0, 0, 0}, /* 147 OEM specific */ + {0, 0, 0, 0, 0}, /* 148 OEM specific */ + {0, 0, 0, 0, 0}, /* 149 OEM specific */ + {0, 0, 0, 0, 0}, /* 150 OEM specific */ + {0, 0, 0, 0, 0}, /* 151 Unassigned */ + {0, 0, 0, 0, 0}, /* 152 Unassigned */ + {0, 0, 0, 0, 0}, /* 153 Unassigned */ + {0, 0, 0, 0, 0}, /* 154 Unassigned */ + {0, 0, 0, 0, 0}, /* 155 Unassigned */ + {0, 0, 0, 0, 0}, /* 156 Unassigned */ + {0, 0, 0, 0, 0}, /* 157 Unassigned */ + {0, 0, 0, 0, 0}, /* 158 Unassigned */ + {0, 0, 0, 0, 0}, /* 159 Unassigned */ + {0, 0, 0, 0, 0}, /* 160 VK_LSHIFT */ + {0, 0, 0, 0, 0}, /* 161 VK_RSHIFT */ + {0, 0, 0, 0, 0}, /* 162 VK_LCONTROL */ + {0, 0, 0, 0, 0}, /* 163 VK_RCONTROL */ + {0, 0, 0, 0, 0}, /* 164 VK_LMENU */ + {0, 0, 0, 0, 0}, /* 165 VK_RMENU */ + {0, 0, 0, 0, 14}, /* 166 VK_BROWSER_BACK */ + {0, 0, 0, 0, 15}, /* 167 VK_BROWSER_FORWARD */ + {0, 0, 0, 0, 16}, /* 168 VK_BROWSER_REFRESH */ + {0, 0, 0, 0, 17}, /* 169 VK_BROWSER_STOP */ + {0, 0, 0, 0, 18}, /* 170 VK_BROWSER_SEARCH */ + {0, 0, 0, 0, 19}, /* 171 VK_BROWSER_FAVORITES */ + {0, 0, 0, 0, 20}, /* 172 VK_BROWSER_HOME */ + {0, 0, 0, 0, 21}, /* 173 VK_VOLUME_MUTE */ + {0, 0, 0, 0, 22}, /* 174 VK_VOLUME_DOWN */ + {0, 0, 0, 0, 23}, /* 175 VK_VOLUME_UP */ + {0, 0, 0, 0, 24}, /* 176 VK_MEDIA_NEXT_TRACK */ + {0, 0, 0, 0, 25}, /* 177 VK_MEDIA_PREV_TRACK */ + {0, 0, 0, 0, 26}, /* 178 VK_MEDIA_STOP */ + {0, 0, 0, 0, 27}, /* 179 VK_MEDIA_PLAY_PAUSE */ + {0, 0, 0, 0, 28}, /* 180 VK_LAUNCH_MAIL */ + {0, 0, 0, 0, 29}, /* 181 VK_LAUNCH_MEDIA_SELECT */ + {0, 0, 0, 0, 30}, /* 182 VK_LAUNCH_APP1 */ + {0, 0, 0, 0, 31}, /* 183 VK_LAUNCH_APP2 */ + {0, 0, 0, 0, 0}, /* 184 Reserved */ + {0, 0, 0, 0, 0}, /* 185 Reserved */ + {';', ':', CTL_SEMICOLON, ALT_SEMICOLON, 0}, /* 186 VK_OEM_1 */ + {'=', '+', CTL_EQUAL, ALT_EQUAL, 0}, /* 187 VK_OEM_PLUS */ + {',', '<', CTL_COMMA, ALT_COMMA, 0}, /* 188 VK_OEM_COMMA */ + {'-', '_', CTL_MINUS, ALT_MINUS, 0}, /* 189 VK_OEM_MINUS */ + {'.', '>', CTL_STOP, ALT_STOP, 0}, /* 190 VK_OEM_PERIOD */ + {'/', '?', CTL_FSLASH, ALT_FSLASH, 0}, /* 191 VK_OEM_2 */ + {'`', '~', CTL_BQUOTE, ALT_BQUOTE, 0}, /* 192 VK_OEM_3 */ + {0, 0, 0, 0, 0}, /* 193 */ + {0, 0, 0, 0, 0}, /* 194 */ + {0, 0, 0, 0, 0}, /* 195 */ + {0, 0, 0, 0, 0}, /* 196 */ + {0, 0, 0, 0, 0}, /* 197 */ + {0, 0, 0, 0, 0}, /* 198 */ + {0, 0, 0, 0, 0}, /* 199 */ + {0, 0, 0, 0, 0}, /* 200 */ + {0, 0, 0, 0, 0}, /* 201 */ + {0, 0, 0, 0, 0}, /* 202 */ + {0, 0, 0, 0, 0}, /* 203 */ + {0, 0, 0, 0, 0}, /* 204 */ + {0, 0, 0, 0, 0}, /* 205 */ + {0, 0, 0, 0, 0}, /* 206 */ + {0, 0, 0, 0, 0}, /* 207 */ + {0, 0, 0, 0, 0}, /* 208 */ + {0, 0, 0, 0, 0}, /* 209 */ + {0, 0, 0, 0, 0}, /* 210 */ + {0, 0, 0, 0, 0}, /* 211 */ + {0, 0, 0, 0, 0}, /* 212 */ + {0, 0, 0, 0, 0}, /* 213 */ + {0, 0, 0, 0, 0}, /* 214 */ + {0, 0, 0, 0, 0}, /* 215 */ + {0, 0, 0, 0, 0}, /* 216 */ + {0, 0, 0, 0, 0}, /* 217 */ + {0, 0, 0, 0, 0}, /* 218 */ + {0x5B, 0x7B, 0x1B, ALT_LBRACKET,0 }, /* 219 VK_OEM_4 */ + {0x5C, 0x7C, 0x1C, ALT_BSLASH, 0 }, /* 220 VK_OEM_5 */ + {0x5D, 0x7D, 0x1D, ALT_RBRACKET,0 }, /* 221 VK_OEM_6 */ + {'\'', '"', 0x27, ALT_FQUOTE, 0 }, /* 222 VK_OEM_7 */ + {0, 0, 0, 0, 0 }, /* 223 VK_OEM_8 */ + {0, 0, 0, 0, 0 }, /* 224 */ + {0, 0, 0, 0, 0 } /* 225 */ +}; + +static const KPTAB ext_kptab[] = +{ + {0, 0, 0, 0, }, /* 0 MUST BE EMPTY */ + {PADENTER, SHF_PADENTER, CTL_PADENTER, ALT_PADENTER}, /* 1 13 */ + {PADSLASH, SHF_PADSLASH, CTL_PADSLASH, ALT_PADSLASH}, /* 2 111 */ + {KEY_PPAGE, KEY_SPREVIOUS, CTL_PGUP, ALT_PGUP }, /* 3 33 */ + {KEY_NPAGE, KEY_SNEXT, CTL_PGDN, ALT_PGDN }, /* 4 34 */ + {KEY_END, KEY_SEND, CTL_END, ALT_END }, /* 5 35 */ + {KEY_HOME, KEY_SHOME, CTL_HOME, ALT_HOME }, /* 6 36 */ + {KEY_LEFT, KEY_SLEFT, CTL_LEFT, ALT_LEFT }, /* 7 37 */ + {KEY_UP, KEY_SUP, CTL_UP, ALT_UP }, /* 8 38 */ + {KEY_RIGHT, KEY_SRIGHT, CTL_RIGHT, ALT_RIGHT }, /* 9 39 */ + {KEY_DOWN, KEY_SDOWN, CTL_DOWN, ALT_DOWN }, /* 10 40 */ + {KEY_IC, KEY_SIC, CTL_INS, ALT_INS }, /* 11 45 */ + {KEY_DC, KEY_SDC, CTL_DEL, ALT_DEL }, /* 12 46 */ + {KEY_APPS, KEY_SAPPS , CTL_APPS, ALT_APPS }, /* 13 93 VK_APPS */ + {KEY_BROWSER_BACK, KEY_SBROWSER_BACK, KEY_CBROWSER_BACK, KEY_ABROWSER_BACK, }, /* 14 166 VK_BROWSER_BACK */ + {KEY_BROWSER_FWD, KEY_SBROWSER_FWD, KEY_CBROWSER_FWD, KEY_ABROWSER_FWD, }, /* 15 167 VK_BROWSER_FORWARD */ + {KEY_BROWSER_REF, KEY_SBROWSER_REF, KEY_CBROWSER_REF, KEY_ABROWSER_REF, }, /* 16 168 VK_BROWSER_REFRESH */ + {KEY_BROWSER_STOP, KEY_SBROWSER_STOP, KEY_CBROWSER_STOP, KEY_ABROWSER_STOP, }, /* 17 169 VK_BROWSER_STOP */ + {KEY_SEARCH, KEY_SSEARCH, KEY_CSEARCH, KEY_ASEARCH, }, /* 18 170 VK_BROWSER_SEARCH */ + {KEY_FAVORITES, KEY_SFAVORITES, KEY_CFAVORITES, KEY_AFAVORITES, }, /* 19 171 VK_BROWSER_FAVORITES */ + {KEY_BROWSER_HOME, KEY_SBROWSER_HOME, KEY_CBROWSER_HOME, KEY_ABROWSER_HOME, }, /* 20 172 VK_BROWSER_HOME */ + {KEY_VOLUME_MUTE, KEY_SVOLUME_MUTE, KEY_CVOLUME_MUTE, KEY_AVOLUME_MUTE, }, /* 21 173 VK_VOLUME_MUTE */ + {KEY_VOLUME_DOWN, KEY_SVOLUME_DOWN, KEY_CVOLUME_DOWN, KEY_AVOLUME_DOWN, }, /* 22 174 VK_VOLUME_DOWN */ + {KEY_VOLUME_UP, KEY_SVOLUME_UP, KEY_CVOLUME_UP, KEY_AVOLUME_UP, }, /* 23 175 VK_VOLUME_UP */ + {KEY_NEXT_TRACK, KEY_SNEXT_TRACK, KEY_CNEXT_TRACK, KEY_ANEXT_TRACK, }, /* 24 176 VK_MEDIA_NEXT_TRACK */ + {KEY_PREV_TRACK, KEY_SPREV_TRACK, KEY_CPREV_TRACK, KEY_APREV_TRACK, }, /* 25 177 VK_MEDIA_PREV_TRACK */ + {KEY_MEDIA_STOP, KEY_SMEDIA_STOP, KEY_CMEDIA_STOP, KEY_AMEDIA_STOP, }, /* 26 178 VK_MEDIA_STOP */ + {KEY_PLAY_PAUSE, KEY_SPLAY_PAUSE, KEY_CPLAY_PAUSE, KEY_APLAY_PAUSE, }, /* 27 179 VK_MEDIA_PLAY_PAUSE */ + {KEY_LAUNCH_MAIL, KEY_SLAUNCH_MAIL, KEY_CLAUNCH_MAIL, KEY_ALAUNCH_MAIL, }, /* 28 180 VK_LAUNCH_MAIL */ + {KEY_MEDIA_SELECT, KEY_SMEDIA_SELECT, KEY_CMEDIA_SELECT, KEY_AMEDIA_SELECT, }, /* 29 181 VK_LAUNCH_MEDIA_SELECT */ + {KEY_LAUNCH_APP1, KEY_SLAUNCH_APP1, KEY_CLAUNCH_APP1, KEY_ALAUNCH_APP1, }, /* 30 182 VK_LAUNCH_APP1 */ + {KEY_LAUNCH_APP2, KEY_SLAUNCH_APP2, KEY_CLAUNCH_APP2, KEY_ALAUNCH_APP2, }, /* 31 183 VK_LAUNCH_APP2 */ +}; + +/* End of kptab[] */ + +unsigned long PDC_get_input_fd(void) +{ + PDC_LOG(("PDC_get_input_fd() - called\n")); + + return 0L; +} + +void PDC_set_keyboard_binary(bool on) +{ + PDC_LOG(("PDC_set_keyboard_binary() - called\n")); +} + +/* check if a key or mouse event is waiting */ + +bool PDC_check_key(void) +{ + if (key_count > 0) + return TRUE; + + GetNumberOfConsoleInputEvents(pdc_con_in, &event_count); + + return (event_count != 0); +} + +/* _get_key_count returns 0 if save_ip doesn't contain an event which + should be passed back to the user. This function filters "useless" + events. + + The function returns the number of keys waiting. This may be > 1 + if the repetition of real keys pressed so far are > 1. + + Returns 0 on NUMLOCK, CAPSLOCK, SCROLLLOCK. + + Returns 1 for SHIFT, ALT, CTRL only if no other key has been pressed + in between, and SP->return_key_modifiers is set; these are returned + on keyup. + + Normal keys are returned on keydown only. The number of repetitions + are returned. Dead keys (diacritics) are omitted. See below for a + description. +*/ + +static int repeat_count = 0; + +static int _get_key_count(void) +{ + int num_keys = 0, vk; + static int prev_vk = 0; + + PDC_LOG(("_get_key_count() - called\n")); + + vk = KEV.wVirtualKeyCode; + + if (KEV.bKeyDown) + { + /* key down */ + + save_press = 0; + + if (vk == VK_CAPITAL || vk == VK_NUMLOCK || vk == VK_SCROLL) + { + /* throw away these modifiers */ + } + else if (vk == VK_SHIFT || vk == VK_CONTROL || vk == VK_MENU) + { + /* These keys are returned on keyup only. */ + + save_press = vk; + switch (vk) + { + case VK_SHIFT: + left_key = GetKeyState(VK_LSHIFT); + break; + case VK_CONTROL: + left_key = GetKeyState(VK_LCONTROL); + break; + case VK_MENU: + left_key = GetKeyState(VK_LMENU); + } + } + else + { + /* Check for diacritics. These are dead keys. Some locales + have modified characters like umlaut-a, which is an "a" + with two dots on it. In some locales you have to press a + special key (the dead key) immediately followed by the + "a" to get a composed umlaut-a. The special key may have + a normal meaning with different modifiers. */ + + if (KEV.uChar.UnicodeChar || !(MapVirtualKey(vk, 2) & 0x80000000)) + num_keys = KEV.wRepeatCount; + } + if( vk == prev_vk) + repeat_count++; + else + repeat_count = 0; + prev_vk = vk; + } + else + { + /* key up */ + + /* Only modifier keys or the results of ALT-numpad entry are + returned on keyup */ + + if ((vk == VK_MENU && KEV.uChar.UnicodeChar) || + ((vk == VK_SHIFT || vk == VK_CONTROL || vk == VK_MENU) && + vk == save_press)) + { + save_press = 0; + num_keys = 1; + } + repeat_count = prev_vk = 0; + } + + PDC_LOG(("_get_key_count() - returning: num_keys %d\n", num_keys)); + + return num_keys; +} + +/* _process_key_event returns -1 if the key in save_ip should be + ignored. Otherwise it returns the keycode which should be returned + by PDC_get_key(). save_ip must be a key event. + + CTRL-ALT support has been disabled, when is it emitted plainly? */ + +static int _process_key_event(void) +{ + int key = (unsigned short)KEV.uChar.UnicodeChar; + WORD vk = KEV.wVirtualKeyCode; + DWORD state = KEV.dwControlKeyState; + + int idx; + BOOL enhanced; + + SP->key_code = TRUE; + + /* Save the key modifiers if required. Do this first to allow to + detect e.g. a pressed CTRL key after a hit of NUMLOCK. */ + + if (SP->save_key_modifiers) + { + if (state & (LEFT_ALT_PRESSED|RIGHT_ALT_PRESSED)) + pdc_key_modifiers |= PDC_KEY_MODIFIER_ALT; + + if (state & SHIFT_PRESSED) + pdc_key_modifiers |= PDC_KEY_MODIFIER_SHIFT; + + if (state & (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) + pdc_key_modifiers |= PDC_KEY_MODIFIER_CONTROL; + + if (state & NUMLOCK_ON) + pdc_key_modifiers |= PDC_KEY_MODIFIER_NUMLOCK; + + if( repeat_count) + pdc_key_modifiers |= PDC_KEY_MODIFIER_REPEAT; + } + + /* Handle modifier keys hit by themselves */ + + switch (vk) + { + case VK_SHIFT: /* shift */ + if (!SP->return_key_modifiers) + return -1; + + return (left_key & 0x8000) ? KEY_SHIFT_L : KEY_SHIFT_R; + + case VK_CONTROL: /* control */ + if (!SP->return_key_modifiers) + return -1; + + return (left_key & 0x8000) ? KEY_CONTROL_L : KEY_CONTROL_R; + + case VK_MENU: /* alt */ + if (!key) + { + if (!SP->return_key_modifiers) + return -1; + + return (left_key & 0x8000) ? KEY_ALT_L : KEY_ALT_R; + } + } + + /* The system may emit Ascii or Unicode characters depending on + whether ReadConsoleInputA or ReadConsoleInputW is used. + + Normally, if key != 0 then the system did the translation + successfully. But this is not true for LEFT_ALT (different to + RIGHT_ALT). In case of LEFT_ALT we can get key != 0. So + check for this first. */ + + if (key && ( !(state & LEFT_ALT_PRESSED) || + (state & RIGHT_ALT_PRESSED) )) + { + /* This code should catch all keys returning a printable + character. Characters above 0x7F should be returned as + positive codes. */ + + if (kptab[vk].extended == 0) + { + SP->key_code = FALSE; + return key; + } + } + + /* This case happens if a functional key has been entered. */ + + if ((state & ENHANCED_KEY) && (kptab[vk].extended != 999)) + { + enhanced = TRUE; + idx = kptab[vk].extended; + } + else + { + enhanced = FALSE; + idx = vk; + } + + if (state & SHIFT_PRESSED) + key = enhanced ? ext_kptab[idx].shift : kptab[idx].shift; + + else if (state & (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) + key = enhanced ? ext_kptab[idx].control : kptab[idx].control; + + else if (state & (LEFT_ALT_PRESSED|RIGHT_ALT_PRESSED)) + key = enhanced ? ext_kptab[idx].alt : kptab[idx].alt; + + else + key = enhanced ? ext_kptab[idx].normal : kptab[idx].normal; + + if (key < KEY_CODE_YES) + SP->key_code = FALSE; + + return key; +} + +static int _process_mouse_event(void) +{ + static const DWORD button_mask[] = {1, 4, 2}; + short action, shift_flags = 0; + int i; + + save_press = 0; + SP->key_code = TRUE; + + memset(&pdc_mouse_status, 0, sizeof(MOUSE_STATUS)); + + /* Handle scroll wheel */ + + if (MEV.dwEventFlags == 4) + { + pdc_mouse_status.changes = (MEV.dwButtonState & 0xFF000000) ? + PDC_MOUSE_WHEEL_DOWN : PDC_MOUSE_WHEEL_UP; + + pdc_mouse_status.x = -1; + pdc_mouse_status.y = -1; + + memset(&old_mouse_status, 0, sizeof(old_mouse_status)); + + return KEY_MOUSE; + } + + if (MEV.dwEventFlags == 8) + { + pdc_mouse_status.changes = (MEV.dwButtonState & 0xFF000000) ? + PDC_MOUSE_WHEEL_RIGHT : PDC_MOUSE_WHEEL_LEFT; + + pdc_mouse_status.x = -1; + pdc_mouse_status.y = -1; + + memset(&old_mouse_status, 0, sizeof(old_mouse_status)); + + return KEY_MOUSE; + } + + action = (MEV.dwEventFlags == 2) ? BUTTON_DOUBLE_CLICKED : + ((MEV.dwEventFlags == 1) ? BUTTON_MOVED : BUTTON_PRESSED); + + for (i = 0; i < 3; i++) + pdc_mouse_status.button[i] = + (MEV.dwButtonState & button_mask[i]) ? action : 0; + + if (action == BUTTON_PRESSED && MEV.dwButtonState & 7 && SP->mouse_wait) + { + /* Check for a click -- a PRESS followed immediately by a release */ + + if (!event_count) + { + napms(SP->mouse_wait); + + GetNumberOfConsoleInputEvents(pdc_con_in, &event_count); + } + + if (event_count) + { + INPUT_RECORD ip; + DWORD count; + bool have_click = FALSE; + + PeekConsoleInput(pdc_con_in, &ip, 1, &count); + + for (i = 0; i < 3; i++) + { + if (pdc_mouse_status.button[i] == BUTTON_PRESSED && + !(ip.Event.MouseEvent.dwButtonState & button_mask[i])) + { + pdc_mouse_status.button[i] = BUTTON_CLICKED; + have_click = TRUE; + } + } + + /* If a click was found, throw out the event */ + + if (have_click) + ReadConsoleInput(pdc_con_in, &ip, 1, &count); + } + } + + pdc_mouse_status.x = MEV.dwMousePosition.X; + pdc_mouse_status.y = MEV.dwMousePosition.Y; + + pdc_mouse_status.changes = 0; + + for (i = 0; i < 3; i++) + { + if (old_mouse_status.button[i] != pdc_mouse_status.button[i]) + pdc_mouse_status.changes |= (1 << i); + + if (pdc_mouse_status.button[i] == BUTTON_MOVED) + { + /* Discard non-moved "moves" */ + + if (pdc_mouse_status.x == old_mouse_status.x && + pdc_mouse_status.y == old_mouse_status.y) + return -1; + + /* Motion events always flag the button as changed */ + + pdc_mouse_status.changes |= (1 << i); + pdc_mouse_status.changes |= PDC_MOUSE_MOVED; + break; + } + } + + old_mouse_status = pdc_mouse_status; + + /* Treat click events as release events for comparison purposes */ + + for (i = 0; i < 3; i++) + { + if (old_mouse_status.button[i] == BUTTON_CLICKED || + old_mouse_status.button[i] == BUTTON_DOUBLE_CLICKED) + old_mouse_status.button[i] = BUTTON_RELEASED; + } + + /* Check for SHIFT/CONTROL/ALT */ + + if (MEV.dwControlKeyState & (LEFT_ALT_PRESSED|RIGHT_ALT_PRESSED)) + shift_flags |= BUTTON_ALT; + + if (MEV.dwControlKeyState & (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED)) + shift_flags |= BUTTON_CONTROL; + + if (MEV.dwControlKeyState & SHIFT_PRESSED) + shift_flags |= BUTTON_SHIFT; + + if (shift_flags) + { + for (i = 0; i < 3; i++) + { + if (pdc_mouse_status.changes & (1 << i)) + pdc_mouse_status.button[i] |= shift_flags; + } + } + + return KEY_MOUSE; +} + +int pdc_resizeX, pdc_resizeY; + +/* return the next available key or mouse event */ + +int PDC_get_key(void) +{ + pdc_key_modifiers = 0L; + + if (!key_count) + { + DWORD count; + + ReadConsoleInput(pdc_con_in, &save_ip, 1, &count); + event_count--; + + if (save_ip.EventType == MOUSE_EVENT || + save_ip.EventType == WINDOW_BUFFER_SIZE_EVENT) + key_count = 1; + else if (save_ip.EventType == KEY_EVENT) + key_count = _get_key_count(); + else if (save_ip.EventType == WINDOW_BUFFER_SIZE_EVENT) + key_count = 1; + } + + if (key_count) + { + key_count--; + + switch (save_ip.EventType) + { + case KEY_EVENT: + return _process_key_event(); + + case MOUSE_EVENT: + return _process_mouse_event(); + + case WINDOW_BUFFER_SIZE_EVENT: + if (REV.dwSize.Y != LINES || REV.dwSize.X != COLS) + { + if (!SP->resized) + { + SP->resized = TRUE; + SP->key_code = TRUE; + return KEY_RESIZE; + } + } + } + } + + return -1; +} + +/* discard any pending keyboard or mouse input -- this is the core + routine for flushinp() */ + +void PDC_flushinp(void) +{ + PDC_LOG(("PDC_flushinp() - called\n")); + + FlushConsoleInputBuffer(pdc_con_in); +} + +bool PDC_has_mouse( void) +{ + return TRUE; +} + +int PDC_mouse_set(void) +{ + /* If turning on mouse input: Set ENABLE_MOUSE_INPUT, and clear + all other flags, including the extended flags; + If turning off the mouse: Set QuickEdit Mode to the status it + had on startup, and clear all other flags */ + + SetConsoleMode(pdc_con_in, SP->_trap_mbe ? + (ENABLE_MOUSE_INPUT|0x0088) : (pdc_quick_edit|0x0088)); + + memset(&old_mouse_status, 0, sizeof(old_mouse_status)); + + return OK; +} + +int PDC_modifiers_set(void) +{ + return OK; +} + diff --git a/src/3rdparty/win32_src/pdcurses/wincon/pdcscrn.c b/src/3rdparty/win32_src/pdcurses/wincon/pdcscrn.c new file mode 100644 index 000000000..17dcd4d80 --- /dev/null +++ b/src/3rdparty/win32_src/pdcurses/wincon/pdcscrn.c @@ -0,0 +1,717 @@ +/* Public Domain Curses */ + +#include "pdcwin.h" + +#ifdef CHTYPE_LONG +# define PDC_OFFSET 32 +#else +# define PDC_OFFSET 8 +#endif + +#ifndef ENABLE_EXTENDED_FLAGS +# define ENABLE_EXTENDED_FLAGS 0x80 +#endif + +/* special purpose function keys */ +static int PDC_shutdown_key[PDC_MAX_FUNCTION_KEYS] = { 0, 0, 0, 0, 0 }; + +/* COLOR_PAIR to attribute encoding table. */ + +unsigned char *pdc_atrtab = (unsigned char *)NULL; + +HANDLE std_con_out = INVALID_HANDLE_VALUE; +HANDLE pdc_con_out = INVALID_HANDLE_VALUE; +HANDLE pdc_con_in = INVALID_HANDLE_VALUE; + +DWORD pdc_quick_edit; + +static short curstoreal[16], realtocurs[16] = +{ + COLOR_BLACK, COLOR_BLUE, COLOR_GREEN, COLOR_CYAN, COLOR_RED, + COLOR_MAGENTA, COLOR_YELLOW, COLOR_WHITE, COLOR_BLACK + 8, + COLOR_BLUE + 8, COLOR_GREEN + 8, COLOR_CYAN + 8, COLOR_RED + 8, + COLOR_MAGENTA + 8, COLOR_YELLOW + 8, COLOR_WHITE + 8 +}; + +enum { PDC_RESTORE_NONE, PDC_RESTORE_BUFFER }; + +/* Struct for storing console registry keys, and for use with the + undocumented WM_SETCONSOLEINFO message. Originally by James Brown, + www.catch22.net. */ + +static struct +{ + ULONG Length; + COORD ScreenBufferSize; + COORD WindowSize; + ULONG WindowPosX; + ULONG WindowPosY; + + COORD FontSize; + ULONG FontFamily; + ULONG FontWeight; + WCHAR FaceName[32]; + + ULONG CursorSize; + ULONG FullScreen; + ULONG QuickEdit; + ULONG AutoPosition; + ULONG InsertMode; + + USHORT ScreenColors; + USHORT PopupColors; + ULONG HistoryNoDup; + ULONG HistoryBufferSize; + ULONG NumberOfHistoryBuffers; + + COLORREF ColorTable[16]; + + ULONG CodePage; + HWND Hwnd; + + WCHAR ConsoleTitle[0x100]; +} console_info; + +#ifndef HAVE_INFOEX +/* Console screen buffer information (extended version) */ +typedef struct _CONSOLE_SCREEN_BUFFER_INFOEX { + ULONG cbSize; + COORD dwSize; + COORD dwCursorPosition; + WORD wAttributes; + SMALL_RECT srWindow; + COORD dwMaximumWindowSize; + WORD wPopupAttributes; + BOOL bFullscreenSupported; + COLORREF ColorTable[16]; +} CONSOLE_SCREEN_BUFFER_INFOEX; +typedef CONSOLE_SCREEN_BUFFER_INFOEX *PCONSOLE_SCREEN_BUFFER_INFOEX; +#endif + +typedef BOOL (WINAPI *SetConsoleScreenBufferInfoExFn)(HANDLE hConsoleOutput, + PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx); +typedef BOOL (WINAPI *GetConsoleScreenBufferInfoExFn)(HANDLE hConsoleOutput, + PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx); + +static SetConsoleScreenBufferInfoExFn pSetConsoleScreenBufferInfoEx = NULL; +static GetConsoleScreenBufferInfoExFn pGetConsoleScreenBufferInfoEx = NULL; + +static CONSOLE_SCREEN_BUFFER_INFO orig_scr; +static CONSOLE_SCREEN_BUFFER_INFOEX console_infoex; + +static LPTOP_LEVEL_EXCEPTION_FILTER xcpt_filter; + +static DWORD old_console_mode = 0; + +static bool is_nt; + +static HWND _find_console_handle(void) +{ + TCHAR orgtitle[1024], temptitle[1024]; + HWND wnd; + + GetConsoleTitle(orgtitle, 1024); + + wsprintf(temptitle, TEXT("%d/%d"), GetTickCount(), GetCurrentProcessId()); + SetConsoleTitle(temptitle); + + Sleep(40); + + wnd = FindWindow(NULL, temptitle); + + SetConsoleTitle(orgtitle); + + return wnd; +} + +/* Undocumented console message */ + +#define WM_SETCONSOLEINFO (WM_USER + 201) + +/* Wrapper around WM_SETCONSOLEINFO. We need to create the necessary + section (file-mapping) object in the context of the process which + owns the console, before posting the message. Originally by JB. */ + +static void _set_console_info(void) +{ + CONSOLE_SCREEN_BUFFER_INFO csbi; + CONSOLE_CURSOR_INFO cci; + DWORD dwConsoleOwnerPid; + HANDLE hProcess; + HANDLE hSection, hDupSection; + PVOID ptrView; + + /* Each-time initialization for console_info */ + + GetConsoleCursorInfo(pdc_con_out, &cci); + console_info.CursorSize = cci.dwSize; + + GetConsoleScreenBufferInfo(pdc_con_out, &csbi); + console_info.ScreenBufferSize = csbi.dwSize; + + console_info.WindowSize.X = csbi.srWindow.Right - csbi.srWindow.Left + 1; + console_info.WindowSize.Y = csbi.srWindow.Bottom - csbi.srWindow.Top + 1; + + console_info.WindowPosX = csbi.srWindow.Left; + console_info.WindowPosY = csbi.srWindow.Top; + + /* Open the process which "owns" the console */ + + GetWindowThreadProcessId(console_info.Hwnd, &dwConsoleOwnerPid); + + hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, dwConsoleOwnerPid); + + /* Create a SECTION object backed by page-file, then map a view of + this section into the owner process so we can write the contents + of the CONSOLE_INFO buffer into it */ + + hSection = CreateFileMapping(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, + 0, sizeof(console_info), 0); + + /* Copy our console structure into the section-object */ + + ptrView = MapViewOfFile(hSection, FILE_MAP_WRITE|FILE_MAP_READ, + 0, 0, sizeof(console_info)); + + memcpy(ptrView, &console_info, sizeof(console_info)); + + UnmapViewOfFile(ptrView); + + /* Map the memory into owner process */ + + DuplicateHandle(GetCurrentProcess(), hSection, hProcess, &hDupSection, + 0, FALSE, DUPLICATE_SAME_ACCESS); + + /* Send console window the "update" message */ + + SendMessage(console_info.Hwnd, WM_SETCONSOLEINFO, (WPARAM)hDupSection, 0); + + CloseHandle(hSection); + CloseHandle(hProcess); +} + +static int _set_console_infoex(void) +{ + if (!pSetConsoleScreenBufferInfoEx(pdc_con_out, &console_infoex)) + return ERR; + + return OK; +} + +static int _set_colors(void) +{ + if (pSetConsoleScreenBufferInfoEx) + return _set_console_infoex(); + else + { + _set_console_info(); + return OK; + } +} + +/* One-time initialization for console_info -- color table and font info + from the registry; other values from functions. */ + +static void _init_console_info(void) +{ + DWORD scrnmode, len; + HKEY reghnd; + int i; + + console_info.Hwnd = _find_console_handle(); + console_info.Length = sizeof(console_info); + + GetConsoleMode(pdc_con_in, &scrnmode); + console_info.QuickEdit = !!(scrnmode & 0x0040); + console_info.InsertMode = !!(scrnmode & 0x0020); + + console_info.FullScreen = FALSE; + console_info.AutoPosition = 0x10000; + console_info.ScreenColors = SP->orig_back << 4 | SP->orig_fore; + console_info.PopupColors = 0xf5; + + console_info.HistoryNoDup = FALSE; + console_info.HistoryBufferSize = 50; + console_info.NumberOfHistoryBuffers = 4; + + console_info.CodePage = GetConsoleOutputCP(); + + RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Console"), 0, + KEY_QUERY_VALUE, ®hnd); + + len = sizeof(DWORD); + + /* Default color table */ + + for (i = 0; i < 16; i++) + { + char tname[13]; + + sprintf(tname, "ColorTable%02d", i); + RegQueryValueExA(reghnd, tname, NULL, NULL, + (LPBYTE)(&(console_info.ColorTable[i])), &len); + } + + /* Font info */ + + RegQueryValueEx(reghnd, TEXT("FontSize"), NULL, NULL, + (LPBYTE)(&console_info.FontSize), &len); + RegQueryValueEx(reghnd, TEXT("FontFamily"), NULL, NULL, + (LPBYTE)(&console_info.FontFamily), &len); + RegQueryValueEx(reghnd, TEXT("FontWeight"), NULL, NULL, + (LPBYTE)(&console_info.FontWeight), &len); + + len = sizeof(WCHAR) * 32; + RegQueryValueExW(reghnd, L"FaceName", NULL, NULL, + (LPBYTE)(console_info.FaceName), &len); + + RegCloseKey(reghnd); +} + +static int _init_console_infoex(void) +{ + console_infoex.cbSize = sizeof(console_infoex); + + if (!pGetConsoleScreenBufferInfoEx(pdc_con_out, &console_infoex)) + return ERR; + + console_infoex.srWindow.Right++; + console_infoex.srWindow.Bottom++; + + return OK; +} + +static COLORREF *_get_colors(void) +{ + if (pGetConsoleScreenBufferInfoEx) + { + int status = OK; + if (!console_infoex.cbSize) + status = _init_console_infoex(); + return (status == ERR) ? NULL : + (COLORREF *)(&(console_infoex.ColorTable)); + } + else + { + if (!console_info.Hwnd) + _init_console_info(); + return (COLORREF *)(&(console_info.ColorTable)); + } +} + +/* restore the original console buffer in the event of a crash */ + +static LONG WINAPI _restore_console(LPEXCEPTION_POINTERS ep) +{ + PDC_scr_close(); + + return EXCEPTION_CONTINUE_SEARCH; +} + +/* restore the original console buffer on Ctrl+Break (or Ctrl+C, + if it gets re-enabled) */ + +static BOOL WINAPI _ctrl_break(DWORD dwCtrlType) +{ + if (dwCtrlType == CTRL_BREAK_EVENT || dwCtrlType == CTRL_C_EVENT) + PDC_scr_close(); + + return FALSE; +} + +/* close the physical screen -- may restore the screen to its state + before PDC_scr_open(); miscellaneous cleanup */ + +void PDC_scr_close(void) +{ + PDC_LOG(("PDC_scr_close() - called\n")); + + if (SP->visibility != 1) + curs_set(1); + + PDC_reset_shell_mode(); + + /* Position cursor to the bottom left of the screen. */ + + if (SP->_restore == PDC_RESTORE_NONE) + { + SMALL_RECT win; + + win.Left = orig_scr.srWindow.Left; + win.Right = orig_scr.srWindow.Right; + win.Top = 0; + win.Bottom = orig_scr.srWindow.Bottom - orig_scr.srWindow.Top; + SetConsoleWindowInfo(pdc_con_out, TRUE, &win); + PDC_gotoyx(win.Bottom, 0); + } +} + +void PDC_scr_free(void) +{ + if (SP) + free(SP); + if (pdc_atrtab) + free(pdc_atrtab); + + pdc_atrtab = (unsigned char *)NULL; + + if (pdc_con_out != std_con_out) + { + CloseHandle(pdc_con_out); + pdc_con_out = std_con_out; + } + + SetUnhandledExceptionFilter(xcpt_filter); + SetConsoleCtrlHandler(_ctrl_break, FALSE); +} + +/* open the physical screen -- allocate SP, miscellaneous intialization, + and may save the existing screen for later restoration */ + +int PDC_scr_open(int argc, char **argv) +{ + const char *str; + CONSOLE_SCREEN_BUFFER_INFO csbi; + HMODULE h_kernel; + int i; + + PDC_LOG(("PDC_scr_open() - called\n")); + + SP = calloc(1, sizeof(SCREEN)); + pdc_atrtab = calloc(PDC_COLOR_PAIRS * PDC_OFFSET, 1); + + if (!SP || !pdc_atrtab) + return ERR; + + for (i = 0; i < 16; i++) + curstoreal[realtocurs[i]] = i; + + std_con_out = + pdc_con_out = GetStdHandle(STD_OUTPUT_HANDLE); + pdc_con_in = GetStdHandle(STD_INPUT_HANDLE); + + if (GetFileType(pdc_con_in) != FILE_TYPE_CHAR) + { + fprintf(stderr, "\nRedirection is not supported.\n"); + exit(1); + } + +#if defined(_MSC_VER) && _MSC_VER >= 1800 /* VS2013 and above can't build */ + is_nt = TRUE; /* non-NT (Win9x/3.1/ME) targets anyway, so always true */ +#else + is_nt = !(GetVersion() & 0x80000000); +#endif + + GetConsoleScreenBufferInfo(pdc_con_out, &csbi); + GetConsoleScreenBufferInfo(pdc_con_out, &orig_scr); + GetConsoleMode(pdc_con_in, &old_console_mode); + + /* preserve QuickEdit Mode setting for use in PDC_mouse_set() when + the mouse is not enabled -- other console input settings are + cleared */ + + pdc_quick_edit = old_console_mode & 0x0040; + + SP->lines = (str = getenv("LINES")) ? atoi(str) : PDC_get_rows(); + SP->cols = (str = getenv("COLS")) ? atoi(str) : PDC_get_columns(); + + SP->mouse_wait = PDC_CLICK_PERIOD; + SP->audible = TRUE; + + if (SP->lines < 2 || SP->lines > csbi.dwMaximumWindowSize.Y) + { + fprintf(stderr, "LINES value must be >= 2 and <= %d: got %d\n", + csbi.dwMaximumWindowSize.Y, SP->lines); + + return ERR; + } + + if (SP->cols < 2 || SP->cols > csbi.dwMaximumWindowSize.X) + { + fprintf(stderr, "COLS value must be >= 2 and <= %d: got %d\n", + csbi.dwMaximumWindowSize.X, SP->cols); + + return ERR; + } + + SP->orig_fore = csbi.wAttributes & 0x0f; + SP->orig_back = (csbi.wAttributes & 0xf0) >> 4; + + SP->orig_attr = TRUE; + + SP->_restore = PDC_RESTORE_NONE; + + if ((str = getenv("PDC_RESTORE_SCREEN")) == NULL || *str != '0') + { + /* Create a new console buffer */ + + pdc_con_out = + CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CONSOLE_TEXTMODE_BUFFER, NULL); + + if (pdc_con_out == INVALID_HANDLE_VALUE) + { + PDC_LOG(("PDC_scr_open() - screen buffer failure\n")); + + pdc_con_out = std_con_out; + } + else + SP->_restore = PDC_RESTORE_BUFFER; + } + + xcpt_filter = SetUnhandledExceptionFilter(_restore_console); + SetConsoleCtrlHandler(_ctrl_break, TRUE); + + SP->_preserve = (getenv("PDC_PRESERVE_SCREEN") != NULL); + + PDC_reset_prog_mode(); + + SP->mono = FALSE; + + h_kernel = GetModuleHandleA("kernel32.dll"); + pGetConsoleScreenBufferInfoEx = + (GetConsoleScreenBufferInfoExFn)GetProcAddress(h_kernel, + "GetConsoleScreenBufferInfoEx"); + pSetConsoleScreenBufferInfoEx = + (SetConsoleScreenBufferInfoExFn)GetProcAddress(h_kernel, + "SetConsoleScreenBufferInfoEx"); + + return OK; +} + + /* Calls SetConsoleWindowInfo with the given parameters, but fits them + if a scoll bar shrinks the maximum possible value. The rectangle + must at least fit in a half-sized window. */ + +static BOOL _fit_console_window(HANDLE con_out, CONST SMALL_RECT *rect) +{ + SMALL_RECT run; + SHORT mx, my; + + if (SetConsoleWindowInfo(con_out, TRUE, rect)) + return TRUE; + + run = *rect; + run.Right /= 2; + run.Bottom /= 2; + + mx = run.Right; + my = run.Bottom; + + if (!SetConsoleWindowInfo(con_out, TRUE, &run)) + return FALSE; + + for (run.Right = rect->Right; run.Right >= mx; run.Right--) + if (SetConsoleWindowInfo(con_out, TRUE, &run)) + break; + + if (run.Right < mx) + return FALSE; + + for (run.Bottom = rect->Bottom; run.Bottom >= my; run.Bottom--) + if (SetConsoleWindowInfo(con_out, TRUE, &run)) + return TRUE; + + return FALSE; +} + +/* the core of resize_term() */ + +int PDC_resize_screen(int nlines, int ncols) +{ + SMALL_RECT rect; + COORD size, max; + + if( nlines || ncols) + { + if (nlines < 2 || ncols < 2) + return ERR; + + if( !stdscr) /* window hasn't been created yet; we're */ + { /* specifying its size before doing so */ + return OK; /* ...which doesn't work (yet) on Win32 */ + } + + max = GetLargestConsoleWindowSize(pdc_con_out); + + rect.Left = rect.Top = 0; + rect.Right = ncols - 1; + + if (rect.Right > max.X) + rect.Right = max.X; + + rect.Bottom = nlines - 1; + + if (rect.Bottom > max.Y) + rect.Bottom = max.Y; + + size.X = rect.Right + 1; + size.Y = rect.Bottom + 1; + + _fit_console_window(pdc_con_out, &rect); + SetConsoleScreenBufferSize(pdc_con_out, size); + _fit_console_window(pdc_con_out, &rect); + SetConsoleScreenBufferSize(pdc_con_out, size); + SetConsoleActiveScreenBuffer(pdc_con_out); + } + + PDC_flushinp(); + + SP->resized = FALSE; + SP->cursrow = SP->curscol = 0; + + return OK; +} + +void PDC_reset_prog_mode(void) +{ + PDC_LOG(("PDC_reset_prog_mode() - called.\n")); + + if (pdc_con_out != std_con_out) + SetConsoleActiveScreenBuffer(pdc_con_out); + else if (is_nt) + { + COORD bufsize; + SMALL_RECT rect; + + bufsize.X = orig_scr.srWindow.Right - orig_scr.srWindow.Left + 1; + bufsize.Y = orig_scr.srWindow.Bottom - orig_scr.srWindow.Top + 1; + + rect.Top = rect.Left = 0; + rect.Bottom = bufsize.Y - 1; + rect.Right = bufsize.X - 1; + + SetConsoleScreenBufferSize(pdc_con_out, bufsize); + SetConsoleWindowInfo(pdc_con_out, TRUE, &rect); + SetConsoleScreenBufferSize(pdc_con_out, bufsize); + SetConsoleActiveScreenBuffer(pdc_con_out); + } + + PDC_mouse_set(); +} + +void PDC_reset_shell_mode(void) +{ + PDC_LOG(("PDC_reset_shell_mode() - called.\n")); + + if (pdc_con_out != std_con_out) + SetConsoleActiveScreenBuffer(std_con_out); + else if (is_nt) + { + SetConsoleScreenBufferSize(pdc_con_out, orig_scr.dwSize); + SetConsoleWindowInfo(pdc_con_out, TRUE, &orig_scr.srWindow); + SetConsoleScreenBufferSize(pdc_con_out, orig_scr.dwSize); + SetConsoleWindowInfo(pdc_con_out, TRUE, &orig_scr.srWindow); + SetConsoleActiveScreenBuffer(pdc_con_out); + } + + SetConsoleMode(pdc_con_in, old_console_mode | ENABLE_EXTENDED_FLAGS); +} + +void PDC_restore_screen_mode(int i) +{ +} + +void PDC_save_screen_mode(int i) +{ +} + +void PDC_init_pair(short pair, short fg, short bg) +{ + unsigned char att, temp_bg; + chtype i; + + fg = curstoreal[fg]; + bg = curstoreal[bg]; + + for (i = 0; i < PDC_OFFSET; i++) + { + att = fg | (bg << 4); + + if (i & (A_REVERSE >> PDC_ATTR_SHIFT)) + att = bg | (fg << 4); + if (i & (A_UNDERLINE >> PDC_ATTR_SHIFT)) + att = 1; + if (i & (A_INVIS >> PDC_ATTR_SHIFT)) + { + temp_bg = att >> 4; + att = temp_bg << 4 | temp_bg; + } + if (i & (A_BOLD >> PDC_ATTR_SHIFT)) + att |= 8; + if (i & (A_BLINK >> PDC_ATTR_SHIFT)) + att |= 128; + + pdc_atrtab[pair * PDC_OFFSET + i] = att; + } +} + +int PDC_pair_content(short pair, short *fg, short *bg) +{ + *fg = realtocurs[pdc_atrtab[pair * PDC_OFFSET] & 0x0F]; + *bg = realtocurs[(pdc_atrtab[pair * PDC_OFFSET] & 0xF0) >> 4]; + + return OK; +} + +bool PDC_can_change_color(void) +{ + return is_nt; +} + +int PDC_color_content(short color, short *red, short *green, short *blue) +{ + COLORREF *color_table = _get_colors(); + + if (color_table) + { + DWORD col = color_table[curstoreal[color]]; + + *red = DIVROUND(GetRValue(col) * 1000, 255); + *green = DIVROUND(GetGValue(col) * 1000, 255); + *blue = DIVROUND(GetBValue(col) * 1000, 255); + + return OK; + } + + return ERR; +} + +int PDC_init_color(short color, short red, short green, short blue) +{ + COLORREF *color_table = _get_colors(); + + if (color_table) + { + color_table[curstoreal[color]] = + RGB(DIVROUND(red * 255, 1000), + DIVROUND(green * 255, 1000), + DIVROUND(blue * 255, 1000)); + + return _set_colors(); + } + + return ERR; +} + +/* Does nothing in the Win32 flavor of PDCurses. Included solely because +without this, we get an unresolved external... */ + +void PDC_set_resize_limits( const int new_min_lines, const int new_max_lines, + const int new_min_cols, const int new_max_cols) +{ +} + +/* PDC_set_function_key() does nothing on this platform */ +int PDC_set_function_key( const unsigned function, const int new_key) +{ + int old_key = -1; + + if( function < PDC_MAX_FUNCTION_KEYS) + { + old_key = PDC_shutdown_key[function]; + PDC_shutdown_key[function] = new_key; + } + return( old_key); +} diff --git a/src/3rdparty/win32_src/pdcurses/wincon/pdcsetsc.c b/src/3rdparty/win32_src/pdcurses/wincon/pdcsetsc.c new file mode 100644 index 000000000..2c40d1dad --- /dev/null +++ b/src/3rdparty/win32_src/pdcurses/wincon/pdcsetsc.c @@ -0,0 +1,91 @@ +/* Public Domain Curses */ + +#include "pdcwin.h" + +/*man-start************************************************************** + +pdcsetsc +-------- + +### Synopsis + + int PDC_set_blink(bool blinkon); + void PDC_set_title(const char *title); + +### Description + + PDC_set_blink() toggles whether the A_BLINK attribute sets an + actual blink mode (TRUE), or sets the background color to high + intensity (FALSE). The default is platform-dependent (FALSE in + most cases). It returns OK if it could set the state to match + the given parameter, ERR otherwise. Current platforms also + adjust the value of COLORS according to this function -- 16 for + FALSE, and 8 for TRUE. + + PDC_set_title() sets the title of the window in which the curses + program is running. This function may not do anything on some + platforms. (Currently it only works in Win32 and X11.) + +### Portability + X/Open BSD SYS V + PDC_set_blink - - - + PDC_set_title - - - + +**man-end****************************************************************/ + +int PDC_curs_set(int visibility) +{ + CONSOLE_CURSOR_INFO cci; + int ret_vis; + + PDC_LOG(("PDC_curs_set() - called: visibility=%d\n", visibility)); + + ret_vis = SP->visibility; + + if (GetConsoleCursorInfo(pdc_con_out, &cci) == FALSE) + return ERR; + + switch(visibility) + { + case 0: /* invisible */ + cci.bVisible = FALSE; + break; + case 2: /* highly visible */ + cci.bVisible = TRUE; + cci.dwSize = 95; + break; + default: /* normal visibility */ + cci.bVisible = TRUE; + cci.dwSize = SP->orig_cursor; + break; + } + + if (SetConsoleCursorInfo(pdc_con_out, &cci) == FALSE) + return ERR; + + SP->visibility = visibility; + return ret_vis; +} + +void PDC_set_title(const char *title) +{ +#ifdef PDC_WIDE + wchar_t wtitle[512]; +#endif + PDC_LOG(("PDC_set_title() - called:<%s>\n", title)); + +#ifdef PDC_WIDE + PDC_mbstowcs(wtitle, title, 511); + SetConsoleTitleW(wtitle); +#else + SetConsoleTitleA(title); +#endif +} + +int PDC_set_blink(bool blinkon) +{ + if (pdc_color_started) + COLORS = 16; + + return blinkon ? ERR : OK; +} diff --git a/src/3rdparty/win32_src/pdcurses/wincon/pdcutil.c b/src/3rdparty/win32_src/pdcurses/wincon/pdcutil.c new file mode 100644 index 000000000..59f5c2fba --- /dev/null +++ b/src/3rdparty/win32_src/pdcurses/wincon/pdcutil.c @@ -0,0 +1,41 @@ +/* Public Domain Curses */ + +#include "pdcwin.h" + +void PDC_beep(void) +{ + PDC_LOG(("PDC_beep() - called\n")); + +/* MessageBeep(MB_OK); */ + MessageBeep(0XFFFFFFFF); +} + +void PDC_napms(int ms) +{ + PDC_LOG(("PDC_napms() - called: ms=%d\n", ms)); + + Sleep(ms); +} + +const char *PDC_sysname(void) +{ + return "Win32"; +} + +PDC_version_info PDC_version = { PDC_PORT_WIN32, + PDC_VER_MAJOR, PDC_VER_MINOR, PDC_VER_CHANGE, + sizeof( chtype), + /* note that thus far, 'wide' and 'UTF8' versions exist */ + /* only for SDL2, X11, Win32, and Win32a; elsewhere, */ + /* these will be FALSE */ +#ifdef PDC_WIDE + TRUE, +#else + FALSE, +#endif +#ifdef PDC_FORCE_UTF8 + TRUE, +#else + FALSE, +#endif + }; diff --git a/src/3rdparty/win32_src/pdcurses/wincon/pdcwin.h b/src/3rdparty/win32_src/pdcurses/wincon/pdcwin.h new file mode 100644 index 000000000..4a37caa1f --- /dev/null +++ b/src/3rdparty/win32_src/pdcurses/wincon/pdcwin.h @@ -0,0 +1,31 @@ +/* Public Domain Curses */ + +#if defined( PDC_WIDE) && !defined( UNICODE) +# define UNICODE +#endif + +#include +#undef MOUSE_MOVED +#include + +# if(CHTYPE_LONG >= 2) /* 64-bit chtypes */ + # define PDC_ATTR_SHIFT 23 +# else +#ifdef CHTYPE_LONG /* 32-bit chtypes */ + # define PDC_ATTR_SHIFT 19 +#else /* 16-bit chtypes */ + # define PDC_ATTR_SHIFT 8 +#endif +#endif +#if (defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WATCOMC__) \ + || (defined(_MSC_VER) && _WIN32_WINNT >= _WIN32_WINNT_VISTA)) + #if !defined(HAVE_INFOEX) && !defined(HAVE_NO_INFOEX) + # define HAVE_INFOEX + #endif +#endif + +extern unsigned char *pdc_atrtab; +extern HANDLE pdc_con_out, pdc_con_in; +extern DWORD pdc_quick_edit; + +extern int PDC_get_buffer_rows(void); diff --git a/src/3rdparty/win32_src/pdcurses/wingui/pdcclip.c b/src/3rdparty/win32_src/pdcurses/wingui/pdcclip.c new file mode 100644 index 000000000..0b86951ae --- /dev/null +++ b/src/3rdparty/win32_src/pdcurses/wingui/pdcclip.c @@ -0,0 +1,174 @@ +/* Public Domain Curses */ + +#include "pdcwin.h" + +/*man-start************************************************************** + +clipboard +--------- + +### Synopsis + + int PDC_getclipboard(char **contents, long *length); + int PDC_setclipboard(const char *contents, long length); + int PDC_freeclipboard(char *contents); + int PDC_clearclipboard(void); + +### Description + + PDC_getclipboard() gets the textual contents of the system's + clipboard. This function returns the contents of the clipboard + in the contents argument. It is the responsibility of the + caller to free the memory returned, via PDC_freeclipboard(). + The length of the clipboard contents is returned in the length + argument. + + PDC_setclipboard copies the supplied text into the system's + clipboard, emptying the clipboard prior to the copy. + + PDC_clearclipboard() clears the internal clipboard. + +### Return Values + + indicator of success/failure of call. + PDC_CLIP_SUCCESS the call was successful + PDC_CLIP_MEMORY_ERROR unable to allocate sufficient memory for + the clipboard contents + PDC_CLIP_EMPTY the clipboard contains no text + PDC_CLIP_ACCESS_ERROR no clipboard support + +### Portability + X/Open BSD SYS V + PDC_getclipboard - - - + PDC_setclipboard - - - + PDC_freeclipboard - - - + PDC_clearclipboard - - - + +**man-end****************************************************************/ + +#ifdef PDC_WIDE +# define PDC_TEXT CF_UNICODETEXT +#else +# define PDC_TEXT CF_OEMTEXT +#endif + +int PDC_getclipboard_handle( HANDLE *handle) +{ + PDC_LOG(("PDC_getclipboard() - called\n")); + + if (!OpenClipboard(NULL)) + { + return PDC_CLIP_ACCESS_ERROR; + } + + if ((*handle = GetClipboardData(PDC_TEXT)) == NULL) + { + CloseClipboard(); + return PDC_CLIP_EMPTY; + } + + return PDC_CLIP_SUCCESS; +} + +int PDC_getclipboard(char **contents, long *length) +{ + HANDLE handle; + int rval = PDC_getclipboard_handle( &handle); + + if( rval == PDC_CLIP_SUCCESS) + { + void *tptr = GlobalLock( handle); + + if( tptr) + { +#ifdef PDC_WIDE + size_t len = wcslen((wchar_t *)tptr) * 3; +#else + size_t len = strlen( tptr); +#endif + + *contents = (char *)GlobalAlloc( GMEM_FIXED, len + 1); + + if( !*contents) + rval = PDC_CLIP_MEMORY_ERROR; + else + { +#ifdef PDC_WIDE + len = PDC_wcstombs( (char *)*contents, tptr, len); +#else + strcpy((char *)*contents, tptr); +#endif + } + *length = (long)len; + GlobalUnlock( handle); + } + else + rval = PDC_CLIP_MEMORY_ERROR; + CloseClipboard(); + } + return rval; +} + +int PDC_setclipboard_raw( const char *contents, long length, + const bool translate_multibyte_to_wide_char) +{ + HGLOBAL handle; + LPTSTR buff; + + PDC_LOG(("PDC_setclipboard() - called\n")); + + if (!OpenClipboard(NULL)) + return PDC_CLIP_ACCESS_ERROR; + + handle = GlobalAlloc(GMEM_MOVEABLE|GMEM_DDESHARE, + (length + 1) * sizeof(TCHAR)); + + if (!handle) + return PDC_CLIP_MEMORY_ERROR; + + buff = GlobalLock(handle); + +#ifdef PDC_WIDE + if( translate_multibyte_to_wide_char) + PDC_mbstowcs((wchar_t *)buff, contents, length); + else + memcpy((char *)buff, contents, (length + 1) * sizeof( wchar_t)); +#else + memcpy((char *)buff, contents, length); + buff[length] = 0; /* ensure null termination */ +#endif + GlobalUnlock(handle); + EmptyClipboard(); + + if( !SetClipboardData(PDC_TEXT, handle)) + { + GlobalFree(handle); + return PDC_CLIP_ACCESS_ERROR; + } + + CloseClipboard(); + + return PDC_CLIP_SUCCESS; +} + +int PDC_setclipboard(const char *contents, long length) +{ + return( PDC_setclipboard_raw( contents, length, TRUE)); +} + +int PDC_freeclipboard(char *contents) +{ + PDC_LOG(("PDC_freeclipboard() - called\n")); + + GlobalFree(contents); + return PDC_CLIP_SUCCESS; +} + +int PDC_clearclipboard(void) +{ + PDC_LOG(("PDC_clearclipboard() - called\n")); + + EmptyClipboard(); + + return PDC_CLIP_SUCCESS; +} diff --git a/src/3rdparty/win32_src/pdcurses/pdcdisp.c b/src/3rdparty/win32_src/pdcurses/wingui/pdcdisp.c similarity index 100% rename from src/3rdparty/win32_src/pdcurses/pdcdisp.c rename to src/3rdparty/win32_src/pdcurses/wingui/pdcdisp.c diff --git a/src/3rdparty/win32_src/pdcurses/pdcgetsc.c b/src/3rdparty/win32_src/pdcurses/wingui/pdcgetsc.c similarity index 100% rename from src/3rdparty/win32_src/pdcurses/pdcgetsc.c rename to src/3rdparty/win32_src/pdcurses/wingui/pdcgetsc.c diff --git a/src/3rdparty/win32_src/pdcurses/pdckbd.c b/src/3rdparty/win32_src/pdcurses/wingui/pdckbd.c similarity index 100% rename from src/3rdparty/win32_src/pdcurses/pdckbd.c rename to src/3rdparty/win32_src/pdcurses/wingui/pdckbd.c diff --git a/src/3rdparty/win32_src/pdcurses/pdcscrn.c b/src/3rdparty/win32_src/pdcurses/wingui/pdcscrn.c similarity index 100% rename from src/3rdparty/win32_src/pdcurses/pdcscrn.c rename to src/3rdparty/win32_src/pdcurses/wingui/pdcscrn.c diff --git a/src/3rdparty/win32_src/pdcurses/pdcsetsc.c b/src/3rdparty/win32_src/pdcurses/wingui/pdcsetsc.c similarity index 100% rename from src/3rdparty/win32_src/pdcurses/pdcsetsc.c rename to src/3rdparty/win32_src/pdcurses/wingui/pdcsetsc.c diff --git a/src/3rdparty/win32_src/pdcurses/pdcutil.c b/src/3rdparty/win32_src/pdcurses/wingui/pdcutil.c similarity index 100% rename from src/3rdparty/win32_src/pdcurses/pdcutil.c rename to src/3rdparty/win32_src/pdcurses/wingui/pdcutil.c diff --git a/src/3rdparty/win32_src/pdcurses/pdcwin.h b/src/3rdparty/win32_src/pdcurses/wingui/pdcwin.h similarity index 100% rename from src/3rdparty/win32_src/pdcurses/pdcwin.h rename to src/3rdparty/win32_src/pdcurses/wingui/pdcwin.h diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index a142f1809..78927df80 100755 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -30,67 +46,127 @@ true v141 + + StaticLibrary + Unicode + true + v141 + StaticLibrary Unicode true v141 + + StaticLibrary + Unicode + true + v141 + StaticLibrary Unicode v141 false + + StaticLibrary + Unicode + v141 + false + StaticLibrary Unicode v141 false + + StaticLibrary + Unicode + v141 + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)/bin32/$(Configuration) + $(SolutionDir)/bin32/$(Configuration) ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ $(SolutionDir)/bin32/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + $(SolutionDir)/bin64/$(Configuration)/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin64/$(Configuration)/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/ + ./obj64/$(Configuration)/ + Disabled @@ -109,6 +185,24 @@ true + + + Disabled + ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + pch.hpp + Level3 + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)$(ProjectName).pdb + true + + Disabled @@ -126,6 +220,23 @@ true + + + Disabled + ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + pch.hpp + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)$(ProjectName).pdb + true + + Full @@ -145,6 +256,25 @@ Sync + + + Full + Default + true + Speed + ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + Use + pch.hpp + $(IntDir) + $(IntDir) + $(IntDir)$(ProjectName).pdb + true + true + Sync + + Full @@ -164,6 +294,25 @@ Sync + + + Full + Default + true + Speed + ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + Use + pch.hpp + $(IntDir) + $(IntDir) + $(IntDir)$(ProjectName).pdb + true + true + Sync + + @@ -209,9 +358,13 @@ Create + Create Create + Create Create + Create Create + Create diff --git a/src/core_c_demo/core_c_demo.vcxproj b/src/core_c_demo/core_c_demo.vcxproj index c8ba43389..f04a71a99 100644 --- a/src/core_c_demo/core_c_demo.vcxproj +++ b/src/core_c_demo/core_c_demo.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -32,12 +48,24 @@ true v141 + + Application + Unicode + true + v141 + Application Unicode true v141 + + Application + Unicode + true + v141 + Application false @@ -46,6 +74,14 @@ v141 false + + Application + false + false + Unicode + v141 + false + Application false @@ -54,53 +90,101 @@ v141 false + + Application + false + false + Unicode + v141 + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)/bin32/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ true + true true + true $(SolutionDir)/bin32/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ false + false false + false AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + $(SolutionDir)/bin64/$(Configuration)/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin64/$(Configuration)/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/ + ./obj64/$(Configuration)/ + Disabled @@ -138,6 +222,47 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\ffmpeg\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\lame\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\libcurl\*" "$(TargetDir)" /Y /e if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" +xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e + + + + + Disabled + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + NotUsing + Level3 + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + true + + + + + ../../../boost_1_71_0/lib32-msvc-14.1;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + true + Console + + + MachineX86 + pdh.lib;psapi.lib;Ws2_32.lib;wldap32.lib;Comctl32.lib;libcurl.lib;%(AdditionalDependencies) + false + + + if not exist "$(TargetDir)themes" mkdir "$(TargetDir)themes" +xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e +if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales" +xcopy "$(ProjectDir)data\locales\*" "$(TargetDir)locales\" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\ffmpeg\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\lame\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\libcurl\*" "$(TargetDir)" /Y /e +if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e @@ -176,6 +301,45 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\ffmpeg\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\lame\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\libcurl\*" "$(TargetDir)" /Y /e if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" +xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e + + + + + Disabled + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + NotUsing + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + true + + + + + ../../../boost_1_71_0/lib64-msvc-14.1;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + true + Console + + + pdh.lib;psapi.lib;Ws2_32.lib;wldap32.lib;Comctl32.lib;libcurl.lib;%(AdditionalDependencies) + false + + + if not exist "$(TargetDir)themes" mkdir "$(TargetDir)themes" +xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e +if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales" +xcopy "$(ProjectDir)data\locales\*" "$(TargetDir)locales\" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\ffmpeg\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\lame\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\libcurl\*" "$(TargetDir)" /Y /e +if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e @@ -222,6 +386,53 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\ffmpeg\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\lame\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\libcurl\*" "$(TargetDir)" /Y /e if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" +xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e + + + + + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + NotUsing + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + Full + true + true + Sync + + + + + ../../../boost_1_71_0/lib32-msvc-14.1;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + false + Console + + + + + + + MachineX86 + pdh.lib;psapi.lib;Ws2_32.lib;wldap32.lib;Comctl32.lib;libcurl.lib;%(AdditionalDependencies) + true + + + if not exist "$(TargetDir)themes" mkdir "$(TargetDir)themes" +xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e +if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales" +xcopy "$(ProjectDir)data\locales\*" "$(TargetDir)locales\" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\ffmpeg\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\lame\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\libcurl\*" "$(TargetDir)" /Y /e +if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e @@ -267,6 +478,52 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\ffmpeg\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\lame\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\libcurl\*" "$(TargetDir)" /Y /e if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" +xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e + + + + + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + NotUsing + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + Full + true + true + Sync + + + + + ../../../boost_1_71_0/lib64-msvc-14.1;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + false + Console + + + + + + + pdh.lib;psapi.lib;Ws2_32.lib;wldap32.lib;Comctl32.lib;libcurl.lib;%(AdditionalDependencies) + false + + + if not exist "$(TargetDir)themes" mkdir "$(TargetDir)themes" +xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e +if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales" +xcopy "$(ProjectDir)data\locales\*" "$(TargetDir)locales\" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\ffmpeg\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\lame\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\libcurl\*" "$(TargetDir)" /Y /e +if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e diff --git a/src/musikcube/Main.cpp b/src/musikcube/Main.cpp index a6234356a..20239c616 100644 --- a/src/musikcube/Main.cpp +++ b/src/musikcube/Main.cpp @@ -79,7 +79,7 @@ using namespace cursespp; namespace keys = musik::cube::prefs::keys; -#ifdef WIN32 +#if defined(WIN32) && defined(PDCURSES_WINGUI) int _main(int argc, wchar_t* argv[]); int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int nCmdShow) { diff --git a/src/musikcube/cursespp/App.cpp b/src/musikcube/cursespp/App.cpp index 17a609168..33a36dcad 100755 --- a/src/musikcube/cursespp/App.cpp +++ b/src/musikcube/cursespp/App.cpp @@ -132,9 +132,11 @@ App::~App() { void App::InitCurses() { #ifdef WIN32 PDC_set_function_key(FUNCTION_KEY_SHUT_DOWN, 4); - PDC_set_default_menu_visibility(0); - PDC_set_title(this->appTitle.c_str()); - PDC_set_color_intensify_enabled(false); + #ifdef PDCURSES_WINGUI + PDC_set_default_menu_visibility(0); + PDC_set_title(this->appTitle.c_str()); + PDC_set_color_intensify_enabled(false); + #endif #endif initscr(); @@ -150,7 +152,7 @@ void App::InitCurses() { set_escdelay(20); #endif -#ifdef WIN32 +#ifdef PDCURSES_WINGUI /* needs to happen after initscr() */ win32::InterceptWndProc(); win32::SetAppTitle(this->appTitle); @@ -181,8 +183,10 @@ void App::SetResizeHandler(ResizeHandler handler) { } void App::SetColorMode(Colors::Mode mode) { +#if defined(PDCURSES_WINCON) + mode = Colors::Basic; +#endif this->colorMode = mode; - if (this->initialized) { Colors::Init(this->colorMode, this->bgType); } @@ -222,15 +226,23 @@ void App::SetSingleInstanceId(const std::string& uniqueId) { } bool App::RegisterFont(const std::string& filename) { +#if defined(PDCURSES_WINGUI) return win32::RegisterFont(filename) > 0; +#else + return false; +#endif } void App::SetDefaultFontface(const std::string& fontface) { +#if defined(PDCURSES_WINGUI) PDC_set_preferred_fontface(u8to16(fontface).c_str()); +#endif } void App::SetDefaultMenuVisibility(bool visible) { +#if defined(PDCURSES_WINGUI) PDC_set_default_menu_visibility(visible); +#endif } #endif @@ -258,19 +270,19 @@ void App::SetTitle(const std::string& title) { } void App::SetMinimizeToTray(bool minimizeToTray) { -#ifdef WIN32 +#ifdef PDCURSES_WINGUI win32::SetMinimizeToTray(minimizeToTray); #endif } void App::Minimize() { -#ifdef WIN32 +#ifdef PDCURSES_WINGUI win32::Minimize(); #endif } void App::Restore() { -#ifdef WIN32 +#ifdef PDCURSES_WINGUI win32::ShowMainWindow(); #endif } diff --git a/src/musikcube/musikcube.vcxproj b/src/musikcube/musikcube.vcxproj index f1b212904..6aa4367a8 100755 --- a/src/musikcube/musikcube.vcxproj +++ b/src/musikcube/musikcube.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -32,12 +48,24 @@ true v141 + + Application + Unicode + true + v141 + Application Unicode true v141 + + Application + Unicode + true + v141 + Application false @@ -46,6 +74,14 @@ v141 false + + Application + false + false + Unicode + v141 + false + Application false @@ -54,58 +90,106 @@ v141 false + + Application + false + false + Unicode + v141 + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)/bin32/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ true + true true + true $(SolutionDir)/bin32/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ false + false false + false AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + $(SolutionDir)/bin64/$(Configuration)/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin64/$(Configuration)/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/ + ./obj64/$(Configuration)/ + Disabled ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;CURL_STATICLIB;_DEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -137,6 +221,45 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\ffmpeg\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\lame\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\libcurl\*" "$(TargetDir)" /Y /e if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" +xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e + + + + + Disabled + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINCON;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + Use + Level3 + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + true + + + ../../../boost_1_71_0/lib32-msvc-14.1;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + true + Console + + + MachineX86 + pdh.lib;psapi.lib;Ws2_32.lib;wldap32.lib;Comctl32.lib;libcurl.lib;%(AdditionalDependencies) + false + + + if not exist "$(TargetDir)themes" mkdir "$(TargetDir)themes" +xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e +if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales" +xcopy "$(ProjectDir)data\locales\*" "$(TargetDir)locales\" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\ffmpeg\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\lame\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\libcurl\*" "$(TargetDir)" /Y /e +if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e @@ -144,7 +267,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Disabled ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;CURL_STATICLIB;_DEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -174,13 +297,50 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\ffmpeg\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\lame\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\libcurl\*" "$(TargetDir)" /Y /e if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" +xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e + + + + + Disabled + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINCON;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + true + + + ../../../boost_1_71_0/lib64-msvc-14.1;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + true + Console + + + pdh.lib;psapi.lib;Ws2_32.lib;wldap32.lib;Comctl32.lib;libcurl.lib;%(AdditionalDependencies) + false + + + if not exist "$(TargetDir)themes" mkdir "$(TargetDir)themes" +xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e +if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales" +xcopy "$(ProjectDir)data\locales\*" "$(TargetDir)locales\" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\ffmpeg\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\lame\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\libcurl\*" "$(TargetDir)" /Y /e +if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;CURL_STATICLIB;NDEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) MultiThreaded Use Level3 @@ -219,13 +379,58 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\ffmpeg\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\lame\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\libcurl\*" "$(TargetDir)" /Y /e if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" +xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e + + + + + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINCON;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + Full + true + true + Sync + + + ../../../boost_1_71_0/lib32-msvc-14.1;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + false + Console + + + + + + + MachineX86 + pdh.lib;psapi.lib;Ws2_32.lib;wldap32.lib;Comctl32.lib;libcurl.lib;%(AdditionalDependencies) + true + + + if not exist "$(TargetDir)themes" mkdir "$(TargetDir)themes" +xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e +if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales" +xcopy "$(ProjectDir)data\locales\*" "$(TargetDir)locales\" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\ffmpeg\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\lame\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\libcurl\*" "$(TargetDir)" /Y /e +if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;CURL_STATICLIB;NDEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) MultiThreaded Use Level3 @@ -263,6 +468,50 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\ffmpeg\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\lame\*" "$(TargetDir)" /Y /e xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\libcurl\*" "$(TargetDir)" /Y /e if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" +xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e + + + + + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINCON;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + Full + true + true + Sync + + + ../../../boost_1_71_0/lib64-msvc-14.1;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + false + Console + + + + + + + pdh.lib;psapi.lib;Ws2_32.lib;wldap32.lib;Comctl32.lib;libcurl.lib;%(AdditionalDependencies) + false + + + if not exist "$(TargetDir)themes" mkdir "$(TargetDir)themes" +xcopy "$(ProjectDir)data\themes\*" "$(TargetDir)themes\" /Y /e +if not exist "$(TargetDir)locales" mkdir "$(TargetDir)locales" +xcopy "$(ProjectDir)data\locales\*" "$(TargetDir)locales\" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\ffmpeg\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\lame\*" "$(TargetDir)" /Y /e +xcopy "$(SolutionDir)src\3rdparty\bin\win64\dll\libcurl\*" "$(TargetDir)" /Y /e +if not exist "$(TargetDir)fonts" mkdir "$(TargetDir)fonts" xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e @@ -333,9 +582,13 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Create + Create Create + Create Create + Create Create + Create diff --git a/src/plugins/cddadecoder/cddadecoder.vcxproj b/src/plugins/cddadecoder/cddadecoder.vcxproj index 9246273ee..193a61486 100755 --- a/src/plugins/cddadecoder/cddadecoder.vcxproj +++ b/src/plugins/cddadecoder/cddadecoder.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -31,67 +47,127 @@ true v141 + + DynamicLibrary + Unicode + true + v141 + DynamicLibrary Unicode true v141 + + DynamicLibrary + Unicode + true + v141 + DynamicLibrary Unicode v141 false + + DynamicLibrary + Unicode + v141 + false + DynamicLibrary Unicode v141 false + + DynamicLibrary + Unicode + v141 + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)/bin32/$(Configuration)/plugins/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ $(SolutionDir)/bin32/$(Configuration)/plugins/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Disabled @@ -115,6 +191,29 @@ false + + + Disabled + ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + $(IntDir)vc$(PlatformToolsetVersion).pdb + $(IntDir) + $(IntDir) + + + shlwapi.lib;libcurl.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) + true + false + + Disabled @@ -137,6 +236,28 @@ false + + + Disabled + ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + $(IntDir)vc$(PlatformToolsetVersion).pdb + $(IntDir) + $(IntDir) + + + shlwapi.lib;libcurl.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) + true + false + + ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;%(AdditionalIncludeDirectories) @@ -161,6 +282,30 @@ false + + + ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + $(IntDir)vc$(PlatformToolsetVersion).pdb + $(IntDir) + $(IntDir) + Speed + true + Full + true + Sync + + + shlwapi.lib;libcurl.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) + false + + ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;%(AdditionalIncludeDirectories) @@ -185,6 +330,30 @@ false + + + ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + $(IntDir)vc$(PlatformToolsetVersion).pdb + $(IntDir) + $(IntDir) + Speed + true + Full + true + Sync + + + shlwapi.lib;libcurl.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) + false + + diff --git a/src/plugins/directsoundout/directsoundout.vcxproj b/src/plugins/directsoundout/directsoundout.vcxproj index 48d9b5a9c..7d83091e3 100644 --- a/src/plugins/directsoundout/directsoundout.vcxproj +++ b/src/plugins/directsoundout/directsoundout.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -30,39 +46,75 @@ Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25123.0 @@ -75,6 +127,14 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + true + MinimumRecommendedRules.ruleset + + + true MinimumRecommendedRules.ruleset @@ -83,6 +143,14 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + true + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ @@ -90,6 +158,13 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset @@ -97,6 +172,13 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Disabled @@ -120,6 +202,29 @@ false + + + Disabled + ../..;../../3rdparty/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + dsound.lib;dxguid.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + MachineX86 + false + + Disabled @@ -142,6 +247,28 @@ false + + + Disabled + ../..;../../3rdparty/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + dsound.lib;dxguid.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + false + + Default @@ -171,6 +298,36 @@ false + + + Default + true + ../..;../../3rdparty/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + dsound.lib;dxguid.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + MachineX86 + false + false + + Default @@ -200,6 +357,35 @@ false + + + Default + true + ../..;../../3rdparty/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + dsound.lib;dxguid.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + false + false + + diff --git a/src/plugins/ffmpegdecoder/ffmpegdecoder.vcxproj b/src/plugins/ffmpegdecoder/ffmpegdecoder.vcxproj index 56c9a082b..5d235ff56 100644 --- a/src/plugins/ffmpegdecoder/ffmpegdecoder.vcxproj +++ b/src/plugins/ffmpegdecoder/ffmpegdecoder.vcxproj @@ -1,10 +1,26 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -30,6 +46,12 @@ v141 Unicode + + DynamicLibrary + true + v141 + Unicode + DynamicLibrary false @@ -37,12 +59,25 @@ true Unicode + + DynamicLibrary + false + v141 + true + Unicode + DynamicLibrary true v141 Unicode + + DynamicLibrary + true + v141 + Unicode + DynamicLibrary false @@ -50,6 +85,13 @@ true Unicode + + DynamicLibrary + false + v141 + true + Unicode + @@ -58,15 +100,27 @@ + + + + + + + + + + + + $(SolutionDir)/bin32/$(Configuration)/plugins/ @@ -74,18 +128,35 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Level3 @@ -104,6 +175,24 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\ffmpeg\*" "$(TargetDir)..\" /Y /e + + + Level3 + Disabled + true + 3rdparty/include;3rdparty/win32_include;../../3rdparty/win32_include;../../../../boost_1_71_0;../../;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug + 4996 + + + ../../../../boost_1_71_0/lib32-msvc-14.1;../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) + avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) + + + xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\ffmpeg\*" "$(TargetDir)..\" /Y /e + + Level3 @@ -118,6 +207,20 @@ ../../3rdparty/bin/win64/lib + + + Level3 + Disabled + false + 3rdparty/include;3rdparty/win32_include;../../3rdparty/win32_include;../../../../boost_1_71_0;../../;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDebug + + + avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win64/lib + + Level3 @@ -147,6 +250,35 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\ffmpeg\*" "$(TargetDir)..\" /Y /e + + + Level3 + Full + true + true + true + 3rdparty/include;3rdparty/win32_include;../../3rdparty/win32_include;../../../../boost_1_71_0;../../;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + None + Default + Speed + Sync + 4996 + + + true + true + ../../../../boost_1_71_0/lib32-msvc-14.1;../../3rdparty/bin/win32/lib + avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) + false + Windows + false + + + xcopy "$(SolutionDir)src\3rdparty\bin\win32\dll\ffmpeg\*" "$(TargetDir)..\" /Y /e + + Level3 @@ -165,6 +297,24 @@ ../../3rdparty/bin/win64/lib + + + Level3 + MaxSpeed + true + true + false + 3rdparty/include;3rdparty/win32_include;../../3rdparty/win32_include;../../../../boost_1_71_0;../../;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + + + true + true + avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win64/lib + + diff --git a/src/plugins/gmedecoder/gmedecoder.vcxproj b/src/plugins/gmedecoder/gmedecoder.vcxproj index 4c3ddbcaa..bac223e0c 100644 --- a/src/plugins/gmedecoder/gmedecoder.vcxproj +++ b/src/plugins/gmedecoder/gmedecoder.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -30,39 +46,75 @@ Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25123.0 @@ -75,6 +127,14 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + true + MinimumRecommendedRules.ruleset + + + true MinimumRecommendedRules.ruleset @@ -83,6 +143,14 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + true + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ @@ -90,6 +158,13 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset @@ -97,6 +172,13 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Disabled @@ -120,6 +202,29 @@ false + + + Disabled + ../..;./gme/;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + MachineX86 + false + + Disabled @@ -142,6 +247,28 @@ false + + + Disabled + ../..;./gme/;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + false + + Default @@ -171,6 +298,36 @@ false + + + Default + true + ../..;./gme/;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + MachineX86 + false + false + + Default @@ -200,6 +357,35 @@ false + + + Default + true + ../..;./gme/;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + false + false + + diff --git a/src/plugins/httpdatastream/httpdatastream.vcxproj b/src/plugins/httpdatastream/httpdatastream.vcxproj index 46e658186..82a4aa91d 100644 --- a/src/plugins/httpdatastream/httpdatastream.vcxproj +++ b/src/plugins/httpdatastream/httpdatastream.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -31,67 +47,127 @@ true v141 + + DynamicLibrary + Unicode + true + v141 + DynamicLibrary Unicode true v141 + + DynamicLibrary + Unicode + true + v141 + DynamicLibrary Unicode v141 false + + DynamicLibrary + Unicode + v141 + false + DynamicLibrary Unicode v141 false + + DynamicLibrary + Unicode + v141 + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)/bin32/$(Configuration)/plugins/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ $(SolutionDir)/bin32/$(Configuration)/plugins/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Disabled @@ -115,6 +191,29 @@ false + + + Disabled + ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + $(IntDir)vc$(PlatformToolsetVersion).pdb + $(IntDir) + $(IntDir) + + + shlwapi.lib;libcurl.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win32/lib;../../../../boost_1_71_0/lib32-msvc-14.1;%(AdditionalLibraryDirectories) + true + false + + Disabled @@ -137,6 +236,28 @@ false + + + Disabled + ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + $(IntDir)vc$(PlatformToolsetVersion).pdb + $(IntDir) + $(IntDir) + + + shlwapi.lib;libcurl.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win64/lib;../../../../boost_1_71_0/lib64-msvc-14.1;%(AdditionalLibraryDirectories) + true + false + + ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;%(AdditionalIncludeDirectories) @@ -161,6 +282,30 @@ false + + + ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + $(IntDir)vc$(PlatformToolsetVersion).pdb + $(IntDir) + $(IntDir) + Speed + true + Full + true + Sync + + + shlwapi.lib;libcurl.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win32/lib;../../../../boost_1_71_0/lib32-msvc-14.1;%(AdditionalLibraryDirectories) + false + + ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;%(AdditionalIncludeDirectories) @@ -185,6 +330,30 @@ false + + + ../../;../../3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + $(IntDir)vc$(PlatformToolsetVersion).pdb + $(IntDir) + $(IntDir) + Speed + true + Full + true + Sync + + + shlwapi.lib;libcurl.lib;%(AdditionalDependencies) + ../../3rdparty/bin/win64/lib;../../../../boost_1_71_0/lib64-msvc-14.1;%(AdditionalLibraryDirectories) + false + + diff --git a/src/plugins/nullout/nullout.vcxproj b/src/plugins/nullout/nullout.vcxproj index f41609190..5d97af524 100644 --- a/src/plugins/nullout/nullout.vcxproj +++ b/src/plugins/nullout/nullout.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -30,39 +46,75 @@ Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25123.0 @@ -75,6 +127,14 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + true + MinimumRecommendedRules.ruleset + + + true MinimumRecommendedRules.ruleset @@ -83,6 +143,14 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + true + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ @@ -90,6 +158,13 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset @@ -97,6 +172,13 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Disabled @@ -120,6 +202,29 @@ false + + + Disabled + ../..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + MachineX86 + false + + Disabled @@ -142,6 +247,28 @@ false + + + Disabled + ../..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + false + + Default @@ -171,6 +298,36 @@ false + + + Default + true + ../..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + MachineX86 + false + false + + Default @@ -200,6 +357,35 @@ false + + + Default + true + ../..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + false + false + + diff --git a/src/plugins/server/server.vcxproj b/src/plugins/server/server.vcxproj index b8f98d8e0..2367acb01 100644 --- a/src/plugins/server/server.vcxproj +++ b/src/plugins/server/server.vcxproj @@ -1,10 +1,26 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -30,6 +46,12 @@ v141 Unicode + + DynamicLibrary + true + v141 + Unicode + DynamicLibrary false @@ -37,12 +59,25 @@ true Unicode + + DynamicLibrary + false + v141 + true + Unicode + DynamicLibrary true v141 Unicode + + DynamicLibrary + true + v141 + Unicode + DynamicLibrary false @@ -50,6 +85,13 @@ true Unicode + + DynamicLibrary + false + v141 + true + Unicode + @@ -58,15 +100,27 @@ + + + + + + + + + + + + $(SolutionDir)/bin32/$(Configuration)/plugins/ @@ -74,18 +128,35 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Level3 @@ -105,6 +176,25 @@ + + + Level3 + Disabled + true + 3rdparty/include;3rdparty/win32_include;../../3rdparty/win32_include;../../../../boost_1_71_0;../../;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + ../../../../boost_1_71_0/lib32-msvc-14.1;../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) + zlibstatD.lib;%(AdditionalDependencies) + false + + + + + + Level3 @@ -119,6 +209,20 @@ zlibstatD.lib;%(AdditionalDependencies) + + + Level3 + Disabled + true + 3rdparty/include;3rdparty/win32_include;../../3rdparty/win32_include;../../../../boost_1_71_0;../../;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + ../../../../boost_1_71_0/lib64-msvc-14.1;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) + zlibstatD.lib;%(AdditionalDependencies) + + Level3 @@ -148,6 +252,35 @@ + + + Level3 + Full + true + true + true + 3rdparty/include;3rdparty/win32_include;../../3rdparty/win32_include;../../../../boost_1_71_0;../../;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded + None + Default + Speed + Sync + + + true + true + ../../../../boost_1_71_0/lib32-msvc-14.1;../../3rdparty/bin/win32/lib + zlibstat.lib;%(AdditionalDependencies) + false + Windows + false + + + + + + Level3 @@ -167,6 +300,25 @@ zlibstatD.lib;%(AdditionalDependencies) + + + Level3 + MaxSpeed + true + true + true + 3rdparty/include;3rdparty/win32_include;../../3rdparty/win32_include;../../../../boost_1_71_0;../../;%(AdditionalIncludeDirectories) + None + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded + + + true + true + ../../../../boost_1_71_0/lib64-msvc-14.1;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) + zlibstatD.lib;%(AdditionalDependencies) + + diff --git a/src/plugins/stockencoders/stockencoders.vcxproj b/src/plugins/stockencoders/stockencoders.vcxproj index dc6178a95..1687251b9 100644 --- a/src/plugins/stockencoders/stockencoders.vcxproj +++ b/src/plugins/stockencoders/stockencoders.vcxproj @@ -1,10 +1,26 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -30,6 +46,12 @@ v141 Unicode + + DynamicLibrary + true + v141 + Unicode + DynamicLibrary false @@ -37,12 +59,25 @@ true Unicode + + DynamicLibrary + false + v141 + true + Unicode + DynamicLibrary true v141 Unicode + + DynamicLibrary + true + v141 + Unicode + DynamicLibrary false @@ -50,6 +85,13 @@ true Unicode + + DynamicLibrary + false + v141 + true + Unicode + @@ -58,15 +100,27 @@ + + + + + + + + + + + + $(SolutionDir)/bin32/$(Configuration)/plugins/ @@ -74,18 +128,35 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Level3 @@ -105,6 +176,25 @@ + + + Level3 + Disabled + true + 3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;../../;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreadedDebug + + + ../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) + libmp3lameD.lib;avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) + false + + + + + + Level3 @@ -119,6 +209,20 @@ libmp3lameD.lib;avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) + + + Level3 + Disabled + true + 3rdparty/include;../../3rdparty/win32_include;../../;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE + MultiThreadedDebug + + + ../../3rdparty/bin/win64/lib + libmp3lameD.lib;avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) + + Level3 @@ -148,6 +252,35 @@ + + + Level3 + Full + true + true + true + 3rdparty/include;../../3rdparty/win32_include;../../../../boost_1_71_0;../../;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded + None + Default + Speed + Sync + + + true + true + ../../3rdparty/bin/win32/lib + libmp3lame.lib;avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) + false + Windows + false + + + + + + Level3 @@ -166,6 +299,24 @@ libmp3lameD.lib;avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) + + + Level3 + MaxSpeed + true + true + true + 3rdparty/include;../../3rdparty/win32_include;../../;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) + MultiThreaded + + + true + true + ../../3rdparty/bin/win64/lib + libmp3lameD.lib;avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) + + diff --git a/src/plugins/supereqdsp/supereqdsp.vcxproj b/src/plugins/supereqdsp/supereqdsp.vcxproj index d8fb5ef42..7cdee2f52 100644 --- a/src/plugins/supereqdsp/supereqdsp.vcxproj +++ b/src/plugins/supereqdsp/supereqdsp.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -42,39 +58,75 @@ Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25123.0 @@ -87,6 +139,14 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + true + MinimumRecommendedRules.ruleset + + + true MinimumRecommendedRules.ruleset @@ -95,6 +155,14 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + true + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ @@ -102,6 +170,13 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset @@ -109,6 +184,13 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Disabled @@ -132,6 +214,29 @@ false + + + Disabled + ../..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + MachineX86 + false + + Disabled @@ -154,6 +259,28 @@ false + + + Disabled + ../..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + false + + Default @@ -183,6 +310,36 @@ false + + + Default + true + ../..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + MachineX86 + false + false + + Default @@ -212,6 +369,35 @@ false + + + Default + true + ../..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + false + false + + diff --git a/src/plugins/taglib_plugin/taglib_plugin.vcxproj b/src/plugins/taglib_plugin/taglib_plugin.vcxproj index a056249d0..2d4c7cafc 100755 --- a/src/plugins/taglib_plugin/taglib_plugin.vcxproj +++ b/src/plugins/taglib_plugin/taglib_plugin.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -31,71 +47,135 @@ true v141 + + DynamicLibrary + Unicode + true + v141 + DynamicLibrary Unicode true v141 + + DynamicLibrary + Unicode + true + v141 + DynamicLibrary Unicode v141 false + + DynamicLibrary + Unicode + v141 + false + DynamicLibrary Unicode v141 false + + DynamicLibrary + Unicode + v141 + false + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)/bin32/$(Configuration)/plugins/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ true + true true + true $(SolutionDir)/bin32/$(Configuration)/plugins/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ + ./obj32/$(Configuration)/ false + false false + false AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Disabled @@ -126,6 +206,36 @@ false + + + Disabled + ../../;../../3rdparty/include/;../../../../boost_1_71_0/;taglib-1.11;taglib-1.11/taglib;taglib-1.11/taglib/ape;taglib-1.11/taglib/asf;taglib-1.11/taglib/flac;taglib-1.11/taglib/mpc;taglib-1.11/taglib/mpeg;taglib-1.11/taglib/mpeg/id3v1;taglib-1.11/taglib/mpeg/id3v2;taglib-1.11/taglib/mpeg/id3v2/frames;taglib-1.11/taglib/ogg;taglib-1.11/taglib/ogg/flac;taglib-1.11/taglib/ogg/opus;taglib-1.11/taglib/ogg/speex;taglib-1.11/taglib/ogg/vorbis;taglib-1.11/taglib/toolkit;taglib-1.11/taglib/trueaudio;taglib-1.11/taglib/wavpack;taglib-1.11/taglib/xm;taglib-1.11/taglib/riff;taglib-1.11/taglib/riff/aiff;taglib-1.11/taglib/riff/wav;taglib-1.11/taglib/mod;taglib-1.11/taglib/s3m;taglib-1.11/taglib/mp4;taglib-1.11/taglib/it;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;TAGLIB_STATIC;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + + + true + TurnOffAllWarnings + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + true + + + $(OutDir)$(ProjectName).dll + ../../../../boost_1_71_0/lib32-msvc-14.1;%(AdditionalLibraryDirectories) + true + true + $(TargetDir)$(TargetName).map + true + Windows + MachineX86 + false + + Disabled @@ -155,6 +265,35 @@ false + + + Disabled + ../../;../../3rdparty/include/;../../../../boost_1_71_0/;taglib-1.11;taglib-1.11/taglib;taglib-1.11/taglib/ape;taglib-1.11/taglib/asf;taglib-1.11/taglib/flac;taglib-1.11/taglib/mpc;taglib-1.11/taglib/mpeg;taglib-1.11/taglib/mpeg/id3v1;taglib-1.11/taglib/mpeg/id3v2;taglib-1.11/taglib/mpeg/id3v2/frames;taglib-1.11/taglib/ogg;taglib-1.11/taglib/ogg/flac;taglib-1.11/taglib/ogg/opus;taglib-1.11/taglib/ogg/speex;taglib-1.11/taglib/ogg/vorbis;taglib-1.11/taglib/toolkit;taglib-1.11/taglib/trueaudio;taglib-1.11/taglib/wavpack;taglib-1.11/taglib/xm;taglib-1.11/taglib/riff;taglib-1.11/taglib/riff/aiff;taglib-1.11/taglib/riff/wav;taglib-1.11/taglib/mod;taglib-1.11/taglib/s3m;taglib-1.11/taglib/mp4;taglib-1.11/taglib/it;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;TAGLIB_STATIC;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + + + true + TurnOffAllWarnings + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + true + + + $(OutDir)$(ProjectName).dll + ../../../../boost_1_71_0/lib64-msvc-14.1;%(AdditionalLibraryDirectories) + true + true + $(TargetDir)$(TargetName).map + true + Windows + false + + Default @@ -186,6 +325,37 @@ MachineX86 + + + Default + true + Speed + ../../;../../3rdparty/include/;../../../../boost_1_71_0/;taglib-1.11;taglib-1.11/taglib;taglib-1.11/taglib/ape;taglib-1.11/taglib/asf;taglib-1.11/taglib/flac;taglib-1.11/taglib/mpc;taglib-1.11/taglib/mpeg;taglib-1.11/taglib/mpeg/id3v1;taglib-1.11/taglib/mpeg/id3v2;taglib-1.11/taglib/mpeg/id3v2/frames;taglib-1.11/taglib/ogg;taglib-1.11/taglib/ogg/flac;taglib-1.11/taglib/ogg/opus;taglib-1.11/taglib/ogg/speex;taglib-1.11/taglib/ogg/vorbis;taglib-1.11/taglib/toolkit;taglib-1.11/taglib/trueaudio;taglib-1.11/taglib/wavpack;taglib-1.11/taglib/xm;taglib-1.11/taglib/riff;taglib-1.11/taglib/riff/aiff;taglib-1.11/taglib/riff/wav;taglib-1.11/taglib/mod;taglib-1.11/taglib/s3m;taglib-1.11/taglib/mp4;taglib-1.11/taglib/it;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;TAGLIB_STATIC;%(PreprocessorDefinitions) + MultiThreaded + + + TurnOffAllWarnings + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + true + Full + true + Async + + + $(OutDir)$(ProjectName).dll + ../../../../boost_1_71_0/lib32-msvc-14.1;%(AdditionalLibraryDirectories) + false + Windows + true + true + MachineX86 + + Default @@ -216,16 +386,54 @@ true + + + Default + true + Speed + ../../;../../3rdparty/include/;../../../../boost_1_71_0/;taglib-1.11;taglib-1.11/taglib;taglib-1.11/taglib/ape;taglib-1.11/taglib/asf;taglib-1.11/taglib/flac;taglib-1.11/taglib/mpc;taglib-1.11/taglib/mpeg;taglib-1.11/taglib/mpeg/id3v1;taglib-1.11/taglib/mpeg/id3v2;taglib-1.11/taglib/mpeg/id3v2/frames;taglib-1.11/taglib/ogg;taglib-1.11/taglib/ogg/flac;taglib-1.11/taglib/ogg/opus;taglib-1.11/taglib/ogg/speex;taglib-1.11/taglib/ogg/vorbis;taglib-1.11/taglib/toolkit;taglib-1.11/taglib/trueaudio;taglib-1.11/taglib/wavpack;taglib-1.11/taglib/xm;taglib-1.11/taglib/riff;taglib-1.11/taglib/riff/aiff;taglib-1.11/taglib/riff/wav;taglib-1.11/taglib/mod;taglib-1.11/taglib/s3m;taglib-1.11/taglib/mp4;taglib-1.11/taglib/it;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;TAGLIB_STATIC;%(PreprocessorDefinitions) + MultiThreaded + + + TurnOffAllWarnings + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + true + Full + true + Async + + + $(OutDir)$(ProjectName).dll + ../../../../boost_1_71_0/lib64-msvc-14.1;%(AdditionalLibraryDirectories) + false + Windows + true + true + + + + + + + + + + diff --git a/src/plugins/wasapiout/wasapiout.vcxproj b/src/plugins/wasapiout/wasapiout.vcxproj index 38477d95e..5c23dfd2d 100644 --- a/src/plugins/wasapiout/wasapiout.vcxproj +++ b/src/plugins/wasapiout/wasapiout.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -30,39 +46,75 @@ Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25123.0 @@ -75,6 +127,14 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + true + MinimumRecommendedRules.ruleset + + + true MinimumRecommendedRules.ruleset @@ -83,6 +143,14 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + true + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ @@ -90,6 +158,13 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset @@ -97,6 +172,13 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Disabled @@ -120,6 +202,29 @@ false + + + Disabled + ../..;../../3rdparty/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + winmm.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + MachineX86 + false + + Disabled @@ -142,6 +247,28 @@ false + + + Disabled + ../..;../../3rdparty/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + winmm.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + false + + Default @@ -171,6 +298,36 @@ false + + + Default + true + ../..;../../3rdparty/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + winmm.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + MachineX86 + false + false + + Default @@ -200,6 +357,35 @@ false + + + Default + true + ../..;../../3rdparty/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + winmm.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + false + false + + diff --git a/src/plugins/waveout/waveout.vcxproj b/src/plugins/waveout/waveout.vcxproj index 9eda0a291..d154896b8 100755 --- a/src/plugins/waveout/waveout.vcxproj +++ b/src/plugins/waveout/waveout.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -30,39 +46,75 @@ Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25123.0 @@ -75,6 +127,14 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + true + MinimumRecommendedRules.ruleset + + + true MinimumRecommendedRules.ruleset @@ -83,6 +143,14 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + true + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ @@ -90,6 +158,13 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset @@ -97,6 +172,13 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Disabled @@ -120,6 +202,29 @@ false + + + Disabled + ../..;../../3rdparty/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + winmm.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + MachineX86 + false + + Disabled @@ -142,6 +247,28 @@ false + + + Disabled + ../..;../../3rdparty/include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + winmm.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + false + + Default @@ -170,6 +297,35 @@ false + + + Default + true + ../..;../../3rdparty/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + winmm.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + MachineX86 + false + + Default @@ -198,6 +354,34 @@ false + + + Default + true + ../..;../../3rdparty/include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + MultiThreaded + Full + Sync + + + winmm.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + false + + diff --git a/src/plugins/win32gdivis/GdiVis-musikcube.vcxproj b/src/plugins/win32gdivis/GdiVis-musikcube.vcxproj index 1d42a85f5..b563991b9 100644 --- a/src/plugins/win32gdivis/GdiVis-musikcube.vcxproj +++ b/src/plugins/win32gdivis/GdiVis-musikcube.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -40,6 +56,13 @@ Unicode false + + DynamicLibrary + v141 + false + Unicode + false + DynamicLibrary v141 @@ -47,6 +70,13 @@ Unicode false + + DynamicLibrary + v141 + false + Unicode + false + DynamicLibrary v141 @@ -54,6 +84,13 @@ Unicode true + + DynamicLibrary + v141 + false + Unicode + true + DynamicLibrary v141 @@ -61,6 +98,13 @@ Unicode true + + DynamicLibrary + v141 + false + Unicode + true + @@ -68,39 +112,75 @@ + + + + + + + + + + + + + + + + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ false + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + false + false $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + false + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ true + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + true + true $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + true + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + MultiThreaded @@ -150,6 +230,55 @@ + + + MultiThreaded + Default + true + true + Full + true + Level3 + .\;..\..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(IntDir) + .\Release\projectMvis.pch + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + Sync + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\projectMvis.tlb + true + Win32 + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\projectMvis.bsc + + + true + Windows + %(AdditionalLibraryDirectories) + shlwapi.lib;%(AdditionalDependencies) + + + false + + + + + + MultiThreaded @@ -198,6 +327,54 @@ + + + MultiThreaded + Default + true + true + Full + true + Level3 + .\;..\..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(IntDir) + .\Release\projectMvis.pch + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + Speed + true + true + Sync + + + true + NDEBUG;%(PreprocessorDefinitions) + .\Release\projectMvis.tlb + true + + + 0x0409 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\projectMvis.bsc + + + true + Windows + %(AdditionalLibraryDirectories) + shlwapi.lib;%(AdditionalDependencies) + + + false + + + + + + MultiThreadedDebug @@ -244,6 +421,52 @@ + + + MultiThreadedDebug + Default + Disabled + true + Level3 + true + EditAndContinue + .\;..\..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;DEBUG;%(PreprocessorDefinitions) + $(IntDir) + .\Debug\projectMvis.pch + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + EnableFastChecks + + + true + _DEBUG;%(PreprocessorDefinitions) + .\Debug\projectMvis.tlb + true + Win32 + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\projectMvis.bsc + + + true + true + Windows + %(AdditionalLibraryDirectories) + LIBCMTD.LIB;%(AdditionalDependencies) + + + + + + + + MultiThreadedDebug @@ -288,6 +511,50 @@ + + + MultiThreadedDebug + Default + Disabled + true + Level3 + ProgramDatabase + .\;..\..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;DEBUG;%(PreprocessorDefinitions) + $(IntDir) + .\Debug\projectMvis.pch + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + EnableFastChecks + + + true + _DEBUG;%(PreprocessorDefinitions) + .\Debug\projectMvis.tlb + true + + + 0x0409 + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\projectMvis.bsc + + + true + true + Windows + %(AdditionalLibraryDirectories) + LIBCMTD.LIB;%(AdditionalDependencies) + + + + + + + + diff --git a/src/plugins/win32globalhotkeys/win32globalhotkeys.vcxproj b/src/plugins/win32globalhotkeys/win32globalhotkeys.vcxproj index 043299018..e4c6e3c56 100644 --- a/src/plugins/win32globalhotkeys/win32globalhotkeys.vcxproj +++ b/src/plugins/win32globalhotkeys/win32globalhotkeys.vcxproj @@ -1,6 +1,14 @@  + + Debug-Con + Win32 + + + Debug-Con + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release-Con + Win32 + + + Release-Con + x64 + Release Win32 @@ -30,39 +46,75 @@ Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode true + + DynamicLibrary + v141 + Unicode + true + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + DynamicLibrary v141 Unicode false + + DynamicLibrary + v141 + Unicode + false + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25123.0 @@ -75,6 +127,14 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + true + MinimumRecommendedRules.ruleset + + + true MinimumRecommendedRules.ruleset @@ -83,6 +143,14 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + true + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + $(SolutionDir)/bin32/$(Configuration)/plugins/ ./obj32/$(Configuration)/ @@ -90,6 +158,13 @@ + + $(SolutionDir)/bin32/$(Configuration)/plugins/ + ./obj32/$(Configuration)/ + MinimumRecommendedRules.ruleset + + + MinimumRecommendedRules.ruleset @@ -97,6 +172,13 @@ $(SolutionDir)/bin64/$(Configuration)/plugins/ ./obj64/$(Configuration)/ + + MinimumRecommendedRules.ruleset + + + $(SolutionDir)/bin64/$(Configuration)/plugins/ + ./obj64/$(Configuration)/ + Disabled @@ -120,6 +202,29 @@ false + + + Disabled + ../..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + EditAndContinue + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + winmm.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + MachineX86 + false + + Disabled @@ -142,6 +247,28 @@ false + + + Disabled + ../..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + winmm.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + false + + Default @@ -170,6 +297,35 @@ false + + + Default + true + ../..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + MultiThreaded + true + Speed + true + Full + Sync + + + winmm.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + MachineX86 + false + + Default @@ -198,6 +354,34 @@ false + + + Default + true + ../..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + + + $(IntDir) + $(IntDir) + $(IntDir)vc$(PlatformToolsetVersion).pdb + MultiThreaded + true + Speed + true + Full + Sync + + + winmm.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + Windows + true + true + false + +