added base/allocator files

This commit is contained in:
Dale Stammen 2014-12-30 21:41:46 -08:00
parent 7276f64f29
commit d8c2927944
2 changed files with 55 additions and 4 deletions

View File

@ -72,18 +72,18 @@
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<TargetName>libcocos2d_v3.3_WindowsPhone_8.0</TargetName>
<TargetName>libcocos2d_v3.4_WindowsPhone_8.0</TargetName>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<TargetName>libcocos2d_v3.3_WindowsPhone_8.0</TargetName>
<TargetName>libcocos2d_v3.4_WindowsPhone_8.0</TargetName>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>libcocos2d_v3.3_WindowsPhone_8.0</TargetName>
<TargetName>libcocos2d_v3.4_WindowsPhone_8.0</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>libcocos2d_v3.3_WindowsPhone_8.0</TargetName>
<TargetName>libcocos2d_v3.4_WindowsPhone_8.0</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -240,6 +240,15 @@
<ClInclude Include="..\audio\include\SimpleAudioEngine.h" />
<ClInclude Include="..\audio\wp8\Audio.h" />
<ClInclude Include="..\audio\wp8\MediaStreamer.h" />
<ClInclude Include="..\base\allocator\CCAllocatorBase.h" />
<ClInclude Include="..\base\allocator\CCAllocatorDiagnostics.h" />
<ClInclude Include="..\base\allocator\CCAllocatorGlobal.h" />
<ClInclude Include="..\base\allocator\CCAllocatorMacros.h" />
<ClInclude Include="..\base\allocator\CCAllocatorMutex.h" />
<ClInclude Include="..\base\allocator\CCAllocatorStrategyDefault.h" />
<ClInclude Include="..\base\allocator\CCAllocatorStrategyFixedBlock.h" />
<ClInclude Include="..\base\allocator\CCAllocatorStrategyGlobalSmallBlock.h" />
<ClInclude Include="..\base\allocator\CCAllocatorStrategyPool.h" />
<ClInclude Include="..\base\atitc.h" />
<ClInclude Include="..\base\base64.h" />
<ClInclude Include="..\base\CCAsyncTaskPool.h" />
@ -721,6 +730,9 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\base\allocator\CCAllocatorDiagnostics.cpp" />
<ClCompile Include="..\base\allocator\CCAllocatorGlobal.cpp" />
<ClCompile Include="..\base\allocator\CCAllocatorGlobalNewDelete.cpp" />
<ClCompile Include="..\base\atitc.cpp" />
<ClCompile Include="..\base\base64.cpp" />
<ClCompile Include="..\base\CCAsyncTaskPool.cpp" />

View File

@ -248,6 +248,9 @@
<Filter Include="ui\shaders">
<UniqueIdentifier>{f6df0f43-3b03-4746-b786-4323895be3b1}</UniqueIdentifier>
</Filter>
<Filter Include="base\allocator">
<UniqueIdentifier>{b870ea4f-2751-4a44-92f5-a7fb3b3672cb}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="CCAction.cpp">
@ -1335,6 +1338,15 @@
<ClCompile Include="..\platform\winrt\inet_pton_winrt.cpp">
<Filter>platform\winrt</Filter>
</ClCompile>
<ClCompile Include="..\base\allocator\CCAllocatorDiagnostics.cpp">
<Filter>base\allocator</Filter>
</ClCompile>
<ClCompile Include="..\base\allocator\CCAllocatorGlobal.cpp">
<Filter>base\allocator</Filter>
</ClCompile>
<ClCompile Include="..\base\allocator\CCAllocatorGlobalNewDelete.cpp">
<Filter>base\allocator</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="CCAction.h">
@ -2592,6 +2604,33 @@
<ClInclude Include="..\platform\winrt\inet_pton_winrt.h">
<Filter>platform\winrt</Filter>
</ClInclude>
<ClInclude Include="..\base\allocator\CCAllocatorBase.h">
<Filter>base\allocator</Filter>
</ClInclude>
<ClInclude Include="..\base\allocator\CCAllocatorDiagnostics.h">
<Filter>base\allocator</Filter>
</ClInclude>
<ClInclude Include="..\base\allocator\CCAllocatorGlobal.h">
<Filter>base\allocator</Filter>
</ClInclude>
<ClInclude Include="..\base\allocator\CCAllocatorMacros.h">
<Filter>base\allocator</Filter>
</ClInclude>
<ClInclude Include="..\base\allocator\CCAllocatorMutex.h">
<Filter>base\allocator</Filter>
</ClInclude>
<ClInclude Include="..\base\allocator\CCAllocatorStrategyDefault.h">
<Filter>base\allocator</Filter>
</ClInclude>
<ClInclude Include="..\base\allocator\CCAllocatorStrategyFixedBlock.h">
<Filter>base\allocator</Filter>
</ClInclude>
<ClInclude Include="..\base\allocator\CCAllocatorStrategyGlobalSmallBlock.h">
<Filter>base\allocator</Filter>
</ClInclude>
<ClInclude Include="..\base\allocator\CCAllocatorStrategyPool.h">
<Filter>base\allocator</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\math\Mat4.inl">