Menu
▾
▴
[Freeorion-programmers] SF.net SVN: freeorion:[4560] trunk/FreeOrion/msvc2010
|
From: <geo...@us...> - 2012-01-02 13:00:29
|
Revision: 4560
http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4560&view=rev
Author: geoffthemedio
Date: 2012-01-02 13:00:21 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
Replaced Universe with wider-scope Common static library in MSVC 2010 project files.
Modified Paths:
--------------
trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj
trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters
trunk/FreeOrion/msvc2010/FreeOrion.sln
trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj
trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj.filters
trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj
trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters
Added Paths:
-----------
trunk/FreeOrion/msvc2010/Common/
trunk/FreeOrion/msvc2010/Common/Common.vcxproj
trunk/FreeOrion/msvc2010/Common/Common.vcxproj.filters
Removed Paths:
-------------
trunk/FreeOrion/msvc2010/Universe/
Added: trunk/FreeOrion/msvc2010/Common/Common.vcxproj
===================================================================
--- trunk/FreeOrion/msvc2010/Common/Common.vcxproj (rev 0)
+++ trunk/FreeOrion/msvc2010/Common/Common.vcxproj 2012-01-02 13:00:21 UTC (rev 4560)
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{BEDF460A-EAE9-4E20-AFB2-2C8434051150}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>Common</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <OutDir>../../</OutDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>Full</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREEORION_WIN32;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../include/zlib/;../../../Boost/include/boost_1_47/;../../GG/</AdditionalIncludeDirectories>
+ <CompileAsManaged>false</CompileAsManaged>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
+ <WholeProgramOptimization>false</WholeProgramOptimization>
+ <PrecompiledHeaderFile>
+ </PrecompiledHeaderFile>
+ <PrecompiledHeaderOutputFile>
+ </PrecompiledHeaderOutputFile>
+ <DisableSpecificWarnings>4275;4244;4251;4351</DisableSpecificWarnings>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <None Include="..\..\util\Serialize.ipp">
+ <FileType>Document</FileType>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\combat\CombatOrder.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\AbstractVehicle.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\AsteroidBeltObstacle.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\CombatFighter.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\CombatObject.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\CombatShip.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\LocalSpace.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\Missile.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\Obstacle.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\PathingEngine.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\PathingEngineFwd.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\Proximity.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\ProximityDatabase.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\SimpleVehicle.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\StandardTypes.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\SteerLibrary.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\UnusedParameter.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\Utilities.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\Vec3.h" />
+ <ClInclude Include="..\..\combat\OpenSteer\Vec3Utilities.h" />
+ <ClInclude Include="..\..\Empire\Empire.h" />
+ <ClInclude Include="..\..\Empire\EmpireManager.h" />
+ <ClInclude Include="..\..\Empire\ResourcePool.h" />
+ <ClInclude Include="..\..\network\Message.h" />
+ <ClInclude Include="..\..\network\MessageQueue.h" />
+ <ClInclude Include="..\..\network\Networking.h" />
+ <ClInclude Include="..\..\universe\Building.h" />
+ <ClInclude Include="..\..\universe\Condition.h" />
+ <ClInclude Include="..\..\universe\Effect.h" />
+ <ClInclude Include="..\..\universe\EffectAccounting.h" />
+ <ClInclude Include="..\..\universe\Enums.h" />
+ <ClInclude Include="..\..\universe\Fleet.h" />
+ <ClInclude Include="..\..\universe\InhibitableSignal.h" />
+ <ClInclude Include="..\..\universe\Meter.h" />
+ <ClInclude Include="..\..\universe\Names.h" />
+ <ClInclude Include="..\..\universe\ObjectMap.h" />
+ <ClInclude Include="..\..\universe\Planet.h" />
+ <ClInclude Include="..\..\universe\PopCenter.h" />
+ <ClInclude Include="..\..\universe\Predicates.h" />
+ <ClInclude Include="..\..\universe\ResourceCenter.h" />
+ <ClInclude Include="..\..\universe\Ship.h" />
+ <ClInclude Include="..\..\universe\ShipDesign.h" />
+ <ClInclude Include="..\..\universe\Special.h" />
+ <ClInclude Include="..\..\universe\Species.h" />
+ <ClInclude Include="..\..\universe\System.h" />
+ <ClInclude Include="..\..\universe\Tech.h" />
+ <ClInclude Include="..\..\universe\Universe.h" />
+ <ClInclude Include="..\..\universe\UniverseObject.h" />
+ <ClInclude Include="..\..\universe\ValueRef.h" />
+ <ClInclude Include="..\..\universe\ValueRefFwd.h" />
+ <ClInclude Include="..\..\util\AppInterface.h" />
+ <ClInclude Include="..\..\util\binreloc.h" />
+ <ClInclude Include="..\..\util\DataTable.h" />
+ <ClInclude Include="..\..\util\Directories.h" />
+ <ClInclude Include="..\..\util\GLStateComparator.h" />
+ <ClInclude Include="..\..\util\GZStream.h" />
+ <ClInclude Include="..\..\util\Math.h" />
+ <ClInclude Include="..\..\util\MultiplayerCommon.h" />
+ <ClInclude Include="..\..\util\OptionsDB.h" />
+ <ClInclude Include="..\..\util\OptionValidators.h" />
+ <ClInclude Include="..\..\util\Order.h" />
+ <ClInclude Include="..\..\util\OrderSet.h" />
+ <ClInclude Include="..\..\util\Process.h" />
+ <ClInclude Include="..\..\util\Random.h" />
+ <ClInclude Include="..\..\util\Serialize.h" />
+ <ClInclude Include="..\..\util\SitRepEntry.h" />
+ <ClInclude Include="..\..\util\VarText.h" />
+ <ClInclude Include="..\..\util\Version.h" />
+ <ClInclude Include="..\..\util\XMLDoc.h" />
+ <ClInclude Include="..\..\util\XMLObjectFactory.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\combat\CombatOrder.cpp" />
+ <ClCompile Include="..\..\combat\OpenSteer\AsteroidBeltObstacle.cpp" />
+ <ClCompile Include="..\..\combat\OpenSteer\CombatFighter.cpp" />
+ <ClCompile Include="..\..\combat\OpenSteer\CombatObject.cpp" />
+ <ClCompile Include="..\..\combat\OpenSteer\CombatShip.cpp" />
+ <ClCompile Include="..\..\combat\OpenSteer\Missile.cpp" />
+ <ClCompile Include="..\..\combat\OpenSteer\Obstacle.cpp" />
+ <ClCompile Include="..\..\combat\OpenSteer\PathingEngine.cpp" />
+ <ClCompile Include="..\..\combat\OpenSteer\SimpleVehicle.cpp" />
+ <ClCompile Include="..\..\combat\OpenSteer\Vec3.cpp" />
+ <ClCompile Include="..\..\combat\OpenSteer\Vec3Utilities.cpp" />
+ <ClCompile Include="..\..\Empire\Empire.cpp" />
+ <ClCompile Include="..\..\Empire\EmpireManager.cpp" />
+ <ClCompile Include="..\..\Empire\ResourcePool.cpp" />
+ <ClCompile Include="..\..\network\MessageQueue.cpp" />
+ <ClCompile Include="..\..\network\Networking.cpp" />
+ <ClCompile Include="..\..\universe\Building.cpp" />
+ <ClCompile Include="..\..\universe\Condition.cpp" />
+ <ClCompile Include="..\..\universe\Effect.cpp" />
+ <ClCompile Include="..\..\universe\EffectAccounting.cpp" />
+ <ClCompile Include="..\..\universe\Enums.cpp" />
+ <ClCompile Include="..\..\universe\Fleet.cpp" />
+ <ClCompile Include="..\..\universe\Meter.cpp" />
+ <ClCompile Include="..\..\universe\Names.cpp" />
+ <ClCompile Include="..\..\universe\ObjectMap.cpp" />
+ <ClCompile Include="..\..\universe\Planet.cpp" />
+ <ClCompile Include="..\..\universe\PopCenter.cpp" />
+ <ClCompile Include="..\..\universe\Predicates.cpp" />
+ <ClCompile Include="..\..\universe\ResourceCenter.cpp" />
+ <ClCompile Include="..\..\universe\Ship.cpp" />
+ <ClCompile Include="..\..\universe\ShipDesign.cpp" />
+ <ClCompile Include="..\..\universe\Special.cpp" />
+ <ClCompile Include="..\..\universe\Species.cpp" />
+ <ClCompile Include="..\..\universe\System.cpp" />
+ <ClCompile Include="..\..\universe\Tech.cpp" />
+ <ClCompile Include="..\..\universe\Universe.cpp" />
+ <ClCompile Include="..\..\universe\UniverseObject.cpp" />
+ <ClCompile Include="..\..\universe\ValueRef.cpp" />
+ <ClCompile Include="..\..\util\DataTable.cpp" />
+ <ClCompile Include="..\..\util\Directories.cpp" />
+ <ClCompile Include="..\..\util\GZStream.cpp" />
+ <ClCompile Include="..\..\util\Math.cpp" />
+ <ClCompile Include="..\..\util\MultiplayerCommon.cpp" />
+ <ClCompile Include="..\..\util\OptionsDB.cpp" />
+ <ClCompile Include="..\..\util\Order.cpp" />
+ <ClCompile Include="..\..\util\OrderSet.cpp" />
+ <ClCompile Include="..\..\util\Random.cpp" />
+ <ClCompile Include="..\..\util\SerializeEmpire.cpp" />
+ <ClCompile Include="..\..\util\SerializeMultiplayerCommon.cpp" />
+ <ClCompile Include="..\..\util\SerializeOrderSet.cpp" />
+ <ClCompile Include="..\..\util\SerializePathingEngine.cpp" />
+ <ClCompile Include="..\..\util\SerializeUniverse.cpp" />
+ <ClCompile Include="..\..\util\SitRepEntry.cpp" />
+ <ClCompile Include="..\..\util\XMLDoc.cpp" />
+ <ClCompile Include="..\src\Version.cpp" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Added: trunk/FreeOrion/msvc2010/Common/Common.vcxproj.filters
===================================================================
--- trunk/FreeOrion/msvc2010/Common/Common.vcxproj.filters (rev 0)
+++ trunk/FreeOrion/msvc2010/Common/Common.vcxproj.filters 2012-01-02 13:00:21 UTC (rev 4560)
@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Header Files\network">
+ <UniqueIdentifier>{142c3274-1cab-42d6-a86c-e59ea78eb237}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\Empire">
+ <UniqueIdentifier>{12515875-a210-4dcd-bb6d-d3670862478b}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\combat">
+ <UniqueIdentifier>{764c47ba-1d26-4f9e-a713-5fe40180a278}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\combat\OpenSteer">
+ <UniqueIdentifier>{9e28af39-5c58-4c6c-94e3-318775ae1f1c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\universe">
+ <UniqueIdentifier>{43f4183a-a57b-41e7-ba41-dcd67de4ce56}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\network">
+ <UniqueIdentifier>{160a68fb-39f9-46df-a415-704ffec1d678}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\util">
+ <UniqueIdentifier>{cf92b189-673f-4409-a849-7cf498468f7c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\combat">
+ <UniqueIdentifier>{b769d59e-1a03-4c55-9bdd-cfa42e506283}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\combat\OpenSteer">
+ <UniqueIdentifier>{01f1236b-c5b2-4cc1-a46e-2b9eb714a0f2}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\Empire">
+ <UniqueIdentifier>{329c410c-9729-4f42-9a1f-09106fff80a6}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\util">
+ <UniqueIdentifier>{8288356b-fc09-4aef-992b-9ecf8963f7f9}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\universe">
+ <UniqueIdentifier>{150b0529-eaa2-4ad3-b805-488bc11d1d6e}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\util\Serialize.ipp">
+ <Filter>Source Files\util</Filter>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\network\Message.h">
+ <Filter>Header Files\network</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\network\MessageQueue.h">
+ <Filter>Header Files\network</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\network\Networking.h">
+ <Filter>Header Files\network</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Empire\Empire.h">
+ <Filter>Header Files\Empire</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Empire\EmpireManager.h">
+ <Filter>Header Files\Empire</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Empire\ResourcePool.h">
+ <Filter>Header Files\Empire</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\CombatOrder.h">
+ <Filter>Header Files\combat</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\AbstractVehicle.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\AsteroidBeltObstacle.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\CombatFighter.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\CombatObject.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\CombatShip.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\LocalSpace.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\Missile.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\Obstacle.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\PathingEngine.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\PathingEngineFwd.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\Proximity.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\ProximityDatabase.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\SimpleVehicle.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\StandardTypes.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\SteerLibrary.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\UnusedParameter.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\Utilities.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\Vec3.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\combat\OpenSteer\Vec3Utilities.h">
+ <Filter>Header Files\combat\OpenSteer</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Building.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Condition.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Effect.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\EffectAccounting.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Enums.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Fleet.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\InhibitableSignal.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Meter.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Names.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\ObjectMap.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Planet.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\PopCenter.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Predicates.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\ResourceCenter.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Ship.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\ShipDesign.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Special.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Species.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\System.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Tech.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\Universe.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\UniverseObject.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\ValueRef.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\universe\ValueRefFwd.h">
+ <Filter>Header Files\universe</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\AppInterface.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\binreloc.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\DataTable.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\Directories.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\GLStateComparator.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\GZStream.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\Math.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\MultiplayerCommon.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\OptionsDB.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\OptionValidators.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\Order.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\OrderSet.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\Process.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\Random.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\Serialize.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\SitRepEntry.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\VarText.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\Version.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\XMLDoc.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\util\XMLObjectFactory.h">
+ <Filter>Header Files\util</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\network\MessageQueue.cpp">
+ <Filter>Source Files\network</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\network\Networking.cpp">
+ <Filter>Source Files\network</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\DataTable.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\Directories.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\GZStream.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\Math.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\MultiplayerCommon.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\OptionsDB.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\Order.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\OrderSet.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\Random.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\SerializeEmpire.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\SerializeMultiplayerCommon.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\SerializeOrderSet.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\SerializePathingEngine.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\SerializeUniverse.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\SitRepEntry.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\XMLDoc.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\Version.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\combat\CombatOrder.cpp">
+ <Filter>Source Files\combat</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\combat\OpenSteer\AsteroidBeltObstacle.cpp">
+ <Filter>Source Files\combat\OpenSteer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\combat\OpenSteer\CombatFighter.cpp">
+ <Filter>Source Files\combat\OpenSteer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\combat\OpenSteer\CombatObject.cpp">
+ <Filter>Source Files\combat\OpenSteer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\combat\OpenSteer\CombatShip.cpp">
+ <Filter>Source Files\combat\OpenSteer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\combat\OpenSteer\Missile.cpp">
+ <Filter>Source Files\combat\OpenSteer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\combat\OpenSteer\Obstacle.cpp">
+ <Filter>Source Files\combat\OpenSteer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\combat\OpenSteer\PathingEngine.cpp">
+ <Filter>Source Files\combat\OpenSteer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\combat\OpenSteer\SimpleVehicle.cpp">
+ <Filter>Source Files\combat\OpenSteer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\combat\OpenSteer\Vec3.cpp">
+ <Filter>Source Files\combat\OpenSteer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\combat\OpenSteer\Vec3Utilities.cpp">
+ <Filter>Source Files\combat\OpenSteer</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Empire\Empire.cpp">
+ <Filter>Source Files\Empire</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Empire\EmpireManager.cpp">
+ <Filter>Source Files\Empire</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Empire\ResourcePool.cpp">
+ <Filter>Source Files\Empire</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Building.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\ValueRef.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Condition.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Effect.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\EffectAccounting.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Enums.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Fleet.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Meter.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Names.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\ObjectMap.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Planet.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\PopCenter.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Predicates.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\ResourceCenter.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Ship.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\ShipDesign.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Special.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Species.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\System.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Tech.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\Universe.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\universe\UniverseObject.cpp">
+ <Filter>Source Files\universe</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj
===================================================================
--- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2012-01-02 11:16:29 UTC (rev 4559)
+++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2012-01-02 13:00:21 UTC (rev 4560)
@@ -84,7 +84,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>../../../lib/;../../../lib/bullet/;../../../Boost/lib/;../../</AdditionalLibraryDirectories>
- <AdditionalDependencies>Universe.lib;Parsers.lib;log4cpp.lib;GiGi.lib;GiGiOgre.lib;OgreMain.lib;opengl32.lib;glu32.lib;libpng.lib;jpeg.lib;BulletCollision.lib;LinearMath.lib;glew32.lib;OpenAL32.lib;zlib.lib;ALut.lib;libvorbisfile.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>Common.lib;Parsers.lib;log4cpp.lib;GiGi.lib;GiGiOgre.lib;OgreMain.lib;opengl32.lib;glu32.lib;libpng.lib;jpeg.lib;BulletCollision.lib;LinearMath.lib;glew32.lib;OpenAL32.lib;zlib.lib;ALut.lib;libvorbisfile.lib;Psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>../../FreeOrion.exe</OutputFile>
<LinkStatus>
</LinkStatus>
@@ -232,7 +232,6 @@
</ItemGroup>
<ItemGroup>
<None Include="..\..\FreeOrion.ico" />
- <None Include="..\..\util\Serialize.ipp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\client\ClientApp.cpp" />
@@ -240,24 +239,8 @@
<ClCompile Include="..\..\client\human\chmain.cpp" />
<ClCompile Include="..\..\client\human\HumanClientApp.cpp" />
<ClCompile Include="..\..\client\human\HumanClientFSM.cpp" />
- <ClCompile Include="..\..\combat\CombatOrder.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\AsteroidBeltObstacle.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\CombatFighter.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\CombatObject.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\CombatShip.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\Missile.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\Obstacle.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\PathingEngine.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\SimpleVehicle.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\Vec3.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\Vec3Utilities.cpp" />
- <ClCompile Include="..\..\Empire\Empire.cpp" />
- <ClCompile Include="..\..\Empire\EmpireManager.cpp" />
- <ClCompile Include="..\..\Empire\ResourcePool.cpp" />
<ClCompile Include="..\..\network\ClientNetworking.cpp" />
<ClCompile Include="..\..\network\Message.cpp" />
- <ClCompile Include="..\..\network\MessageQueue.cpp" />
- <ClCompile Include="..\..\network\Networking.cpp" />
<ClCompile Include="..\..\UI\About.cpp" />
<ClCompile Include="..\..\UI\BuildDesignatorWnd.cpp" />
<ClCompile Include="..\..\UI\ChatWnd.cpp" />
@@ -312,27 +295,8 @@
<ClCompile Include="..\..\UI\TechTreeWnd.cpp" />
<ClCompile Include="..\..\UI\TurnProgressWnd.cpp" />
<ClCompile Include="..\..\util\AppInterface.cpp" />
- <ClCompile Include="..\..\util\DataTable.cpp" />
- <ClCompile Include="..\..\util\Directories.cpp" />
- <ClCompile Include="..\..\util\GZStream.cpp" />
- <ClCompile Include="..\..\util\Math.cpp" />
- <ClCompile Include="..\..\util\MultiplayerCommon.cpp" />
- <ClCompile Include="..\..\util\OptionsDB.cpp" />
- <ClCompile Include="..\..\util\Order.cpp" />
- <ClCompile Include="..\..\util\OrderSet.cpp" />
<ClCompile Include="..\..\util\Process.cpp" />
- <ClCompile Include="..\..\util\Random.cpp" />
- <ClCompile Include="..\..\util\SerializeEmpire.cpp" />
- <ClCompile Include="..\..\util\SerializeMultiplayerCommon.cpp" />
- <ClCompile Include="..\..\util\SerializeOrderSet.cpp" />
- <ClCompile Include="..\..\util\SerializePathingEngine.cpp" />
- <ClCompile Include="..\..\util\SerializeUniverse.cpp" />
- <ClCompile Include="..\..\util\SitRepEntry.cpp" />
<ClCompile Include="..\..\util\VarText.cpp" />
- <ClCompile Include="..\..\util\XMLDoc.cpp" />
- <ClCompile Include="..\src\Version.cpp">
- <DebugInformationFormat Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">OldStyle</DebugInformationFormat>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="FreeOrion.rc">
Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters
===================================================================
--- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters 2012-01-02 11:16:29 UTC (rev 4559)
+++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters 2012-01-02 13:00:21 UTC (rev 4560)
@@ -34,15 +34,6 @@
<Filter Include="Source Files\client\human">
<UniqueIdentifier>{36991414-b082-4e70-b6b1-77cff5c09cb1}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\combat">
- <UniqueIdentifier>{37734a74-6e93-4baa-9db8-67c3d7907224}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\combat\OpenSteer">
- <UniqueIdentifier>{d946e25a-b6d7-45b7-bfc1-a12898991aa8}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\Empire">
- <UniqueIdentifier>{fa991e5a-f7ca-44c1-9e99-82eb5ef20d0b}</UniqueIdentifier>
- </Filter>
<Filter Include="Header Files\network">
<UniqueIdentifier>{683283a4-a27f-4105-8437-c3d102745e9f}</UniqueIdentifier>
</Filter>
@@ -476,9 +467,6 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="..\..\util\Serialize.ipp">
- <Filter>Source Files\util</Filter>
- </None>
<None Include="..\..\FreeOrion.ico">
<Filter>Resource Files</Filter>
</None>
@@ -499,60 +487,12 @@
<ClCompile Include="..\..\client\human\HumanClientFSM.cpp">
<Filter>Source Files\client\human</Filter>
</ClCompile>
- <ClCompile Include="..\..\combat\CombatOrder.cpp">
- <Filter>Source Files\combat</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\CombatObject.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\CombatFighter.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\AsteroidBeltObstacle.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\Vec3Utilities.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\Vec3.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\SimpleVehicle.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\PathingEngine.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\Obstacle.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\Missile.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\CombatShip.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\Empire\ResourcePool.cpp">
- <Filter>Source Files\Empire</Filter>
- </ClCompile>
- <ClCompile Include="..\..\Empire\Empire.cpp">
- <Filter>Source Files\Empire</Filter>
- </ClCompile>
- <ClCompile Include="..\..\Empire\EmpireManager.cpp">
- <Filter>Source Files\Empire</Filter>
- </ClCompile>
- <ClCompile Include="..\..\network\Networking.cpp">
- <Filter>Source Files\network</Filter>
- </ClCompile>
<ClCompile Include="..\..\network\ClientNetworking.cpp">
<Filter>Source Files\network</Filter>
</ClCompile>
<ClCompile Include="..\..\network\Message.cpp">
<Filter>Source Files\network</Filter>
</ClCompile>
- <ClCompile Include="..\..\network\MessageQueue.cpp">
- <Filter>Source Files\network</Filter>
- </ClCompile>
<ClCompile Include="..\..\UI\PagedGeometry\TreeLoader2D.cpp">
<Filter>Source Files\UI\PagedGeometry</Filter>
</ClCompile>
@@ -703,66 +643,9 @@
<ClCompile Include="..\..\UI\ServerConnectWnd.cpp">
<Filter>Source Files\UI</Filter>
</ClCompile>
- <ClCompile Include="..\..\util\Random.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\SerializeEmpire.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\SerializeMultiplayerCommon.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\SerializeOrderSet.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\SerializePathingEngine.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\SerializeUniverse.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\SitRepEntry.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\VarText.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\XMLDoc.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
<ClCompile Include="..\..\util\AppInterface.cpp">
<Filter>Source Files\util</Filter>
</ClCompile>
- <ClCompile Include="..\..\util\DataTable.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\Directories.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\GZStream.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\Math.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\MultiplayerCommon.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\OptionsDB.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\Order.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\OrderSet.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\Process.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\src\Version.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
<ClCompile Include="..\..\UI\PlayerListWnd.cpp">
<Filter>Source Files\UI</Filter>
</ClCompile>
@@ -772,6 +655,12 @@
<ClCompile Include="..\..\UI\GLClientAndServerBuffer.cpp">
<Filter>Source Files\UI</Filter>
</ClCompile>
+ <ClCompile Include="..\..\util\Process.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\util\VarText.cpp">
+ <Filter>Source Files\util</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="FreeOrion.rc">
Modified: trunk/FreeOrion/msvc2010/FreeOrion.sln
===================================================================
--- trunk/FreeOrion/msvc2010/FreeOrion.sln 2012-01-02 11:16:29 UTC (rev 4559)
+++ trunk/FreeOrion/msvc2010/FreeOrion.sln 2012-01-02 13:00:21 UTC (rev 4560)
@@ -16,26 +16,26 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeOrion", "FreeOrion\FreeOrion.vcxproj", "{311D02C0-427D-4A03-AAEB-B819A9ACF5AB}"
ProjectSection(ProjectDependencies) = postProject
+ {BEDF460A-EAE9-4E20-AFB2-2C8434051150} = {BEDF460A-EAE9-4E20-AFB2-2C8434051150}
{A88B8C11-8415-4E28-B90D-4A45B4FC513E} = {A88B8C11-8415-4E28-B90D-4A45B4FC513E}
{9925F25C-A72E-42AE-B2E3-6657255BF293} = {9925F25C-A72E-42AE-B2E3-6657255BF293}
{A79A0D95-B9C4-42A5-9D4A-B55240EB295A} = {A79A0D95-B9C4-42A5-9D4A-B55240EB295A}
{2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB} = {2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB}
{DFF7D1E4-1A95-407A-B84C-AB57A20A9485} = {DFF7D1E4-1A95-407A-B84C-AB57A20A9485}
- {72746EEC-410C-4272-988F-835DC2665FDB} = {72746EEC-410C-4272-988F-835DC2665FDB}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeOrionD", "FreeOrionD\FreeOrionD.vcxproj", "{B9808A04-CE5E-4660-99CB-B8C8C4E64402}"
ProjectSection(ProjectDependencies) = postProject
+ {BEDF460A-EAE9-4E20-AFB2-2C8434051150} = {BEDF460A-EAE9-4E20-AFB2-2C8434051150}
{9925F25C-A72E-42AE-B2E3-6657255BF293} = {9925F25C-A72E-42AE-B2E3-6657255BF293}
{DFF7D1E4-1A95-407A-B84C-AB57A20A9485} = {DFF7D1E4-1A95-407A-B84C-AB57A20A9485}
- {72746EEC-410C-4272-988F-835DC2665FDB} = {72746EEC-410C-4272-988F-835DC2665FDB}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeOrionCA", "FreeOrionCA\FreeOrionCA.vcxproj", "{77E8E74E-F581-4850-A4C6-A088564DF9A7}"
ProjectSection(ProjectDependencies) = postProject
+ {BEDF460A-EAE9-4E20-AFB2-2C8434051150} = {BEDF460A-EAE9-4E20-AFB2-2C8434051150}
{9925F25C-A72E-42AE-B2E3-6657255BF293} = {9925F25C-A72E-42AE-B2E3-6657255BF293}
{DFF7D1E4-1A95-407A-B84C-AB57A20A9485} = {DFF7D1E4-1A95-407A-B84C-AB57A20A9485}
- {72746EEC-410C-4272-988F-835DC2665FDB} = {72746EEC-410C-4272-988F-835DC2665FDB}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Parsers", "Parsers\Parsers.vcxproj", "{9925F25C-A72E-42AE-B2E3-6657255BF293}"
@@ -45,31 +45,50 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log4cpp", "log4cpp\log4cpp.vcxproj", "{DFF7D1E4-1A95-407A-B84C-AB57A20A9485}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Universe", "Universe\Universe.vcxproj", "{72746EEC-410C-4272-988F-835DC2665FDB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{BEDF460A-EAE9-4E20-AFB2-2C8434051150}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB}.Debug|Win32.Build.0 = Debug|Win32
{2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB}.Release|Win32.ActiveCfg = Release|Win32
{2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB}.Release|Win32.Build.0 = Release|Win32
+ {A79A0D95-B9C4-42A5-9D4A-B55240EB295A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A79A0D95-B9C4-42A5-9D4A-B55240EB295A}.Debug|Win32.Build.0 = Debug|Win32
{A79A0D95-B9C4-42A5-9D4A-B55240EB295A}.Release|Win32.ActiveCfg = Release|Win32
{A79A0D95-B9C4-42A5-9D4A-B55240EB295A}.Release|Win32.Build.0 = Release|Win32
+ {A88B8C11-8415-4E28-B90D-4A45B4FC513E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A88B8C11-8415-4E28-B90D-4A45B4FC513E}.Debug|Win32.Build.0 = Debug|Win32
{A88B8C11-8415-4E28-B90D-4A45B4FC513E}.Release|Win32.ActiveCfg = Release|Win32
{A88B8C11-8415-4E28-B90D-4A45B4FC513E}.Release|Win32.Build.0 = Release|Win32
+ {311D02C0-427D-4A03-AAEB-B819A9ACF5AB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {311D02C0-427D-4A03-AAEB-B819A9ACF5AB}.Debug|Win32.Build.0 = Debug|Win32
{311D02C0-427D-4A03-AAEB-B819A9ACF5AB}.Release|Win32.ActiveCfg = Release|Win32
{311D02C0-427D-4A03-AAEB-B819A9ACF5AB}.Release|Win32.Build.0 = Release|Win32
+ {B9808A04-CE5E-4660-99CB-B8C8C4E64402}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B9808A04-CE5E-4660-99CB-B8C8C4E64402}.Debug|Win32.Build.0 = Debug|Win32
{B9808A04-CE5E-4660-99CB-B8C8C4E64402}.Release|Win32.ActiveCfg = Release|Win32
{B9808A04-CE5E-4660-99CB-B8C8C4E64402}.Release|Win32.Build.0 = Release|Win32
+ {77E8E74E-F581-4850-A4C6-A088564DF9A7}.Debug|Win32.ActiveCfg = Debug|Win32
+ {77E8E74E-F581-4850-A4C6-A088564DF9A7}.Debug|Win32.Build.0 = Debug|Win32
{77E8E74E-F581-4850-A4C6-A088564DF9A7}.Release|Win32.ActiveCfg = Release|Win32
{77E8E74E-F581-4850-A4C6-A088564DF9A7}.Release|Win32.Build.0 = Release|Win32
+ {9925F25C-A72E-42AE-B2E3-6657255BF293}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9925F25C-A72E-42AE-B2E3-6657255BF293}.Debug|Win32.Build.0 = Debug|Win32
{9925F25C-A72E-42AE-B2E3-6657255BF293}.Release|Win32.ActiveCfg = Release|Win32
{9925F25C-A72E-42AE-B2E3-6657255BF293}.Release|Win32.Build.0 = Release|Win32
+ {DFF7D1E4-1A95-407A-B84C-AB57A20A9485}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DFF7D1E4-1A95-407A-B84C-AB57A20A9485}.Debug|Win32.Build.0 = Debug|Win32
{DFF7D1E4-1A95-407A-B84C-AB57A20A9485}.Release|Win32.ActiveCfg = Release|Win32
{DFF7D1E4-1A95-407A-B84C-AB57A20A9485}.Release|Win32.Build.0 = Release|Win32
- {72746EEC-410C-4272-988F-835DC2665FDB}.Release|Win32.ActiveCfg = Release|Win32
- {72746EEC-410C-4272-988F-835DC2665FDB}.Release|Win32.Build.0 = Release|Win32
+ {BEDF460A-EAE9-4E20-AFB2-2C8434051150}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BEDF460A-EAE9-4E20-AFB2-2C8434051150}.Debug|Win32.Build.0 = Debug|Win32
+ {BEDF460A-EAE9-4E20-AFB2-2C8434051150}.Release|Win32.ActiveCfg = Release|Win32
+ {BEDF460A-EAE9-4E20-AFB2-2C8434051150}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj
===================================================================
--- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2012-01-02 11:16:29 UTC (rev 4559)
+++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2012-01-02 13:00:21 UTC (rev 4560)
@@ -85,7 +85,7 @@
<OptimizeReferences>true</OptimizeReferences>
<OutputFile>../../FreeOrionCA.exe</OutputFile>
<AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/;../../</AdditionalLibraryDirectories>
- <AdditionalDependencies>Universe.lib;Parsers.lib;log4cpp.lib;python27.lib;boost_python-vc100-mt-1_47.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>Common.lib;Parsers.lib;log4cpp.lib;python27.lib;boost_python-vc100-mt-1_47.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<LinkErrorReporting>SendErrorReport</LinkErrorReporting>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
@@ -183,53 +183,16 @@
<ClCompile Include="..\..\client\AI\camain.cpp" />
<ClCompile Include="..\..\client\ClientApp.cpp" />
<ClCompile Include="..\..\client\ClientFSMEvents.cpp" />
- <ClCompile Include="..\..\combat\CombatOrder.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\AsteroidBeltObstacle.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\CombatFighter.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\CombatObject.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\CombatShip.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\Missile.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\Obstacle.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\PathingEngine.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\SimpleVehicle.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\Vec3.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\Vec3Utilities.cpp" />
- <ClCompile Include="..\..\Empire\Empire.cpp" />
- <ClCompile Include="..\..\Empire\EmpireManager.cpp" />
- <ClCompile Include="..\..\Empire\ResourcePool.cpp" />
<ClCompile Include="..\..\network\ClientNetworking.cpp" />
<ClCompile Include="..\..\network\Message.cpp" />
- <ClCompile Include="..\..\network\MessageQueue.cpp" />
- <ClCompile Include="..\..\network\Networking.cpp" />
<ClCompile Include="..\..\python\PythonEmpireWrapper.cpp" />
<ClCompile Include="..\..\python\PythonEnumWrapper.cpp" />
<ClCompile Include="..\..\python\PythonLoggingWrapper.cpp" />
<ClCompile Include="..\..\python\PythonUniverseWrapper.cpp" />
<ClCompile Include="..\..\UI\StringTable.cpp" />
<ClCompile Include="..\..\util\AppInterface.cpp" />
- <ClCompile Include="..\..\util\DataTable.cpp" />
- <ClCompile Include="..\..\util\Directories.cpp" />
- <ClCompile Include="..\..\util\GZStream.cpp" />
- <ClCompile Include="..\..\util\Math.cpp" />
- <ClCompile Include="..\..\util\MultiplayerCommon.cpp" />
- <ClCompile Include="..\..\util\OptionsDB.cpp" />
- <ClCompile Include="..\..\util\Order.cpp" />
- <ClCompile Include="..\..\util\OrderSet.cpp" />
- <ClCompile Include="..\..\util\Process.cpp" />
- <ClCompile Include="..\..\util\Random.cpp" />
- <ClCompile Include="..\..\util\SerializeEmpire.cpp" />
- <ClCompile Include="..\..\util\SerializeMultiplayerCommon.cpp" />
- <ClCompile Include="..\..\util\SerializeOrderSet.cpp" />
- <ClCompile Include="..\..\util\SerializePathingEngine.cpp" />
- <ClCompile Include="..\..\util\SerializeUniverse.cpp" />
- <ClCompile Include="..\..\util\SitRepEntry.cpp" />
<ClCompile Include="..\..\util\VarText.cpp" />
- <ClCompile Include="..\..\util\XMLDoc.cpp" />
</ItemGroup>
- <ItemGroup>
- <None Include="..\..\util\Serialize.ipp" />
- <None Include="..\..\util\SerializeUniverseExports.ipp" />
- </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj.filters
===================================================================
--- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj.filters 2012-01-02 11:16:29 UTC (rev 4559)
+++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj.filters 2012-01-02 13:00:21 UTC (rev 4560)
@@ -51,15 +51,6 @@
<Filter Include="Source Files\client\AI">
<UniqueIdentifier>{7ce8eac8-615b-4c78-b206-3bf5fb2ab6bb}</UniqueIdentifier>
</Filter>
- <Filter Include="Source Files\combat">
- <UniqueIdentifier>{49cbf889-c9f7-4d90-92cb-1fc5e9a30c2b}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\combat\OpenSteer">
- <UniqueIdentifier>{3abecfae-5df7-41e2-ba6e-98513237aa9b}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\Empire">
- <UniqueIdentifier>{9c600fea-32b7-4611-a3ea-c363bb8e61ba}</UniqueIdentifier>
- </Filter>
<Filter Include="Source Files\network">
<UniqueIdentifier>{0de6ad2e-dcac-40fb-93fb-19267615fa87}</UniqueIdentifier>
</Filter>
@@ -334,117 +325,18 @@
<ClCompile Include="..\..\client\ClientFSMEvents.cpp">
<Filter>Source Files\client</Filter>
</ClCompile>
- <ClCompile Include="..\..\combat\CombatOrder.cpp">
- <Filter>Source Files\combat</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\Obstacle.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\PathingEngine.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\SimpleVehicle.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\Vec3.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\Vec3Utilities.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\AsteroidBeltObstacle.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\CombatFighter.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\CombatObject.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\CombatShip.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\combat\OpenSteer\Missile.cpp">
- <Filter>Source Files\combat\OpenSteer</Filter>
- </ClCompile>
- <ClCompile Include="..\..\Empire\EmpireManager.cpp">
- <Filter>Source Files\Empire</Filter>
- </ClCompile>
- <ClCompile Include="..\..\Empire\ResourcePool.cpp">
- <Filter>Source Files\Empire</Filter>
- </ClCompile>
- <ClCompile Include="..\..\Empire\Empire.cpp">
- <Filter>Source Files\Empire</Filter>
- </ClCompile>
<ClCompile Include="..\..\network\ClientNetworking.cpp">
<Filter>Source Files\network</Filter>
</ClCompile>
<ClCompile Include="..\..\network\Message.cpp">
<Filter>Source Files\network</Filter>
</ClCompile>
- <ClCompile Include="..\..\network\MessageQueue.cpp">
- <Filter>Source Files\network</Filter>
- </ClCompile>
- <ClCompile Include="..\..\network\Networking.cpp">
- <Filter>Source Files\network</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\SerializeUniverse.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\SitRepEntry.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
<ClCompile Include="..\..\util\VarText.cpp">
<Filter>Source Files\util</Filter>
</ClCompile>
- <ClCompile Include="..\..\util\XMLDoc.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
<ClCompile Include="..\..\util\AppInterface.cpp">
<Filter>Source Files\util</Filter>
</ClCompile>
- <ClCompile Include="..\..\util\DataTable.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\Directories.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\GZStream.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\Math.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\MultiplayerCommon.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\OptionsDB.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\Order.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\OrderSet.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\Process.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\Random.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\SerializeEmpire.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\SerializeMultiplayerCommon.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\SerializeOrderSet.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
- <ClCompile Include="..\..\util\SerializePathingEngine.cpp">
- <Filter>Source Files\util</Filter>
- </ClCompile>
<ClCompile Include="..\..\UI\StringTable.cpp">
<Filter>Source Files\UI</Filter>
</ClCompile>
@@ -473,12 +365,4 @@
<Filter>Source Files\AI</Filter>
</ClCompile>
</ItemGroup>
- <ItemGroup>
- <None Include="..\..\util\Serialize.ipp">
- <Filter>Source Files\util</Filter>
- </None>
- <None Include="..\..\util\SerializeUniverseExports.ipp">
- <Filter>Source Files\util</Filter>
- </None>
- </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj
===================================================================
--- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2012-01-02 11:16:29 UTC (rev 4559)
+++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2012-01-02 13:00:21 UTC (rev 4560)
@@ -85,7 +85,7 @@
<OptimizeReferences>true</OptimizeReferences>
<OutputFile>../../FreeOrionD.exe</OutputFile>
<AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/;../../</AdditionalLibraryDirectories>
- <AdditionalDependencies>Universe.lib;Parsers.lib;log4cpp.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>Common.lib;Parsers.lib;log4cpp.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<LinkErrorReporting>SendErrorReport</LinkErrorReporting>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
@@ -170,27 +170,8 @@
<ClInclude Include="..\..\util\XMLObjectFactory.h" />
</ItemGroup>
<ItemGroup>
- <None Include="..\..\util\Serialize.ipp" />
- <None Include="..\..\util\SerializeUniverseExports.ipp" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\combat\CombatOrder.cpp" />
<ClCompile Include="..\..\combat\CombatSystem.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\AsteroidBeltObstacle.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\CombatFighter.cpp" />
- <ClCompile Include="..\..\combat\OpenSteer\CombatObject...
[truncated message content] |