Switch from NuGet to vcpkg

JulienML · Sep 28, 2024 · 529f722 · 529f722
1 parent cbff9c3
commit 529f722
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .vs/
 .vscode/
 build/
+vcpkg_installed/
 README BakkesPlugins.md
 crash.txt
diff --git a/BetterChat.vcxproj b/BetterChat.vcxproj
@@ -50,6 +50,12 @@
     <OutDir>$(SolutionDir)plugins\</OutDir>
     <IntDir>$(SolutionDir)build\.intermediates\$(Configuration)\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <VcpkgUseStatic>true</VcpkgUseStatic>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -135,11 +141,6 @@
   <ItemGroup>
     <ResourceCompile Include="BetterChat.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="packages\nlohmann.json.3.11.2\build\native\nlohmann.json.targets" Condition="Exists('packages\nlohmann.json.3.11.2\build\native\nlohmann.json.targets')" />
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>
diff --git a/BetterChat.vcxproj.filters b/BetterChat.vcxproj.filters
@@ -72,6 +72,9 @@
     <ClCompile Include="fmt\src\os.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="IMGUI\imgui_stdlib.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BetterChat.h">
@@ -122,13 +125,16 @@
     <ClInclude Include="version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="IMGUI\imgui_stdlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="logging.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="BetterChat.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
 </Project>
diff --git a/packages.config b/packages.config
diff --git a/packages/nlohmann.json.3.11.2/.signature.p7s b/packages/nlohmann.json.3.11.2/.signature.p7s
diff --git a/packages/nlohmann.json.3.11.2/nlohmann.json.3.11.2.nupkg b/packages/nlohmann.json.3.11.2/nlohmann.json.3.11.2.nupkg
diff --git a/plugins/BetterChat.dll b/plugins/BetterChat.dll
diff --git a/plugins/BetterChat.pdb b/plugins/BetterChat.pdb
diff --git a/vcpkg.json b/vcpkg.json
@@ -0,0 +1,6 @@
+{
+    "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+    "dependencies": [
+        "nlohmann-json"
+    ]
+}
diff --git a/version.h b/version.h
@@ -1,8 +1,8 @@
 #pragma once
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 0
-#define VERSION_PATCH 1
-#define VERSION_BUILD 400
+#define VERSION_PATCH 2
+#define VERSION_BUILD 403
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a