Cleaned up project structure

nefarius · Aug 29, 2022 · 55e1777 · 55e1777
1 parent 6aa6bd9
commit 55e1777
Show file tree

Hide file tree

Showing 19 changed files with 50 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -363,3 +363,4 @@ MigrationBackup/
 FodyWeavers.xsd
 /RC*
 /RD*
+/vcpkg_installed/
diff --git a/NefConUtil.vcxproj b/NefConUtil.vcxproj
@@ -282,6 +282,9 @@
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release (WinMain)|x64'">
     <VcpkgUseStatic>true</VcpkgUseStatic>
   </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnableManifest>true</VcpkgEnableManifest>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (Console)|x64'">
     <ClCompile>
       <PrecompiledHeader>
@@ -511,25 +514,28 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="Devcon.cpp" />
-    <ClCompile Include="easylogging++.cc" />
-    <ClCompile Include="NefConSetup.cpp" />
-    <ClCompile Include="NefConUtil.cpp" />
+    <ClCompile Include=".\src\Devcon.cpp" />
+    <ClCompile Include=".\src\easylogging++.cc" />
+    <ClCompile Include=".\src\NefConSetup.cpp" />
+    <ClCompile Include=".\src\NefConUtil.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include=".\src\argh.h" />
+    <ClInclude Include=".\src\Devcon.h" />
+    <ClInclude Include=".\src\easylogging++.h" />
+    <ClInclude Include=".\src\framework.h" />
+    <ClInclude Include=".\src\LibraryHelper.hpp" />
+    <ClInclude Include=".\src\NefConSetup.h" />
+    <ClInclude Include=".\src\NefConUtil.h" />
+    <ClInclude Include=".\src\colorwin.hpp" />
+    <ClInclude Include=".\src\resource.h" />
+    <ClInclude Include=".\src\UniUtil.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="argh.h" />
-    <ClInclude Include="Devcon.h" />
-    <ClInclude Include="easylogging++.h" />
-    <ClInclude Include="framework.h" />
-    <ClInclude Include="LibraryHelper.hpp" />
-    <ClInclude Include="NefConSetup.h" />
-    <ClInclude Include="NefConUtil.h" />
-    <ClInclude Include="colorwin.hpp" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="UniUtil.h" />
+    <ResourceCompile Include=".\src\NefConUtil.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="NefConUtil.rc" />
+    <None Include="vcpkg.json" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/NefConUtil.vcxproj.filters b/NefConUtil.vcxproj.filters
@@ -15,54 +15,57 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="NefConUtil.cpp">
+    <ClCompile Include=".\src\NefConUtil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Devcon.cpp">
+    <ClCompile Include=".\src\Devcon.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="NefConSetup.cpp">
+    <ClCompile Include=".\src\NefConSetup.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="easylogging++.cc">
+    <ClCompile Include=".\src\easylogging++.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="argh.h">
+    <ClInclude Include=".\src\argh.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include=".\src\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="colorwin.hpp">
+    <ClInclude Include=".\src\colorwin.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="NefConUtil.h">
+    <ClInclude Include=".\src\NefConUtil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Devcon.h">
+    <ClInclude Include=".\src\Devcon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="framework.h">
+    <ClInclude Include=".\src\framework.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="LibraryHelper.hpp">
+    <ClInclude Include=".\src\LibraryHelper.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="NefConSetup.h">
+    <ClInclude Include=".\src\NefConSetup.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="UniUtil.h">
+    <ClInclude Include=".\src\UniUtil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="easylogging++.h">
+    <ClInclude Include=".\src\easylogging++.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="NefConUtil.rc">
+    <ResourceCompile Include=".\src\NefConUtil.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="vcpkg.json" />
+  </ItemGroup>
 </Project>
diff --git a/Devcon.cpp → src/Devcon.cpp b/Devcon.cpp → src/Devcon.cpp
diff --git a/Devcon.h → src/Devcon.h b/Devcon.h → src/Devcon.h
diff --git a/LibraryHelper.hpp → src/LibraryHelper.hpp b/LibraryHelper.hpp → src/LibraryHelper.hpp
diff --git a/NefConSetup.cpp → src/NefConSetup.cpp b/NefConSetup.cpp → src/NefConSetup.cpp
diff --git a/NefConSetup.h → src/NefConSetup.h b/NefConSetup.h → src/NefConSetup.h
diff --git a/NefConUtil.cpp → src/NefConUtil.cpp b/NefConUtil.cpp → src/NefConUtil.cpp
diff --git a/NefConUtil.h → src/NefConUtil.h b/NefConUtil.h → src/NefConUtil.h
diff --git a/NefConUtil.rc → src/NefConUtil.rc b/NefConUtil.rc → src/NefConUtil.rc
diff --git a/UniUtil.h → src/UniUtil.h b/UniUtil.h → src/UniUtil.h
diff --git a/argh.h → src/argh.h b/argh.h → src/argh.h
diff --git a/colorwin.hpp → src/colorwin.hpp b/colorwin.hpp → src/colorwin.hpp
diff --git a/easylogging++.cc → src/easylogging++.cc b/easylogging++.cc → src/easylogging++.cc
diff --git a/easylogging++.h → src/easylogging++.h b/easylogging++.h → src/easylogging++.h
diff --git a/framework.h → src/framework.h b/framework.h → src/framework.h
diff --git a/resource.h → src/resource.h b/resource.h → src/resource.h
diff --git a/vcpkg.json b/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "nefcon",
+  "version": "1.0.0",
+  "description": "nefcon",
+  "license": "MIT",
+  "supports": "!(arm | uwp)",
+  "dependencies": [
+	"detours"
+  ]
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -363,3 +363,4 @@ MigrationBackup/ @@
     FodyWeavers.xsd
     /RC*
     /RD*
+    /vcpkg_installed/