Merge branch 'master' of github.com:willamowius/gnugk

willamowius · Nov 21, 2023 · ecf4ece · ecf4ece
2 parents 0f97273 + 9071e1d
commit ecf4ece
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 64 deletions.
diff --git a/addpasswd_2022.vcxproj b/addpasswd_2022.vcxproj
@@ -70,12 +70,12 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)/$(ProjectName)/$(Configuration)_$(PlatformShortName)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)/$(ProjectName)/$(Configuration)_$(PlatformShortName)/</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)/$(ProjectName)/$(Configuration)_$(PlatformShortName)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)/$(ProjectName)/$(Configuration)_$(PlatformShortName)/</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -99,6 +99,14 @@
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\h323plus\lib;$(ProjectDir)..\ptlib\lib;$(LibraryPath)</LibraryPath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)..\h323plus\lib;$(ProjectDir)..\ptlib\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)/$(ProjectName)/$(Configuration)_$(PlatformShortName)/</OutDir>
+    <IntDir>$(SolutionDir)/$(ProjectName)/$(Configuration)_$(PlatformShortName)/</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)/$(ProjectName)/$(Configuration)_$(PlatformShortName)/</OutDir>
+    <IntDir>$(SolutionDir)/$(ProjectName)/$(Configuration)_$(PlatformShortName)/</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -129,7 +137,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>ptlibsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(TargetDir)addpasswd.exe</OutputFile>
+      <OutputFile>$(SolutionDir)/$(ProjectName)/$(Configuration)_$(PlatformShortName)/addpasswd.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)addpasswd.pdb</ProgramDatabaseFile>
@@ -172,7 +180,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>ptlibs_$(PlatformShortName)_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(TargetDir)addpasswd.exe</OutputFile>
+      <OutputFile>$(SolutionDir)/$(ProjectName)/$(Configuration)_$(PlatformShortName)/addpasswd.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(TargetDir)addpasswd_$(PlatformShortName).pdb</ProgramDatabaseFile>
@@ -220,7 +228,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>ptlibs.lib;mpr.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>Release/addpasswd.exe</OutputFile>
+      <OutputFile>$(SolutionDir)/$(ProjectName)/$(Configuration)_$(PlatformShortName)/addpasswd.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>Release/addpasswd.pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
@@ -268,7 +276,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>ptlibs_$(PlatformShortName).lib;mpr.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>Release_$(PlatformShortName)/addpasswd.exe</OutputFile>
+      <OutputFile>$(SolutionDir)/$(ProjectName)/$(Configuration)_$(PlatformShortName)/addpasswd.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <ProgramDatabaseFile>Release_$(PlatformShortName)/addpasswd_$(PlatformShortName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>

diff --git a/gk_2022.sln b/gk_2022.sln
@@ -1,11 +1,12 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34221.43
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gnugk", "gk_2022.vcxproj", "{C5052DDD-FADC-4415-B235-92A9761BB21D}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addpasswd", "addpasswd_2022.vcxproj", "{2C306BF0-7FBE-4136-B021-AFA258898341}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gnugk", "gk_2022.vcxproj", "{C5052DDD-FADC-4415-B235-92A9761BB21D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug as Service|Win32 = Debug as Service|Win32
@@ -18,6 +19,22 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug as Service|Win32.ActiveCfg = Debug|Win32
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug as Service|Win32.Build.0 = Debug|Win32
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug as Service|x64.ActiveCfg = Debug|x64
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug as Service|x64.Build.0 = Debug|x64
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug|Win32.Build.0 = Debug|Win32
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug|x64.ActiveCfg = Debug|x64
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug|x64.Build.0 = Debug|x64
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release as Service|Win32.ActiveCfg = Release|Win32
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release as Service|Win32.Build.0 = Release|Win32
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release as Service|x64.ActiveCfg = Release|x64
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release as Service|x64.Build.0 = Release|x64
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release|Win32.ActiveCfg = Release|Win32
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release|Win32.Build.0 = Release|Win32
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release|x64.ActiveCfg = Release|x64
+		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release|x64.Build.0 = Release|x64
 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Debug as Service|Win32.ActiveCfg = Debug as Service|Win32
 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Debug as Service|Win32.Build.0 = Debug as Service|Win32
 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Debug as Service|x64.ActiveCfg = Debug as Service|x64
@@ -34,27 +51,11 @@ Global
 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Release|Win32.Build.0 = Release|Win32
 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Release|x64.ActiveCfg = Release|x64
 		{C5052DDD-FADC-4415-B235-92A9761BB21D}.Release|x64.Build.0 = Release|x64
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug as Service|Win32.ActiveCfg = Debug|Win32
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug as Service|Win32.Build.0 = Debug|Win32
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug as Service|x64.ActiveCfg = Debug|x64
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug as Service|x64.Build.0 = Debug|x64
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug|Win32.Build.0 = Debug|Win32
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug|x64.ActiveCfg = Release|x64
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Debug|x64.Build.0 = Release|x64
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release as Service|Win32.ActiveCfg = Release|Win32
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release as Service|Win32.Build.0 = Release|Win32
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release as Service|x64.ActiveCfg = Release|x64
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release as Service|x64.Build.0 = Release|x64
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release|Win32.ActiveCfg = Release|Win32
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release|Win32.Build.0 = Release|Win32
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release|x64.ActiveCfg = Release|x64
-		{2C306BF0-7FBE-4136-B021-AFA258898341}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9D30E884-FDEC-48A9-BA0D-CAE0029A0D76}
+		SolutionGuid = {A0B11BD0-B954-4E28-8503-C17B17D684BF}
 	EndGlobalSection
 EndGlobal