Allocator refactor

MergeGPF/MergeGPF.cpp

@@ -5,6 +5,8 @@
 #include "DeflateCodec.h"
 #include "MacFileInfo.h"
 #include "ZipFile.h"
+#include "GpAllocator_C.h"
+#include "PLDrivers.h"
 
 #include <stdio.h>
 #include <string>
@@ -12,6 +14,9 @@
 
 int toolMain(int argc, const char **argv)
 {
+	GpDriverCollection *drivers = PLDrivers::GetDriverCollection();
+	drivers->SetDriver<GpDriverIDs::kAlloc>(GpAllocator_C::GetInstance());
+
 	if (argc != 2)
 	{
 		fprintf(stderr, "Usage: MergeGPF <file.gpf>");

MergeGPF/MergeGPF.vcxproj

@@ -42,6 +42,7 @@
     <Import Project="..\Common.props" />
     <Import Project="..\Debug.props" />
     <Import Project="..\GpCommon.props" />
+    <Import Project="..\AerofoilPortable.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -50,6 +51,7 @@
     <Import Project="..\Common.props" />
     <Import Project="..\Release.props" />
     <Import Project="..\GpCommon.props" />
+    <Import Project="..\AerofoilPortable.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -84,6 +86,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\AerofoilPortable\GpAllocator_C.cpp" />
     <ClCompile Include="MergeGPF.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

MergeGPF/MergeGPF.vcxproj.filters

@@ -18,5 +18,8 @@
     <ClCompile Include="MergeGPF.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\AerofoilPortable\GpAllocator_C.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>