Changed to VS macros for dependencies

xrv3ovl · Jan 6, 2018 · 85cada5 · 85cada5
1 parent ad5510b
commit 85cada5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/capcom/capcom.cpp b/capcom/capcom.cpp
@@ -173,7 +173,7 @@ namespace capcom
 
 		const auto allocate_fn = [&size, &pool_type, &ex_allocate_pool, &address](auto mm_get)
 		{
-			address = reinterpret_cast<uintptr_t>(ex_allocate_pool(pool_type, size);
+			address = reinterpret_cast<uintptr_t>(ex_allocate_pool(pool_type, size));
 		};
 
 		run(allocate_fn);

diff --git a/drvmap/drvmap.vcxproj b/drvmap/drvmap.vcxproj
@@ -79,13 +79,13 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpplatest</LanguageStandard>
-      <AdditionalIncludeDirectories>D:\Dev\asmjit\src\asmjit;C:\Users\Jan\source\repos\capcom\capcom;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>D:\Dev\asmjit\src\asmjit;$(SolutionDir)\capcom</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <SubSystem>NotSet</SubSystem>
-      <AdditionalLibraryDirectories>D:\Dev\asmjit\build\MinSizeRel;C:\Users\Jan\source\repos\capcom\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>D:\Dev\asmjit\build\MinSizeRel;$(SolutionDir)x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/drvmap/main.cpp b/drvmap/main.cpp
@@ -38,7 +38,7 @@ int __stdcall main(const int argc, char** argv)
 	drvmap::util::open_binary_file(argv[1], driver_image);
 	drvmap::drv_image driver(driver_image);
 
-	const auto kernel_memory = capcom->allocate_pool(driver.size(), kernel::NonPagedPool, true);
+	const auto kernel_memory = capcom->allocate_pool(driver.size(), kernel::NonPagedPool, true, NULL);
 
 	assert(kernel_memory != 0);