Permalink
Browse files

Merge remote-tracking branch 'fluffyfreak/fixVC2012_00'

  • Loading branch information...
2 parents 8c19694 + 231a67a commit 7d7091d73cc45d641d03eb06a074d6cad29c4187 @johnbartholomew johnbartholomew committed Sep 28, 2012
Showing with 1,268 additions and 1,236 deletions.
  1. +4 −0 win32/vc2010/pioneer.vcxproj
  2. +12 −0 win32/vc2010/pioneer.vcxproj.filters
  3. +402 −398 win32/vc2012/pioneer.vcxproj
  4. +850 −838 win32/vc2012/pioneer.vcxproj.filters
@@ -111,6 +111,7 @@
<ClCompile Include="..\..\src\CommodityTradeWidget.cpp" />
<ClCompile Include="..\..\src\CRC32.cpp" />
<ClCompile Include="..\..\src\DeadVideoLink.cpp" />
+ <ClCompile Include="..\..\src\DeathView.cpp" />
<ClCompile Include="..\..\src\DynamicBody.cpp" />
<ClCompile Include="..\..\src\enum_table.cpp" />
<ClCompile Include="..\..\src\EquipType.cpp" />
@@ -141,6 +142,7 @@
<ClCompile Include="..\..\src\LuaComms.cpp" />
<ClCompile Include="..\..\src\LuaConsole.cpp" />
<ClCompile Include="..\..\src\LuaConstants.cpp" />
+ <ClCompile Include="..\..\src\LuaDev.cpp" />
<ClCompile Include="..\..\src\LuaEngine.cpp" />
<ClCompile Include="..\..\src\LuaEquipType.cpp" />
<ClCompile Include="..\..\src\LuaEvent.cpp" />
@@ -258,6 +260,7 @@
<ClInclude Include="..\..\src\CommodityTradeWidget.h" />
<ClInclude Include="..\..\src\CRC32.h" />
<ClInclude Include="..\..\src\DeadVideoLink.h" />
+ <ClInclude Include="..\..\src\DeathView.h" />
<ClInclude Include="..\..\src\DeleteEmitter.h" />
<ClInclude Include="..\..\src\DynamicBody.h" />
<ClInclude Include="..\..\src\enum_table.h" />
@@ -291,6 +294,7 @@
<ClInclude Include="..\..\src\LuaComms.h" />
<ClInclude Include="..\..\src\LuaConsole.h" />
<ClInclude Include="..\..\src\LuaConstants.h" />
+ <ClInclude Include="..\..\src\LuaDev.h" />
<ClInclude Include="..\..\src\LuaEngine.h" />
<ClInclude Include="..\..\src\LuaEquipType.h" />
<ClInclude Include="..\..\src\LuaEvent.h" />
@@ -393,6 +393,12 @@
<ClCompile Include="..\..\src\LuaRef.cpp">
<Filter>src</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\DeathView.cpp">
+ <Filter>src</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\src\LuaDev.cpp">
+ <Filter>src</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\Aabb.h">
@@ -833,6 +839,12 @@
<ClInclude Include="..\..\contrib\vcacheopt\vcacheopt.h">
<Filter>src</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\DeathView.h">
+ <Filter>src</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\LuaDev.h">
+ <Filter>src</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\Makefile.am">
Oops, something went wrong.

0 comments on commit 7d7091d

Please sign in to comment.