From: <geo...@us...> - 2010-11-28 09:39:58
|
Revision: 3848 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3848&view=rev Author: geoffthemedio Date: 2010-11-28 09:39:52 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Added GiGiOgre project and tweaked existing GiGi project for MSVC 2010. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrion.sln trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj Added Paths: ----------- trunk/FreeOrion/msvc2010/GiGiOgre/ trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj.filters trunk/FreeOrion/msvc2010/src/ trunk/FreeOrion/msvc2010/src/Version.cpp Modified: trunk/FreeOrion/msvc2010/FreeOrion.sln =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion.sln 2010-11-28 09:15:51 UTC (rev 3847) +++ trunk/FreeOrion/msvc2010/FreeOrion.sln 2010-11-28 09:39:52 UTC (rev 3848) @@ -3,6 +3,8 @@ # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GiGi", "GiGi\GiGi.vcxproj", "{2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GiGiOgre", "GiGiOgre\GiGiOgre.vcxproj", "{A79A0D95-B9C4-42A5-9D4A-B55240EB295A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Release|Win32 = Release|Win32 @@ -10,6 +12,8 @@ GlobalSection(ProjectConfigurationPlatforms) = postSolution {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}.Release|Win32.ActiveCfg = Release|Win32 + {A79A0D95-B9C4-42A5-9D4A-B55240EB295A}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2010-11-28 09:15:51 UTC (rev 3847) +++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2010-11-28 09:39:52 UTC (rev 3848) @@ -157,7 +157,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <OutDir>../../</OutDir> - <TargetName>GiGi.dll</TargetName> + <TargetName>GiGi</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -197,7 +197,7 @@ <Optimization>Full</Optimization> <FunctionLevelLinking>false</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_DLL;GiGi_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;BOOST_ALL_DYN_LINK;ADOBE_CONFIG_HPP;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_DLL;GiGi_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../../include;../../../include/libpng/;../../../include/zlib/;../../GG/;../../../Boost/include/boost_1_44/;../include/</AdditionalIncludeDirectories> <CompileAsManaged>false</CompileAsManaged> <MultiProcessorCompilation>true</MultiProcessorCompilation> @@ -211,15 +211,18 @@ <DisableSpecificWarnings>4251; 4244; 4099; 4275</DisableSpecificWarnings> </ClCompile> <Link> - <SubSystem>Windows</SubSystem> + <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <OutputFile>../../GiGi.dll</OutputFile> <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/</AdditionalLibraryDirectories> - <LinkStatus>true</LinkStatus> - <TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors> + <LinkStatus> + </LinkStatus> + <TreatLinkerWarningAsErrors> + </TreatLinkerWarningAsErrors> <AdditionalDependencies>opengl32.lib;glu32.lib;freetype243MT.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies> + <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> Added: trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj (rev 0) +++ trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj 2010-11-28 09:39:52 UTC (rev 3848) @@ -0,0 +1,89 @@ +<?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>{A79A0D95-B9C4-42A5-9D4A-B55240EB295A}</ProjectGuid> + <RootNamespace>GiGiOgre</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>false</WholeProgramOptimization> + <CharacterSet>NotSet</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> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Full</Optimization> + <FunctionLevelLinking>false</FunctionLevelLinking> + <IntrinsicFunctions>false</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../../include/;../../GG/;../../../include/OGRE/;../../../Boost/include/boost_1_44/</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_DLL;GiGiOgre_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + <CompileAs>CompileAsCpp</CompileAs> + <DisableSpecificWarnings>4396</DisableSpecificWarnings> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <OutputFile>../../GiGiOgre.dll</OutputFile> + <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/;../../</AdditionalLibraryDirectories> + <AdditionalDependencies>OgreMain.lib;GiGi.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries> + <SubSystem>Console</SubSystem> + <LinkStatus> + </LinkStatus> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\..\GG\GG\Ogre\OgreGUI.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\GG\src\Ogre\OgreGUI.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj.filters (rev 0) +++ trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj.filters 2010-11-28 09:39:52 UTC (rev 3848) @@ -0,0 +1,23 @@ +<?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> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\GG\GG\Ogre\OgreGUI.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\GG\src\Ogre\OgreGUI.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> +</Project> \ No newline at end of file Added: trunk/FreeOrion/msvc2010/src/Version.cpp =================================================================== --- trunk/FreeOrion/msvc2010/src/Version.cpp (rev 0) +++ trunk/FreeOrion/msvc2010/src/Version.cpp 2010-11-28 09:39:52 UTC (rev 3848) @@ -0,0 +1,10 @@ +#include "../../util/Version.h" + +namespace { + static const std::string retval = "post-v0.3.15 [SVN 3801]"; +} + +const std::string& FreeOrionVersionString() +{ + return retval; +} |
From: <geo...@us...> - 2010-11-28 10:33:45
|
Revision: 3849 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3849&view=rev Author: geoffthemedio Date: 2010-11-28 10:33:39 +0000 (Sun, 28 Nov 2010) Log Message: ----------- Added GiGiOgrePlugin_OIS project and updated other GiGi projects in MSVC 2010 solution. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrion.sln trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj Added Paths: ----------- trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/ trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj.filters Modified: trunk/FreeOrion/msvc2010/FreeOrion.sln =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion.sln 2010-11-28 09:39:52 UTC (rev 3848) +++ trunk/FreeOrion/msvc2010/FreeOrion.sln 2010-11-28 10:33:39 UTC (rev 3849) @@ -4,7 +4,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GiGi", "GiGi\GiGi.vcxproj", "{2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GiGiOgre", "GiGiOgre\GiGiOgre.vcxproj", "{A79A0D95-B9C4-42A5-9D4A-B55240EB295A}" + ProjectSection(ProjectDependencies) = postProject + {2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB} = {2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB} + EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GiGiOgrePlugin_OIS", "GiGiOgrePlugin_OIS\GiGiOgrePlugin_OIS.vcxproj", "{A88B8C11-8415-4E28-B90D-4A45B4FC513E}" + ProjectSection(ProjectDependencies) = postProject + {A79A0D95-B9C4-42A5-9D4A-B55240EB295A} = {A79A0D95-B9C4-42A5-9D4A-B55240EB295A} + {2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB} = {2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Release|Win32 = Release|Win32 @@ -14,6 +23,8 @@ {2CEC3AB3-36A0-4037-AEC2-DA0435A4DADB}.Release|Win32.Build.0 = Release|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}.Release|Win32.ActiveCfg = Release|Win32 + {A88B8C11-8415-4E28-B90D-4A45B4FC513E}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2010-11-28 09:39:52 UTC (rev 3848) +++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2010-11-28 10:33:39 UTC (rev 3849) @@ -157,7 +157,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> <OutDir>../../</OutDir> - <TargetName>GiGi</TargetName> + <TargetName>$(ProjectName)</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -196,7 +196,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <Optimization>Full</Optimization> <FunctionLevelLinking>false</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> + <IntrinsicFunctions>false</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_DLL;GiGi_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../../include;../../../include/libpng/;../../../include/zlib/;../../GG/;../../../Boost/include/boost_1_44/;../include/</AdditionalIncludeDirectories> <CompileAsManaged>false</CompileAsManaged> Modified: trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj 2010-11-28 09:39:52 UTC (rev 3848) +++ trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj 2010-11-28 10:33:39 UTC (rev 3849) @@ -24,7 +24,7 @@ <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>false</WholeProgramOptimization> - <CharacterSet>NotSet</CharacterSet> + <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> Added: trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj (rev 0) +++ trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj 2010-11-28 10:33:39 UTC (rev 3849) @@ -0,0 +1,89 @@ +<?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>{A88B8C11-8415-4E28-B90D-4A45B4FC513E}</ProjectGuid> + <RootNamespace>GiGiOgrePlugin_OIS</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>MultiByte</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>false</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> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Full</Optimization> + <FunctionLevelLinking>false</FunctionLevelLinking> + <IntrinsicFunctions>false</IntrinsicFunctions> + <AdditionalIncludeDirectories>../../../include/;../../../Boost/include/boost_1_44;../../GG/;../include;../../../include/OGRE;../../../include/OIS</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_DLL;GiGiOgrePlugin_OIS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;BOOST_ALL_DYN_LINK</PreprocessorDefinitions> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + <CompileAs>CompileAsCpp</CompileAs> + <DisableSpecificWarnings>4396</DisableSpecificWarnings> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <OutputFile>../../GiGiOgrePlugin_OIS.dll</OutputFile> + <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/;../../</AdditionalLibraryDirectories> + <AdditionalDependencies>GiGi.lib;GiGiOgre.lib;OgreMain.lib;OIS.lib;%(AdditionalDependencies)</AdditionalDependencies> + <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\GG\src\Ogre\Plugins\OgreGUIInputPlugin.cpp" /> + <ClCompile Include="..\..\GG\src\Ogre\Plugins\OISInput.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\GG\GG\Ogre\Plugins\OgreGUIInputPlugin.h" /> + <ClInclude Include="..\..\GG\GG\Ogre\Plugins\OISInput.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj.filters (rev 0) +++ trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj.filters 2010-11-28 10:33:39 UTC (rev 3849) @@ -0,0 +1,29 @@ +<?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> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\GG\src\Ogre\Plugins\OISInput.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\GG\src\Ogre\Plugins\OgreGUIInputPlugin.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\GG\GG\Ogre\Plugins\OgreGUIInputPlugin.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\GG\GG\Ogre\Plugins\OISInput.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> +</Project> \ No newline at end of file |
From: <geo...@us...> - 2010-11-29 02:04:54
|
Revision: 3852 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3852&view=rev Author: geoffthemedio Date: 2010-11-29 02:04:46 +0000 (Mon, 29 Nov 2010) Log Message: ----------- Compiling, but crashing, FreeOrion MSVC 2010 project. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrion.sln trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj Added Paths: ----------- trunk/FreeOrion/msvc2010/FreeOrion/ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters Added: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj (rev 0) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2010-11-29 02:04:46 UTC (rev 3852) @@ -0,0 +1,414 @@ +<?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>{311D02C0-427D-4A03-AAEB-B819A9ACF5AB}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>FreeOrion</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>false</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)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>../../</OutDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <Optimization>Full</Optimization> + <FunctionLevelLinking>false</FunctionLevelLinking> + <IntrinsicFunctions>false</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_HUMAN;FREEORION_WIN32;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE</PreprocessorDefinitions> + <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_44/;../../GG/;../include/;../../../include/OGRE/;../../../include/bullet/;../../../include/zlib/;../../../include/AL/</AdditionalIncludeDirectories> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + <DisableSpecificWarnings>4396;4251;4275;4099;4800;4091;4146</DisableSpecificWarnings> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <AdditionalLibraryDirectories>../../../lib/;../../../lib/bullet/;../../../lib/graphviz/;../../../Boost/lib/;../../</AdditionalLibraryDirectories> + <AdditionalDependencies>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;%(AdditionalDependencies)</AdditionalDependencies> + <OutputFile>../../FreeOrion.exe</OutputFile> + <LinkStatus>true</LinkStatus> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <LinkErrorReporting>SendErrorReport</LinkErrorReporting> + <IgnoreSpecificDefaultLibraries>LIBCMT; LIBCPMT</IgnoreSpecificDefaultLibraries> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="..\..\client\ClientApp.h" /> + <ClInclude Include="..\..\client\ClientFSMEvents.h" /> + <ClInclude Include="..\..\client\human\chmain.h" /> + <ClInclude Include="..\..\client\human\HumanClientApp.h" /> + <ClInclude Include="..\..\client\human\HumanClientFSM.h" /> + <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="..\..\log4cpp\log4cpp\config-win32.h" /> + <ClInclude Include="..\..\log4cpp\log4cpp\config.h" /> + <ClInclude Include="..\..\log4cpp\log4cpp\convenience.h" /> + <ClInclude Include="..\..\network\ClientNetworking.h" /> + <ClInclude Include="..\..\network\Message.h" /> + <ClInclude Include="..\..\network\MessageQueue.h" /> + <ClInclude Include="..\..\network\Networking.h" /> + <ClInclude Include="..\..\UI\About.h" /> + <ClInclude Include="..\..\UI\BuildDesignatorWnd.h" /> + <ClInclude Include="..\..\UI\ChatWnd.h" /> + <ClInclude Include="..\..\UI\ClientUI.h" /> + <ClInclude Include="..\..\UI\CollisionMeshConverter.h" /> + <ClInclude Include="..\..\UI\CombatCamera.h" /> + <ClInclude Include="..\..\UI\CombatSetupWnd.h" /> + <ClInclude Include="..\..\UI\CombatWnd.h" /> + <ClInclude Include="..\..\UI\CombatWndFwd.h" /> + <ClInclude Include="..\..\UI\CUIControls.h" /> + <ClInclude Include="..\..\UI\CUIDrawUtil.h" /> + <ClInclude Include="..\..\UI\CUISpin.h" /> + <ClInclude Include="..\..\UI\CUIStyle.h" /> + <ClInclude Include="..\..\UI\CUIWnd.h" /> + <ClInclude Include="..\..\UI\DesignWnd.h" /> + <ClInclude Include="..\..\UI\EncyclopediaDetailPanel.h" /> + <ClInclude Include="..\..\UI\EntityRenderer.h" /> + <ClInclude Include="..\..\UI\FleetButton.h" /> + <ClInclude Include="..\..\UI\FleetWnd.h" /> + <ClInclude Include="..\..\UI\GalaxySetupWnd.h" /> + <ClInclude Include="..\..\UI\InfoPanels.h" /> + <ClInclude Include="..\..\UI\InGameMenu.h" /> + <ClInclude Include="..\..\UI\IntroScreen.h" /> + <ClInclude Include="..\..\UI\LinkText.h" /> + <ClInclude Include="..\..\UI\MapWnd.h" /> + <ClInclude Include="..\..\UI\MarkupBox.h" /> + <ClInclude Include="..\..\UI\MultiplayerLobbyWnd.h" /> + <ClInclude Include="..\..\UI\OptionsWnd.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\BatchedGeometry.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\BatchPage.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\GrassLoader.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\ImpostorPage.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\MersenneTwister.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\PagedGeometry.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\PropertyMaps.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\RandomTable.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\StaticBillboardSet.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\TreeLoader2D.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\TreeLoader3D.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\WindBatchedGeometry.h" /> + <ClInclude Include="..\..\UI\PagedGeometry\WindBatchPage.h" /> + <ClInclude Include="..\..\UI\PlanetDetailWnd.h" /> + <ClInclude Include="..\..\UI\ProductionWnd.h" /> + <ClInclude Include="..\..\UI\QueueListBox.h" /> + <ClInclude Include="..\..\UI\ResearchWnd.h" /> + <ClInclude Include="..\..\UI\ServerConnectWnd.h" /> + <ClInclude Include="..\..\UI\ShaderProgram.h" /> + <ClInclude Include="..\..\UI\SidePanel.h" /> + <ClInclude Include="..\..\UI\SitRepPanel.h" /> + <ClInclude Include="..\..\UI\Sound.h" /> + <ClInclude Include="..\..\UI\StringTable.h" /> + <ClInclude Include="..\..\UI\SystemIcon.h" /> + <ClInclude Include="..\..\UI\TechTreeWnd.h" /> + <ClInclude Include="..\..\UI\TurnProgressWnd.h" /> + <ClInclude Include="..\..\universe\Building.h" /> + <ClInclude Include="..\..\universe\Condition.h" /> + <ClInclude Include="..\..\universe\Effect.h" /> + <ClInclude Include="..\..\universe\Enums.h" /> + <ClInclude Include="..\..\universe\Fleet.h" /> + <ClInclude Include="..\..\universe\InhibitableSignal.h" /> + <ClInclude Include="..\..\universe\Meter.h" /> + <ClInclude Include="..\..\universe\Parser.h" /> + <ClInclude Include="..\..\universe\ParserUtil.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\ValueRefParser.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> + <None Include="..\..\log4cpp\log4cpp\AbortAppender.hh" /> + <None Include="..\..\log4cpp\log4cpp\Appender.hh" /> + <None Include="..\..\log4cpp\log4cpp\AppendersFactory.hh" /> + <None Include="..\..\log4cpp\log4cpp\AppenderSkeleton.hh" /> + <None Include="..\..\log4cpp\log4cpp\BasicConfigurator.hh" /> + <None Include="..\..\log4cpp\log4cpp\BasicLayout.hh" /> + <None Include="..\..\log4cpp\log4cpp\BufferingAppender.hh" /> + <None Include="..\..\log4cpp\log4cpp\Category.hh" /> + <None Include="..\..\log4cpp\log4cpp\CategoryStream.hh" /> + <None Include="..\..\log4cpp\log4cpp\Configurator.hh" /> + <None Include="..\..\log4cpp\log4cpp\Export.hh" /> + <None Include="..\..\log4cpp\log4cpp\FactoryParams.hh" /> + <None Include="..\..\log4cpp\log4cpp\FileAppender.hh" /> + <None Include="..\..\log4cpp\log4cpp\Filter.hh" /> + <None Include="..\..\log4cpp\log4cpp\FixedContextCategory.hh" /> + <None Include="..\..\log4cpp\log4cpp\HierarchyMaintainer.hh" /> + <None Include="..\..\log4cpp\log4cpp\IdsaAppender.hh" /> + <None Include="..\..\log4cpp\log4cpp\Layout.hh" /> + <None Include="..\..\log4cpp\log4cpp\LayoutAppender.hh" /> + <None Include="..\..\log4cpp\log4cpp\LayoutsFactory.hh" /> + <None Include="..\..\log4cpp\log4cpp\LevelEvaluator.hh" /> + <None Include="..\..\log4cpp\log4cpp\LoggingEvent.hh" /> + <None Include="..\..\log4cpp\log4cpp\Manipulator.hh" /> + <None Include="..\..\log4cpp\log4cpp\NDC.hh" /> + <None Include="..\..\log4cpp\log4cpp\NTEventLogAppender.hh" /> + <None Include="..\..\log4cpp\log4cpp\OstreamAppender.hh" /> + <None Include="..\..\log4cpp\log4cpp\PassThroughLayout.hh" /> + <None Include="..\..\log4cpp\log4cpp\PatternLayout.hh" /> + <None Include="..\..\log4cpp\log4cpp\Portability.hh" /> + <None Include="..\..\log4cpp\log4cpp\Priority.hh" /> + <None Include="..\..\log4cpp\log4cpp\PropertyConfigurator.hh" /> + <None Include="..\..\log4cpp\log4cpp\RemoteSyslogAppender.hh" /> + <None Include="..\..\log4cpp\log4cpp\RollingFileAppender.hh" /> + <None Include="..\..\log4cpp\log4cpp\SimpleConfigurator.hh" /> + <None Include="..\..\log4cpp\log4cpp\SimpleLayout.hh" /> + <None Include="..\..\log4cpp\log4cpp\StringQueueAppender.hh" /> + <None Include="..\..\log4cpp\log4cpp\SyslogAppender.hh" /> + <None Include="..\..\log4cpp\log4cpp\threading\MSThreads.hh" /> + <None Include="..\..\log4cpp\log4cpp\threading\Threading.hh" /> + <None Include="..\..\log4cpp\log4cpp\TimeStamp.hh" /> + <None Include="..\..\log4cpp\log4cpp\TriggeringEventEvaluator.hh" /> + <None Include="..\..\log4cpp\log4cpp\TriggeringEventEvaluatorFactory.hh" /> + <None Include="..\..\log4cpp\log4cpp\Win32DebugAppender.hh" /> + <None Include="..\..\log4cpp\src\Localtime.hh" /> + <None Include="..\..\log4cpp\src\StringUtil.hh" /> + <None Include="..\..\util\Serialize.ipp" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\client\ClientApp.cpp" /> + <ClCompile Include="..\..\client\ClientFSMEvents.cpp" /> + <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="..\..\log4cpp\src\Appender.cpp" /> + <ClCompile Include="..\..\log4cpp\src\AppenderSkeleton.cpp" /> + <ClCompile Include="..\..\log4cpp\src\BasicLayout.cpp" /> + <ClCompile Include="..\..\log4cpp\src\Category.cpp" /> + <ClCompile Include="..\..\log4cpp\src\CategoryStream.cpp" /> + <ClCompile Include="..\..\log4cpp\src\Configurator.cpp" /> + <ClCompile Include="..\..\log4cpp\src\FactoryParams.cpp" /> + <ClCompile Include="..\..\log4cpp\src\FileAppender.cpp" /> + <ClCompile Include="..\..\log4cpp\src\HierarchyMaintainer.cpp" /> + <ClCompile Include="..\..\log4cpp\src\LayoutAppender.cpp" /> + <ClCompile Include="..\..\log4cpp\src\Localtime.cpp" /> + <ClCompile Include="..\..\log4cpp\src\LoggingEvent.cpp" /> + <ClCompile Include="..\..\log4cpp\src\MSThreads.cpp" /> + <ClCompile Include="..\..\log4cpp\src\NDC.cpp" /> + <ClCompile Include="..\..\log4cpp\src\PatternLayout.cpp" /> + <ClCompile Include="..\..\log4cpp\src\Priority.cpp" /> + <ClCompile Include="..\..\log4cpp\src\StringUtil.cpp" /> + <ClCompile Include="..\..\log4cpp\src\TimeStamp.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" /> + <ClCompile Include="..\..\UI\ClientUI.cpp" /> + <ClCompile Include="..\..\UI\CollisionMeshConverter.cpp" /> + <ClCompile Include="..\..\UI\CombatCamera.cpp" /> + <ClCompile Include="..\..\UI\CombatSetupWnd.cpp" /> + <ClCompile Include="..\..\UI\CombatWnd.cpp" /> + <ClCompile Include="..\..\UI\CUIControls.cpp" /> + <ClCompile Include="..\..\UI\CUIDrawUtil.cpp" /> + <ClCompile Include="..\..\UI\CUIStyle.cpp" /> + <ClCompile Include="..\..\UI\CUIWnd.cpp" /> + <ClCompile Include="..\..\UI\DesignWnd.cpp" /> + <ClCompile Include="..\..\UI\EncyclopediaDetailPanel.cpp" /> + <ClCompile Include="..\..\UI\EntityRenderer.cpp" /> + <ClCompile Include="..\..\UI\FleetButton.cpp" /> + <ClCompile Include="..\..\UI\FleetWnd.cpp" /> + <ClCompile Include="..\..\UI\GalaxySetupWnd.cpp" /> + <ClCompile Include="..\..\UI\InfoPanels.cpp" /> + <ClCompile Include="..\..\UI\InGameMenu.cpp" /> + <ClCompile Include="..\..\UI\IntroScreen.cpp" /> + <ClCompile Include="..\..\UI\LinkText.cpp" /> + <ClCompile Include="..\..\UI\MapWnd.cpp" /> + <ClCompile Include="..\..\UI\MarkupBox.cpp" /> + <ClCompile Include="..\..\UI\MultiplayerLobbyWnd.cpp" /> + <ClCompile Include="..\..\UI\OptionsWnd.cpp" /> + <ClCompile Include="..\..\UI\PagedGeometry\BatchedGeometry.cpp" /> + <ClCompile Include="..\..\UI\PagedGeometry\BatchPage.cpp" /> + <ClCompile Include="..\..\UI\PagedGeometry\GrassLoader.cpp" /> + <ClCompile Include="..\..\UI\PagedGeometry\ImpostorPage.cpp" /> + <ClCompile Include="..\..\UI\PagedGeometry\PagedGeometry.cpp" /> + <ClCompile Include="..\..\UI\PagedGeometry\PropertyMaps.cpp" /> + <ClCompile Include="..\..\UI\PagedGeometry\StaticBillboardSet.cpp" /> + <ClCompile Include="..\..\UI\PagedGeometry\TreeLoader2D.cpp" /> + <ClCompile Include="..\..\UI\PagedGeometry\TreeLoader3D.cpp" /> + <ClCompile Include="..\..\UI\PagedGeometry\WindBatchedGeometry.cpp" /> + <ClCompile Include="..\..\UI\PagedGeometry\WindBatchPage.cpp" /> + <ClCompile Include="..\..\UI\PlanetDetailWnd.cpp" /> + <ClCompile Include="..\..\UI\ProductionWnd.cpp" /> + <ClCompile Include="..\..\UI\QueueListBox.cpp" /> + <ClCompile Include="..\..\UI\ResearchWnd.cpp" /> + <ClCompile Include="..\..\UI\ServerConnectWnd.cpp" /> + <ClCompile Include="..\..\UI\ShaderProgram.cpp" /> + <ClCompile Include="..\..\UI\SidePanel.cpp" /> + <ClCompile Include="..\..\UI\SitRepPanel.cpp" /> + <ClCompile Include="..\..\UI\Sound.cpp" /> + <ClCompile Include="..\..\UI\StringTable.cpp" /> + <ClCompile Include="..\..\UI\SystemIcon.cpp" /> + <ClCompile Include="..\..\UI\TechTreeWnd.cpp" /> + <ClCompile Include="..\..\UI\TurnProgressWnd.cpp" /> + <ClCompile Include="..\..\universe\Building.cpp" /> + <ClCompile Include="..\..\universe\Condition.cpp" /> + <ClCompile Include="..\..\universe\ConditionParser.cpp" /> + <ClCompile Include="..\..\universe\ConditionParser1.cpp" /> + <ClCompile Include="..\..\universe\ConditionParser2.cpp" /> + <ClCompile Include="..\..\universe\Effect.cpp" /> + <ClCompile Include="..\..\universe\EffectParser.cpp" /> + <ClCompile Include="..\..\universe\Enums.cpp" /> + <ClCompile Include="..\..\universe\Fleet.cpp" /> + <ClCompile Include="..\..\universe\Meter.cpp" /> + <ClCompile Include="..\..\universe\ParserUtil.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\TopLevelParsers.cpp" /> + <ClCompile Include="..\..\universe\Universe.cpp" /> + <ClCompile Include="..\..\universe\UniverseObject.cpp" /> + <ClCompile Include="..\..\universe\ValueRef.cpp" /> + <ClCompile Include="..\..\universe\ValueRefParser.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" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters (rev 0) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters 2010-11-29 02:04:46 UTC (rev 3852) @@ -0,0 +1,1037 @@ +<?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="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + <Filter Include="Header Files\client"> + <UniqueIdentifier>{b7e1ac2b-7eb2-497a-80b4-1b3c660e492a}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\client\human"> + <UniqueIdentifier>{d2ae9498-3cb1-4223-b055-39f924d909ba}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\combat"> + <UniqueIdentifier>{e1903fa4-66a8-4377-9d91-eb60de6ced9a}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\combat\OpenSteer"> + <UniqueIdentifier>{330825c5-e4d2-4169-ad50-d5ff8744eedb}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\Empire"> + <UniqueIdentifier>{3cc43ce0-b6b4-416a-80a0-949870380ee1}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\log4cpp"> + <UniqueIdentifier>{405471ce-ed09-401c-aea4-46e155835ee8}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\log4cpp\threading"> + <UniqueIdentifier>{23c674b8-a57c-4998-867c-33d393e93f60}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\client"> + <UniqueIdentifier>{8155c968-e020-4d9e-9b45-1b2b9f769cf5}</UniqueIdentifier> + </Filter> + <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> + <Filter Include="Source Files\network"> + <UniqueIdentifier>{b9e15fb8-5458-4bcb-92dc-09ba4b65cfae}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\UI"> + <UniqueIdentifier>{f9dda62a-26fb-45a2-a8dc-c2fe4f1434c8}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\UI"> + <UniqueIdentifier>{df72940c-e723-470a-b3ef-bd243e47ffbe}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\universe"> + <UniqueIdentifier>{8fb10d4c-209f-4422-a61f-749aae32aa5b}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\universe"> + <UniqueIdentifier>{5b0fb282-f288-46bc-9ba9-9792793c282d}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\util"> + <UniqueIdentifier>{f30d9cf4-175a-4a74-8480-75ef04f66ed4}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\util"> + <UniqueIdentifier>{4fba4d8e-44f9-4cb3-8914-7aff0a18b6da}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\UI\PagedGeometry"> + <UniqueIdentifier>{1965870f-e272-4a84-8ada-9fae2a0b8612}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\UI\PagedGeometry"> + <UniqueIdentifier>{dce0428f-3d99-47ce-ab4d-52d1490873b8}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\log4cpp"> + <UniqueIdentifier>{d0f0c431-9cdb-4e36-951e-ed98cb8d834a}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\client\ClientApp.h"> + <Filter>Header Files\client</Filter> + </ClInclude> + <ClInclude Include="..\..\client\ClientFSMEvents.h"> + <Filter>Header Files\client</Filter> + </ClInclude> + <ClInclude Include="..\..\client\human\HumanClientFSM.h"> + <Filter>Header Files\client\human</Filter> + </ClInclude> + <ClInclude Include="..\..\client\human\chmain.h"> + <Filter>Header Files\client\human</Filter> + </ClInclude> + <ClInclude Include="..\..\client\human\HumanClientApp.h"> + <Filter>Header Files\client\human</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="..\..\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\CombatOrder.h"> + <Filter>Header Files\combat</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="..\..\Empire\Empire.h"> + <Filter>Header Files\Empire</Filter> + </ClInclude> + <ClInclude Include="..\..\log4cpp\log4cpp\config.h"> + <Filter>Header Files\log4cpp</Filter> + </ClInclude> + <ClInclude Include="..\..\log4cpp\log4cpp\config-win32.h"> + <Filter>Header Files\log4cpp</Filter> + </ClInclude> + <ClInclude Include="..\..\log4cpp\log4cpp\convenience.h"> + <Filter>Header Files\log4cpp</Filter> + </ClInclude> + <ClInclude Include="..\..\network\Networking.h"> + <Filter>Header Files\network</Filter> + </ClInclude> + <ClInclude Include="..\..\network\ClientNetworking.h"> + <Filter>Header Files\network</Filter> + </ClInclude> + <ClInclude Include="..\..\network\Message.h"> + <Filter>Header Files\network</Filter> + </ClInclude> + <ClInclude Include="..\..\network\MessageQueue.h"> + <Filter>Header Files\network</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\TurnProgressWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\About.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\BuildDesignatorWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\ChatWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\ClientUI.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\CollisionMeshConverter.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\CombatCamera.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\CombatSetupWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\CombatWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\CombatWndFwd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\CUIControls.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\CUIDrawUtil.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\CUISpin.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\CUIStyle.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\CUIWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\DesignWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\EncyclopediaDetailPanel.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\EntityRenderer.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\FleetButton.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\FleetWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\GalaxySetupWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\InfoPanels.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\InGameMenu.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\IntroScreen.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\LinkText.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\MapWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\MarkupBox.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\MultiplayerLobbyWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\OptionsWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PlanetDetailWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\ProductionWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\QueueListBox.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\ResearchWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\ServerConnectWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\ShaderProgram.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\SidePanel.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\SitRepPanel.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\Sound.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\StringTable.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\SystemIcon.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\TechTreeWnd.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\WindBatchedGeometry.h"> + <Filter>Header Files\UI\PagedGeometry</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\WindBatchPage.h"> + <Filter>Header Files\UI\PagedGeometry</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\BatchedGeometry.h"> + <Filter>Header Files\UI\PagedGeometry</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\BatchPage.h"> + <Filter>Header Files\UI\PagedGeometry</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\GrassLoader.h"> + <Filter>Header Files\UI\PagedGeometry</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\ImpostorPage.h"> + <Filter>Header Files\UI\PagedGeometry</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\MersenneTwister.h"> + <Filter>Header Files\UI\PagedGeometry</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\PagedGeometry.h"> + <Filter>Header Files\UI\PagedGeometry</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\PropertyMaps.h"> + <Filter>Header Files\UI\PagedGeometry</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\RandomTable.h"> + <Filter>Header Files\UI\PagedGeometry</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\StaticBillboardSet.h"> + <Filter>Header Files\UI\PagedGeometry</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\TreeLoader2D.h"> + <Filter>Header Files\UI\PagedGeometry</Filter> + </ClInclude> + <ClInclude Include="..\..\UI\PagedGeometry\TreeLoader3D.h"> + <Filter>Header Files\UI\PagedGeometry</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> + <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="..\..\universe\UniverseObject.h"> + <Filter>Header Files\universe</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\ValueRef.h"> + <Filter>Header Files\universe</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\ValueRefParser.h"> + <Filter>Header Files\universe</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\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\Parser.h"> + <Filter>Header Files\universe</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\ParserUtil.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> + </ItemGroup> + <ItemGroup> + <None Include="..\..\log4cpp\log4cpp\PropertyConfigurator.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\RemoteSyslogAppender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\RollingFileAppender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\SimpleConfigurator.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\SimpleLayout.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\StringQueueAppender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\SyslogAppender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\TimeStamp.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\TriggeringEventEvaluator.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\TriggeringEventEvaluatorFactory.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\Win32DebugAppender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\AbortAppender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\Appender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\AppendersFactory.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\AppenderSkeleton.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\BasicConfigurator.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\BasicLayout.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\BufferingAppender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\Category.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\CategoryStream.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\Configurator.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\Export.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\FactoryParams.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\FileAppender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\Filter.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\FixedContextCategory.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\HierarchyMaintainer.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\IdsaAppender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\Layout.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\LayoutAppender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\LayoutsFactory.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\LevelEvaluator.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\LoggingEvent.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\Manipulator.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\NDC.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\NTEventLogAppender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\OstreamAppender.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\PassThroughLayout.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\PatternLayout.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\Portability.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\Priority.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\threading\Threading.hh"> + <Filter>Header Files\log4cpp\threading</Filter> + </None> + <None Include="..\..\util\Serialize.ipp"> + <Filter>Source Files\util</Filter> + </None> + <None Include="..\..\log4cpp\log4cpp\threading\MSThreads.hh"> + <Filter>Header Files\log4cpp\threading</Filter> + </None> + <None Include="..\..\log4cpp\src\Localtime.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + <None Include="..\..\log4cpp\src\StringUtil.hh"> + <Filter>Header Files\log4cpp</Filter> + </None> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\client\ClientFSMEvents.cpp"> + <Filter>Source Files\client</Filter> + </ClCompile> + <ClCompile Include="..\..\client\ClientApp.cpp"> + <Filter>Source Files\client</Filter> + </ClCompile> + <ClCompile Include="..\..\client\human\HumanClientApp.cpp"> + <Filter>Source Files\client\human</Filter> + </ClCompile> + <ClCompile Include="..\..\client\human\chmain.cpp"> + <Filter>Source Files\client\human</Filter> + </ClCompile> + <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> + <ClCompile Include="..\..\UI\PagedGeometry\TreeLoader3D.cpp"> + <Filter>Source Files\UI\PagedGeometry</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\PagedGeometry\WindBatchedGeometry.cpp"> + <Filter>Source Files\UI\PagedGeometry</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\PagedGeometry\WindBatchPage.cpp"> + <Filter>Source Files\UI\PagedGeometry</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\PagedGeometry\BatchedGeometry.cpp"> + <Filter>Source Files\UI\PagedGeometry</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\PagedGeometry\BatchPage.cpp"> + <Filter>Source Files\UI\PagedGeometry</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\PagedGeometry\GrassLoader.cpp"> + <Filter>Source Files\UI\PagedGeometry</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\PagedGeometry\ImpostorPage.cpp"> + <Filter>Source Files\UI\PagedGeometry</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\PagedGeometry\PagedGeometry.cpp"> + <Filter>Source Files\UI\PagedGeometry</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\PagedGeometry\PropertyMaps.cpp"> + <Filter>Source Files\UI\PagedGeometry</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\PagedGeometry\StaticBillboardSet.cpp"> + <Filter>Source Files\UI\PagedGeometry</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\ShaderProgram.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\SidePanel.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\SitRepPanel.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\Sound.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\StringTable.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\SystemIcon.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\TechTreeWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\TurnProgressWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\About.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\BuildDesignatorWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\ChatWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\ClientUI.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\CollisionMeshConverter.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\CombatCamera.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\CombatSetupWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\CombatWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\CUIControls.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\CUIDrawUtil.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\CUIStyle.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\CUIWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\DesignWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\EncyclopediaDetailPanel.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\EntityRenderer.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\FleetButton.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\FleetWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\GalaxySetupWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\InfoPanels.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\InGameMenu.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\IntroScreen.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\LinkText.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\MapWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\MarkupBox.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\MultiplayerLobbyWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\OptionsWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\PlanetDetailWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\ProductionWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\QueueListBox.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\ResearchWnd.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <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="..\.... [truncated message content] |
From: <geo...@us...> - 2010-12-04 03:21:15
|
Revision: 3862 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3862&view=rev Author: geoffthemedio Date: 2010-12-04 03:21:08 +0000 (Sat, 04 Dec 2010) Log Message: ----------- Finished updating MSVC 2010 project files for AI and server. Both build now, though haven't been tested in action yet... Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2010-12-04 03:18:52 UTC (rev 3861) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2010-12-04 03:21:08 UTC (rev 3862) @@ -60,8 +60,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> + <PrecompiledHeader>NotUsing</PrecompiledHeader> <Optimization>Full</Optimization> <FunctionLevelLinking>false</FunctionLevelLinking> <IntrinsicFunctions>false</IntrinsicFunctions> @@ -79,7 +78,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <OutputFile>../../FreeOrionCA.exe</OutputFile> - <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/;../../</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/</AdditionalLibraryDirectories> <AdditionalDependencies>python26.lib;boost_python-vc100-mt-1_44.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> <RandomizedBaseAddress>false</RandomizedBaseAddress> <LinkErrorReporting>SendErrorReport</LinkErrorReporting> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2010-12-04 03:18:52 UTC (rev 3861) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2010-12-04 03:21:08 UTC (rev 3862) @@ -24,7 +24,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> + <WholeProgramOptimization>false</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> @@ -42,6 +42,7 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> + <OutDir>../../</OutDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> @@ -59,18 +60,28 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <Optimization>Full</Optimization> + <FunctionLevelLinking>false</FunctionLevelLinking> + <IntrinsicFunctions>false</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_SERVER;FREEORION_WIN32;GiGi_EXPORTS;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE</PreprocessorDefinitions> + <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_44/;../../GG/;../../../include/zlib/</AdditionalIncludeDirectories> + <PrecompiledHeaderFile> + </PrecompiledHeaderFile> + <PrecompiledHeaderOutputFile> + </PrecompiledHeaderOutputFile> + <DisableSpecificWarnings>4099;4251;4800;4267;4275;4244;4101;4258;4996;4312;4311;4091</DisableSpecificWarnings> </ClCompile> <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> + <OutputFile>../../FreeOrionD.exe</OutputFile> + <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/</AdditionalLibraryDirectories> + <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <LinkErrorReporting>SendErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -109,6 +120,7 @@ <ClInclude Include="..\..\server\SaveLoad.h" /> <ClInclude Include="..\..\server\ServerApp.h" /> <ClInclude Include="..\..\server\ServerFSM.h" /> + <ClInclude Include="..\..\UI\StringTable.h" /> <ClInclude Include="..\..\universe\Building.h" /> <ClInclude Include="..\..\universe\Condition.h" /> <ClInclude Include="..\..\universe\Effect.h" /> @@ -197,7 +209,99 @@ <None Include="..\..\log4cpp\log4cpp\TriggeringEventEvaluator.hh" /> <None Include="..\..\log4cpp\log4cpp\TriggeringEventEvaluatorFactory.hh" /> <None Include="..\..\log4cpp\log4cpp\Win32DebugAppender.hh" /> + <None Include="..\..\util\Serialize.ipp" /> + <None Include="..\..\util\SerializeUniverseExports.ipp" /> + <None Include="..\..\util\Version.cpp.in" /> </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.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="..\..\log4cpp\src\Appender.cpp" /> + <ClCompile Include="..\..\log4cpp\src\AppenderSkeleton.cpp" /> + <ClCompile Include="..\..\log4cpp\src\BasicLayout.cpp" /> + <ClCompile Include="..\..\log4cpp\src\Category.cpp" /> + <ClCompile Include="..\..\log4cpp\src\CategoryStream.cpp" /> + <ClCompile Include="..\..\log4cpp\src\Configurator.cpp" /> + <ClCompile Include="..\..\log4cpp\src\FactoryParams.cpp" /> + <ClCompile Include="..\..\log4cpp\src\FileAppender.cpp" /> + <ClCompile Include="..\..\log4cpp\src\HierarchyMaintainer.cpp" /> + <ClCompile Include="..\..\log4cpp\src\LayoutAppender.cpp" /> + <ClCompile Include="..\..\log4cpp\src\Localtime.cpp" /> + <ClCompile Include="..\..\log4cpp\src\LoggingEvent.cpp" /> + <ClCompile Include="..\..\log4cpp\src\MSThreads.cpp" /> + <ClCompile Include="..\..\log4cpp\src\NDC.cpp" /> + <ClCompile Include="..\..\log4cpp\src\PatternLayout.cpp" /> + <ClCompile Include="..\..\log4cpp\src\Priority.cpp" /> + <ClCompile Include="..\..\log4cpp\src\StringUtil.cpp" /> + <ClCompile Include="..\..\log4cpp\src\TimeStamp.cpp" /> + <ClCompile Include="..\..\network\Message.cpp" /> + <ClCompile Include="..\..\network\MessageQueue.cpp" /> + <ClCompile Include="..\..\network\Networking.cpp" /> + <ClCompile Include="..\..\network\ServerNetworking.cpp" /> + <ClCompile Include="..\..\server\dmain.cpp" /> + <ClCompile Include="..\..\server\SaveLoad.cpp" /> + <ClCompile Include="..\..\server\ServerApp.cpp" /> + <ClCompile Include="..\..\server\ServerFSM.cpp" /> + <ClCompile Include="..\..\UI\StringTable.cpp" /> + <ClCompile Include="..\..\universe\Building.cpp" /> + <ClCompile Include="..\..\universe\Condition.cpp" /> + <ClCompile Include="..\..\universe\ConditionParser.cpp" /> + <ClCompile Include="..\..\universe\ConditionParser1.cpp" /> + <ClCompile Include="..\..\universe\ConditionParser2.cpp" /> + <ClCompile Include="..\..\universe\Effect.cpp" /> + <ClCompile Include="..\..\universe\EffectParser.cpp" /> + <ClCompile Include="..\..\universe\Enums.cpp" /> + <ClCompile Include="..\..\universe\Fleet.cpp" /> + <ClCompile Include="..\..\universe\Meter.cpp" /> + <ClCompile Include="..\..\universe\ParserUtil.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\TopLevelParsers.cpp" /> + <ClCompile Include="..\..\universe\Universe.cpp" /> + <ClCompile Include="..\..\universe\UniverseObject.cpp" /> + <ClCompile Include="..\..\universe\ValueRef.cpp" /> + <ClCompile Include="..\..\universe\ValueRefParser.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> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters 2010-12-04 03:18:52 UTC (rev 3861) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters 2010-12-04 03:21:08 UTC (rev 3862) @@ -36,6 +36,36 @@ <Filter Include="Header Files\util"> <UniqueIdentifier>{d2f5dbff-1284-42b2-967e-0b1e7e4070ca}</UniqueIdentifier> </Filter> + <Filter Include="Source Files\combat"> + <UniqueIdentifier>{1643048c-a8f5-4911-b02f-834f5ea39cd7}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\combat\OpenSteer"> + <UniqueIdentifier>{9272621f-5537-4732-a4d2-233f78d41542}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\Empire"> + <UniqueIdentifier>{b1b9d665-2b6f-44ab-a502-b60011e5f3b6}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\log4cpp"> + <UniqueIdentifier>{79dab50d-0ed5-4c9e-a797-389aab307720}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\network"> + <UniqueIdentifier>{88999d0a-94bc-43cc-a21c-ce4ef5fd65a4}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\server"> + <UniqueIdentifier>{b7b96e1d-6ba0-4b2d-bb2b-9dd040fd6854}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\universe"> + <UniqueIdentifier>{37e326f0-82d0-41ef-8f37-43edad3c17ad}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\util"> + <UniqueIdentifier>{6b488d5c-6c53-4efb-8316-03dabb85124d}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\UI"> + <UniqueIdentifier>{8634d98f-99bf-4187-9858-b4e6e7113307}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\UI"> + <UniqueIdentifier>{f6fc2133-2664-41ed-9036-7f2676f38740}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\combat\CombatOrder.h"> @@ -272,6 +302,9 @@ <ClInclude Include="..\..\util\XMLObjectFactory.h"> <Filter>Header Files\util</Filter> </ClInclude> + <ClInclude Include="..\..\UI\StringTable.h"> + <Filter>Header Files\UI</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\log4cpp\log4cpp\TriggeringEventEvaluator.hh"> @@ -403,5 +436,277 @@ <None Include="..\..\log4cpp\log4cpp\threading\MSThreads.hh"> <Filter>Header Files\log4cpp\threading</Filter> </None> + <None Include="..\..\util\Version.cpp.in"> + <Filter>Source Files\util</Filter> + </None> + <None Include="..\..\util\Serialize.ipp"> + <Filter>Source Files\util</Filter> + </None> + <None Include="..\..\util\SerializeUniverseExports.ipp"> + <Filter>Source Files\util</Filter> + </None> </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\combat\CombatSystem.cpp"> + <Filter>Source Files\combat</Filter> + </ClCompile> + <ClCompile Include="..\..\combat\CombatOrder.cpp"> + <Filter>Source Files\combat</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="..\..\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="..\..\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="..\..\log4cpp\src\StringUtil.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\TimeStamp.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\Appender.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\AppenderSkeleton.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\BasicLayout.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\Category.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\CategoryStream.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\Configurator.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\FactoryParams.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\FileAppender.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\HierarchyMaintainer.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\LayoutAppender.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\Localtime.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\LoggingEvent.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\MSThreads.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\NDC.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\PatternLayout.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\log4cpp\src\Priority.cpp"> + <Filter>Source Files\log4cpp</Filter> + </ClCompile> + <ClCompile Include="..\..\network\Networking.cpp"> + <Filter>Source Files\network</Filter> + </ClCompile> + <ClCompile Include="..\..\network\ServerNetworking.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="..\..\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="..\..\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="..\..\universe\ValueRef.cpp"> + <Filter>Source Files\universe</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\ValueRefParser.cpp"> + <Filter>Source Files\universe</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Building.cpp"> + <Filter>Source Files\universe</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Condition.cpp"> + <Filter>Source Files\universe</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\ConditionParser.cpp"> + <Filter>Source Files\universe</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\ConditionParser1.cpp"> + <Filter>Source Files\universe</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\ConditionParser2.cpp"> + <Filter>Source Files\universe</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Effect.cpp"> + <Filter>Source Files\universe</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\EffectParser.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\ParserUtil.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\TopLevelParsers.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> + <ClCompile Include="..\..\server\ServerFSM.cpp"> + <Filter>Source Files\server</Filter> + </ClCompile> + <ClCompile Include="..\..\server\SaveLoad.cpp"> + <Filter>Source Files\server</Filter> + </ClCompile> + <ClCompile Include="..\..\server\ServerApp.cpp"> + <Filter>Source Files\server</Filter> + </ClCompile> + <ClCompile Include="..\..\UI\StringTable.cpp"> + <Filter>Source Files\UI</Filter> + </ClCompile> + <ClCompile Include="..\..\server\dmain.cpp"> + <Filter>Header Files\server</Filter> + </ClCompile> + </ItemGroup> </Project> \ No newline at end of file |
From: <geo...@us...> - 2010-12-04 08:14:43
|
Revision: 3863 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3863&view=rev Author: geoffthemedio Date: 2010-12-04 08:14:36 +0000 (Sat, 04 Dec 2010) Log Message: ----------- -Removed unnecessary python file from GiGi MSVC 2010 project file. -Updated MSVC2010 Version.cpp Modified Paths: -------------- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj.filters trunk/FreeOrion/msvc2010/src/Version.cpp Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2010-12-04 03:21:08 UTC (rev 3862) +++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2010-12-04 08:14:36 UTC (rev 3863) @@ -83,9 +83,6 @@ <ClInclude Include="..\..\GG\src\DefaultFont.h" /> </ItemGroup> <ItemGroup> - <None Include="..\..\GG\GG\gen_signals.py" /> - </ItemGroup> - <ItemGroup> <ClCompile Include="..\..\GG\src\AlignmentFlags.cpp" /> <ClCompile Include="..\..\GG\src\Base.cpp" /> <ClCompile Include="..\..\GG\src\BrowseInfoWnd.cpp" /> Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj.filters 2010-12-04 03:21:08 UTC (rev 3862) +++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj.filters 2010-12-04 08:14:36 UTC (rev 3863) @@ -232,11 +232,6 @@ </ClInclude> </ItemGroup> <ItemGroup> - <None Include="..\..\GG\GG\gen_signals.py"> - <Filter>Header Files</Filter> - </None> - </ItemGroup> - <ItemGroup> <ClCompile Include="..\..\GG\src\dialogs\FileDlg.cpp"> <Filter>Source Files\dialogs</Filter> </ClCompile> Modified: trunk/FreeOrion/msvc2010/src/Version.cpp =================================================================== --- trunk/FreeOrion/msvc2010/src/Version.cpp 2010-12-04 03:21:08 UTC (rev 3862) +++ trunk/FreeOrion/msvc2010/src/Version.cpp 2010-12-04 08:14:36 UTC (rev 3863) @@ -1,7 +1,7 @@ #include "../../util/Version.h" namespace { - static const std::string retval = "post-v0.3.15 [SVN 3801]"; + static const std::string retval = "post-v0.3.15 [SVN 3863]"; } const std::string& FreeOrionVersionString() |
From: <geo...@us...> - 2011-01-02 17:56:32
|
Revision: 3947 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3947&view=rev Author: geoffthemedio Date: 2011-01-02 17:56:26 +0000 (Sun, 02 Jan 2011) Log Message: ----------- Added GroupBox.[c,h] to GiGi MSVC 2010 project. Modified Paths: -------------- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj.filters trunk/FreeOrion/msvc2010/src/Version.cpp Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2010-12-30 23:29:34 UTC (rev 3946) +++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2011-01-02 17:56:26 UTC (rev 3947) @@ -41,6 +41,7 @@ <ClInclude Include="..\..\GG\GG\Font.h" /> <ClInclude Include="..\..\GG\GG\FontFwd.h" /> <ClInclude Include="..\..\GG\GG\glext.h" /> + <ClInclude Include="..\..\GG\GG\GroupBox.h" /> <ClInclude Include="..\..\GG\GG\GUI.h" /> <ClInclude Include="..\..\GG\GG\Layout.h" /> <ClInclude Include="..\..\GG\GG\Lexer.h" /> @@ -99,6 +100,7 @@ <ClCompile Include="..\..\GG\src\Edit.cpp" /> <ClCompile Include="..\..\GG\src\EventPump.cpp" /> <ClCompile Include="..\..\GG\src\Font.cpp" /> + <ClCompile Include="..\..\GG\src\GroupBox.cpp" /> <ClCompile Include="..\..\GG\src\GUI.cpp" /> <ClCompile Include="..\..\GG\src\Layout.cpp" /> <ClCompile Include="..\..\GG\src\ListBox.cpp" /> Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj.filters 2010-12-30 23:29:34 UTC (rev 3946) +++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj.filters 2011-01-02 17:56:26 UTC (rev 3947) @@ -230,6 +230,9 @@ <ClInclude Include="..\..\GG\src\DefaultFont.h"> <Filter>Source Files</Filter> </ClInclude> + <ClInclude Include="..\..\GG\GG\GroupBox.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\GG\src\dialogs\FileDlg.cpp"> @@ -337,5 +340,8 @@ <ClCompile Include="..\..\GG\src\PtRect.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\GG\src\GroupBox.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> </Project> \ No newline at end of file Modified: trunk/FreeOrion/msvc2010/src/Version.cpp =================================================================== --- trunk/FreeOrion/msvc2010/src/Version.cpp 2010-12-30 23:29:34 UTC (rev 3946) +++ trunk/FreeOrion/msvc2010/src/Version.cpp 2011-01-02 17:56:26 UTC (rev 3947) @@ -1,7 +1,7 @@ #include "../../util/Version.h" namespace { - static const std::string retval = "post-v0.3.15 [SVN 3937]"; + static const std::string retval = "post-v0.3.15 [SVN 3947]"; } const std::string& FreeOrionVersionString() |
From: <geo...@us...> - 2011-06-24 03:56:52
|
Revision: 4005 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4005&view=rev Author: geoffthemedio Date: 2011-06-24 03:56:46 +0000 (Fri, 24 Jun 2011) Log Message: ----------- Updated MSVC 2010 project files to use Boost 1.46.1 and FreeType 2.4.4, and Python 2.7. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj trunk/FreeOrion/msvc2010/src/Version.cpp Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2011-06-20 20:07:56 UTC (rev 4004) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2011-06-24 03:56:46 UTC (rev 4005) @@ -65,7 +65,7 @@ <FunctionLevelLinking>false</FunctionLevelLinking> <IntrinsicFunctions>false</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_HUMAN;FREEORION_WIN32;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_44/;../../GG/;../include/;../../../include/OGRE/;../../../include/bullet/;../../../include/zlib/;../../../include/AL/</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_46_1/;../../GG/;../include/;../../../include/OGRE/;../../../include/bullet/;../../../include/zlib/;../../../include/AL/</AdditionalIncludeDirectories> <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeaderFile> </PrecompiledHeaderFile> Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2011-06-20 20:07:56 UTC (rev 4004) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2011-06-24 03:56:46 UTC (rev 4005) @@ -65,7 +65,7 @@ <FunctionLevelLinking>false</FunctionLevelLinking> <IntrinsicFunctions>false</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_AI;FREEORION_WIN32;GiGi_EXPORTS;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_44/;../../GG/;../../../include/Python26/;../../../include/zlib/</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_46_1/;../../GG/;../../../include/Python27/;../../../include/zlib/</AdditionalIncludeDirectories> <PrecompiledHeaderFile> </PrecompiledHeaderFile> <PrecompiledHeaderOutputFile> @@ -79,7 +79,7 @@ <OptimizeReferences>true</OptimizeReferences> <OutputFile>../../FreeOrionCA.exe</OutputFile> <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/</AdditionalLibraryDirectories> - <AdditionalDependencies>python26.lib;boost_python-vc100-mt-1_44.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>python27.lib;boost_python-vc100-mt-1_46_1.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> <RandomizedBaseAddress>false</RandomizedBaseAddress> <LinkErrorReporting>SendErrorReport</LinkErrorReporting> </Link> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2011-06-20 20:07:56 UTC (rev 4004) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2011-06-24 03:56:46 UTC (rev 4005) @@ -65,7 +65,7 @@ <FunctionLevelLinking>false</FunctionLevelLinking> <IntrinsicFunctions>false</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_SERVER;FREEORION_WIN32;GiGi_EXPORTS;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_44/;../../GG/;../../../include/zlib/</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_46_1/;../../GG/;../../../include/zlib/</AdditionalIncludeDirectories> <PrecompiledHeaderFile> </PrecompiledHeaderFile> <PrecompiledHeaderOutputFile> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters 2011-06-20 20:07:56 UTC (rev 4004) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters 2011-06-24 03:56:46 UTC (rev 4005) @@ -706,7 +706,7 @@ <Filter>Source Files\UI</Filter> </ClCompile> <ClCompile Include="..\..\server\dmain.cpp"> - <Filter>Header Files\server</Filter> + <Filter>Source Files\server</Filter> </ClCompile> </ItemGroup> </Project> \ No newline at end of file Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2011-06-20 20:07:56 UTC (rev 4004) +++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2011-06-24 03:56:46 UTC (rev 4005) @@ -196,7 +196,7 @@ <FunctionLevelLinking>false</FunctionLevelLinking> <IntrinsicFunctions>false</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_DLL;GiGi_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <AdditionalIncludeDirectories>../../../include;../../../include/libpng/;../../../include/zlib/;../../GG/;../../../Boost/include/boost_1_44/;../include/</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../include;../../../include/libpng/;../../../include/zlib/;../../GG/;../../../Boost/include/boost_1_46_1/;../include/</AdditionalIncludeDirectories> <CompileAsManaged>false</CompileAsManaged> <MultiProcessorCompilation>true</MultiProcessorCompilation> <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> @@ -219,7 +219,7 @@ </LinkStatus> <TreatLinkerWarningAsErrors> </TreatLinkerWarningAsErrors> - <AdditionalDependencies>opengl32.lib;glu32.lib;freetype243MT.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>opengl32.lib;glu32.lib;freetype244MT.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies> <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries> </Link> </ItemDefinitionGroup> Modified: trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj 2011-06-20 20:07:56 UTC (rev 4004) +++ trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj 2011-06-24 03:56:46 UTC (rev 4005) @@ -55,7 +55,7 @@ <Optimization>Full</Optimization> <FunctionLevelLinking>false</FunctionLevelLinking> <IntrinsicFunctions>false</IntrinsicFunctions> - <AdditionalIncludeDirectories>../../../include/;../../GG/;../../../include/OGRE/;../../../Boost/include/boost_1_44/</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../include/;../../GG/;../../../include/OGRE/;../../../Boost/include/boost_1_46_1/</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_DLL;GiGiOgre_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;BOOST_ALL_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeaderFile> </PrecompiledHeaderFile> Modified: trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj 2011-06-20 20:07:56 UTC (rev 4004) +++ trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj 2011-06-24 03:56:46 UTC (rev 4005) @@ -54,7 +54,7 @@ <Optimization>Full</Optimization> <FunctionLevelLinking>false</FunctionLevelLinking> <IntrinsicFunctions>false</IntrinsicFunctions> - <AdditionalIncludeDirectories>../../../include/;../../../Boost/include/boost_1_44;../../GG/;../include;../../../include/OGRE;../../../include/OIS</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../../../include/;../../../Boost/include/boost_1_46_1;../../GG/;../include;../../../include/OGRE;../../../include/OIS</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_DLL;GiGiOgrePlugin_OIS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;BOOST_ALL_DYN_LINK</PreprocessorDefinitions> <PrecompiledHeaderFile> </PrecompiledHeaderFile> Modified: trunk/FreeOrion/msvc2010/src/Version.cpp =================================================================== --- trunk/FreeOrion/msvc2010/src/Version.cpp 2011-06-20 20:07:56 UTC (rev 4004) +++ trunk/FreeOrion/msvc2010/src/Version.cpp 2011-06-24 03:56:46 UTC (rev 4005) @@ -1,7 +1,7 @@ #include "../../util/Version.h" namespace { - static const std::string retval = "post-v0.3.15 [SVN 3995] MSVC 2010"; + static const std::string retval = "post-v0.3.15 [SVN 4005] MSVC 2010"; } const std::string& FreeOrionVersionString() |
From: <geo...@us...> - 2011-11-06 21:54:51
|
Revision: 4475 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4475&view=rev Author: geoffthemedio Date: 2011-11-06 21:54:44 +0000 (Sun, 06 Nov 2011) Log Message: ----------- Updated MSVC 2010 project files. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters 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 trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj.filters Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2011-11-06 16:13:00 UTC (rev 4474) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2011-11-06 21:54:44 UTC (rev 4475) @@ -124,6 +124,19 @@ <ClInclude Include="..\..\network\Message.h" /> <ClInclude Include="..\..\network\MessageQueue.h" /> <ClInclude Include="..\..\network\Networking.h" /> + <ClInclude Include="..\..\parse\ConditionParser.h" /> + <ClInclude Include="..\..\parse\ConditionParserImpl.h" /> + <ClInclude Include="..\..\parse\Double.h" /> + <ClInclude Include="..\..\parse\EffectParser.h" /> + <ClInclude Include="..\..\parse\EnumParser.h" /> + <ClInclude Include="..\..\parse\Int.h" /> + <ClInclude Include="..\..\parse\Label.h" /> + <ClInclude Include="..\..\parse\Lexer.h" /> + <ClInclude Include="..\..\parse\Parse.h" /> + <ClInclude Include="..\..\parse\ParseImpl.h" /> + <ClInclude Include="..\..\parse\ReportParseError.h" /> + <ClInclude Include="..\..\parse\ValueRefParser.h" /> + <ClInclude Include="..\..\parse\ValueRefParserImpl.h" /> <ClInclude Include="..\..\UI\About.h" /> <ClInclude Include="..\..\UI\BuildDesignatorWnd.h" /> <ClInclude Include="..\..\UI\ChatWnd.h" /> @@ -190,9 +203,8 @@ <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\Parser.h" /> - <ClInclude Include="..\..\universe\ParserUtil.h" /> <ClInclude Include="..\..\universe\Planet.h" /> <ClInclude Include="..\..\universe\PopCenter.h" /> <ClInclude Include="..\..\universe\Predicates.h" /> @@ -207,7 +219,6 @@ <ClInclude Include="..\..\universe\UniverseObject.h" /> <ClInclude Include="..\..\universe\ValueRef.h" /> <ClInclude Include="..\..\universe\ValueRefFwd.h" /> - <ClInclude Include="..\..\universe\ValueRefParser.h" /> <ClInclude Include="..\..\util\AppInterface.h" /> <ClInclude Include="..\..\util\binreloc.h" /> <ClInclude Include="..\..\util\DataTable.h" /> @@ -320,6 +331,37 @@ <ClCompile Include="..\..\network\Message.cpp" /> <ClCompile Include="..\..\network\MessageQueue.cpp" /> <ClCompile Include="..\..\network\Networking.cpp" /> + <ClCompile Include="..\..\parse\AlignmentsParser.cpp" /> + <ClCompile Include="..\..\parse\BuildingsParser.cpp" /> + <ClCompile Include="..\..\parse\ConditionParser.cpp" /> + <ClCompile Include="..\..\parse\ConditionParser1.cpp" /> + <ClCompile Include="..\..\parse\ConditionParser2.cpp" /> + <ClCompile Include="..\..\parse\ConditionParser3.cpp" /> + <ClCompile Include="..\..\parse\Double.cpp" /> + <ClCompile Include="..\..\parse\DoubleValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\EffectParser.cpp" /> + <ClCompile Include="..\..\parse\EnumParser.cpp" /> + <ClCompile Include="..\..\parse\FleetPlansParser.cpp" /> + <ClCompile Include="..\..\parse\Int.cpp" /> + <ClCompile Include="..\..\parse\IntValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\ItemsParser.cpp" /> + <ClCompile Include="..\..\parse\Label.cpp" /> + <ClCompile Include="..\..\parse\Lexer.cpp" /> + <ClCompile Include="..\..\parse\MonsterFleetPlansParser.cpp" /> + <ClCompile Include="..\..\parse\Parse.cpp" /> + <ClCompile Include="..\..\parse\PlanetEnvironmentValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\PlanetSizeValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\PlanetTypeValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\ReportParseError.cpp" /> + <ClCompile Include="..\..\parse\ShipDesignsParser.cpp" /> + <ClCompile Include="..\..\parse\ShipHullsParser.cpp" /> + <ClCompile Include="..\..\parse\ShipPartsParser.cpp" /> + <ClCompile Include="..\..\parse\SpecialsParser.cpp" /> + <ClCompile Include="..\..\parse\SpeciesParser.cpp" /> + <ClCompile Include="..\..\parse\StarTypeValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\StringValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\TechsParser.cpp" /> + <ClCompile Include="..\..\parse\UniverseObjectTypeValueRefParser.cpp" /> <ClCompile Include="..\..\UI\About.cpp" /> <ClCompile Include="..\..\UI\BuildDesignatorWnd.cpp" /> <ClCompile Include="..\..\UI\ChatWnd.cpp" /> @@ -375,18 +417,13 @@ <ClCompile Include="..\..\UI\TurnProgressWnd.cpp" /> <ClCompile Include="..\..\universe\Building.cpp" /> <ClCompile Include="..\..\universe\Condition.cpp" /> - <ClCompile Include="..\..\universe\ConditionParser.cpp" /> - <ClCompile Include="..\..\universe\ConditionParser1.cpp" /> - <ClCompile Include="..\..\universe\ConditionParser2.cpp" /> - <ClCompile Include="..\..\universe\ConditionParser3.cpp" /> <ClCompile Include="..\..\universe\Effect.cpp" /> <ClCompile Include="..\..\universe\EffectAccounting.cpp" /> - <ClCompile Include="..\..\universe\EffectParser.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\ParserUtil.cpp" /> <ClCompile Include="..\..\universe\Planet.cpp" /> <ClCompile Include="..\..\universe\PopCenter.cpp" /> <ClCompile Include="..\..\universe\Predicates.cpp" /> @@ -397,11 +434,9 @@ <ClCompile Include="..\..\universe\Species.cpp" /> <ClCompile Include="..\..\universe\System.cpp" /> <ClCompile Include="..\..\universe\Tech.cpp" /> - <ClCompile Include="..\..\universe\TopLevelParsers.cpp" /> <ClCompile Include="..\..\universe\Universe.cpp" /> <ClCompile Include="..\..\universe\UniverseObject.cpp" /> <ClCompile Include="..\..\universe\ValueRef.cpp" /> - <ClCompile Include="..\..\universe\ValueRefParser.cpp" /> <ClCompile Include="..\..\util\AppInterface.cpp" /> <ClCompile Include="..\..\util\DataTable.cpp" /> <ClCompile Include="..\..\util\Directories.cpp" /> Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters 2011-11-06 16:13:00 UTC (rev 4474) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters 2011-11-06 21:54:44 UTC (rev 4475) @@ -82,6 +82,12 @@ <Filter Include="Source Files\log4cpp"> <UniqueIdentifier>{d0f0c431-9cdb-4e36-951e-ed98cb8d834a}</UniqueIdentifier> </Filter> + <Filter Include="Header Files\parse"> + <UniqueIdentifier>{1a6f2045-87f3-4199-b143-12478561a7dc}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\parse"> + <UniqueIdentifier>{126beea6-84e0-4185-9b6c-af85737e0e0d}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\client\ClientApp.h"> @@ -417,9 +423,6 @@ <ClInclude Include="..\..\universe\ValueRef.h"> <Filter>Header Files\universe</Filter> </ClInclude> - <ClInclude Include="..\..\universe\ValueRefParser.h"> - <Filter>Header Files\universe</Filter> - </ClInclude> <ClInclude Include="..\..\universe\Building.h"> <Filter>Header Files\universe</Filter> </ClInclude> @@ -444,12 +447,6 @@ <ClInclude Include="..\..\universe\Meter.h"> <Filter>Header Files\universe</Filter> </ClInclude> - <ClInclude Include="..\..\universe\Parser.h"> - <Filter>Header Files\universe</Filter> - </ClInclude> - <ClInclude Include="..\..\universe\ParserUtil.h"> - <Filter>Header Files\universe</Filter> - </ClInclude> <ClInclude Include="..\..\universe\Planet.h"> <Filter>Header Files\universe</Filter> </ClInclude> @@ -501,6 +498,48 @@ <ClInclude Include="..\..\universe\ObjectMap.h"> <Filter>Header Files\universe</Filter> </ClInclude> + <ClInclude Include="..\..\universe\Names.h"> + <Filter>Header Files\universe</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ConditionParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ConditionParserImpl.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Double.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\EffectParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\EnumParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Int.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Label.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Lexer.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Parse.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ParseImpl.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ReportParseError.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ValueRefParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ValueRefParserImpl.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\log4cpp\log4cpp\PropertyConfigurator.hh"> @@ -928,9 +967,6 @@ <ClCompile Include="..\..\universe\Building.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\ValueRefParser.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\ValueRef.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> @@ -940,9 +976,6 @@ <ClCompile Include="..\..\universe\Universe.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\TopLevelParsers.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\Tech.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> @@ -973,9 +1006,6 @@ <ClCompile Include="..\..\universe\Planet.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\ParserUtil.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\Meter.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> @@ -985,21 +1015,9 @@ <ClCompile Include="..\..\universe\Enums.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\EffectParser.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\Effect.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\ConditionParser2.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> - <ClCompile Include="..\..\universe\ConditionParser1.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> - <ClCompile Include="..\..\universe\ConditionParser.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\log4cpp\src\Configurator.cpp"> <Filter>Source Files\log4cpp</Filter> </ClCompile> @@ -1066,15 +1084,108 @@ <ClCompile Include="..\..\UI\GLClientAndServerBuffer.cpp"> <Filter>Source Files\UI</Filter> </ClCompile> - <ClCompile Include="..\..\universe\ConditionParser3.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\ObjectMap.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> <ClCompile Include="..\..\universe\EffectAccounting.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> + <ClCompile Include="..\..\universe\Names.cpp"> + <Filter>Source Files\universe</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\AlignmentsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\BuildingsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ConditionParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ConditionParser1.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ConditionParser2.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ConditionParser3.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Double.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\DoubleValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\EffectParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\EnumParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\FleetPlansParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Int.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\IntValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ItemsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Label.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Lexer.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\MonsterFleetPlansParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Parse.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\PlanetEnvironmentValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\PlanetSizeValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\PlanetTypeValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ReportParseError.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ShipDesignsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ShipHullsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ShipPartsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\SpecialsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\SpeciesParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\StarTypeValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\StringValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\TechsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\UniverseObjectTypeValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ResourceCompile Include="FreeOrion.rc"> Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2011-11-06 16:13:00 UTC (rev 4474) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2011-11-06 21:54:44 UTC (rev 4475) @@ -123,6 +123,19 @@ <ClInclude Include="..\..\network\Message.h" /> <ClInclude Include="..\..\network\MessageQueue.h" /> <ClInclude Include="..\..\network\Networking.h" /> + <ClInclude Include="..\..\parse\ConditionParser.h" /> + <ClInclude Include="..\..\parse\ConditionParserImpl.h" /> + <ClInclude Include="..\..\parse\Double.h" /> + <ClInclude Include="..\..\parse\EffectParser.h" /> + <ClInclude Include="..\..\parse\EnumParser.h" /> + <ClInclude Include="..\..\parse\Int.h" /> + <ClInclude Include="..\..\parse\Label.h" /> + <ClInclude Include="..\..\parse\Lexer.h" /> + <ClInclude Include="..\..\parse\Parse.h" /> + <ClInclude Include="..\..\parse\ParseImpl.h" /> + <ClInclude Include="..\..\parse\ReportParseError.h" /> + <ClInclude Include="..\..\parse\ValueRefParser.h" /> + <ClInclude Include="..\..\parse\ValueRefParserImpl.h" /> <ClInclude Include="..\..\python\PythonSetWrapper.h" /> <ClInclude Include="..\..\python\PythonWrappers.h" /> <ClInclude Include="..\..\UI\StringTable.h" /> @@ -134,9 +147,8 @@ <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\Parser.h" /> - <ClInclude Include="..\..\universe\ParserUtil.h" /> <ClInclude Include="..\..\universe\Planet.h" /> <ClInclude Include="..\..\universe\PopCenter.h" /> <ClInclude Include="..\..\universe\Predicates.h" /> @@ -151,7 +163,6 @@ <ClInclude Include="..\..\universe\UniverseObject.h" /> <ClInclude Include="..\..\universe\ValueRef.h" /> <ClInclude Include="..\..\universe\ValueRefFwd.h" /> - <ClInclude Include="..\..\universe\ValueRefParser.h" /> <ClInclude Include="..\..\util\AppInterface.h" /> <ClInclude Include="..\..\util\binreloc.h" /> <ClInclude Include="..\..\util\DataTable.h" /> @@ -217,6 +228,37 @@ <ClCompile Include="..\..\network\Message.cpp" /> <ClCompile Include="..\..\network\MessageQueue.cpp" /> <ClCompile Include="..\..\network\Networking.cpp" /> + <ClCompile Include="..\..\parse\AlignmentsParser.cpp" /> + <ClCompile Include="..\..\parse\BuildingsParser.cpp" /> + <ClCompile Include="..\..\parse\ConditionParser.cpp" /> + <ClCompile Include="..\..\parse\ConditionParser1.cpp" /> + <ClCompile Include="..\..\parse\ConditionParser2.cpp" /> + <ClCompile Include="..\..\parse\ConditionParser3.cpp" /> + <ClCompile Include="..\..\parse\Double.cpp" /> + <ClCompile Include="..\..\parse\DoubleValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\EffectParser.cpp" /> + <ClCompile Include="..\..\parse\EnumParser.cpp" /> + <ClCompile Include="..\..\parse\FleetPlansParser.cpp" /> + <ClCompile Include="..\..\parse\Int.cpp" /> + <ClCompile Include="..\..\parse\IntValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\ItemsParser.cpp" /> + <ClCompile Include="..\..\parse\Label.cpp" /> + <ClCompile Include="..\..\parse\Lexer.cpp" /> + <ClCompile Include="..\..\parse\MonsterFleetPlansParser.cpp" /> + <ClCompile Include="..\..\parse\Parse.cpp" /> + <ClCompile Include="..\..\parse\PlanetEnvironmentValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\PlanetSizeValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\PlanetTypeValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\ReportParseError.cpp" /> + <ClCompile Include="..\..\parse\ShipDesignsParser.cpp" /> + <ClCompile Include="..\..\parse\ShipHullsParser.cpp" /> + <ClCompile Include="..\..\parse\ShipPartsParser.cpp" /> + <ClCompile Include="..\..\parse\SpecialsParser.cpp" /> + <ClCompile Include="..\..\parse\SpeciesParser.cpp" /> + <ClCompile Include="..\..\parse\StarTypeValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\StringValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\TechsParser.cpp" /> + <ClCompile Include="..\..\parse\UniverseObjectTypeValueRefParser.cpp" /> <ClCompile Include="..\..\python\PythonEmpireWrapper.cpp" /> <ClCompile Include="..\..\python\PythonEnumWrapper.cpp" /> <ClCompile Include="..\..\python\PythonLoggingWrapper.cpp" /> @@ -224,18 +266,13 @@ <ClCompile Include="..\..\UI\StringTable.cpp" /> <ClCompile Include="..\..\universe\Building.cpp" /> <ClCompile Include="..\..\universe\Condition.cpp" /> - <ClCompile Include="..\..\universe\ConditionParser.cpp" /> - <ClCompile Include="..\..\universe\ConditionParser1.cpp" /> - <ClCompile Include="..\..\universe\ConditionParser2.cpp" /> - <ClCompile Include="..\..\universe\ConditionParser3.cpp" /> <ClCompile Include="..\..\universe\Effect.cpp" /> <ClCompile Include="..\..\universe\EffectAccounting.cpp" /> - <ClCompile Include="..\..\universe\EffectParser.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\ParserUtil.cpp" /> <ClCompile Include="..\..\universe\Planet.cpp" /> <ClCompile Include="..\..\universe\PopCenter.cpp" /> <ClCompile Include="..\..\universe\Predicates.cpp" /> @@ -246,11 +283,9 @@ <ClCompile Include="..\..\universe\Species.cpp" /> <ClCompile Include="..\..\universe\System.cpp" /> <ClCompile Include="..\..\universe\Tech.cpp" /> - <ClCompile Include="..\..\universe\TopLevelParsers.cpp" /> <ClCompile Include="..\..\universe\Universe.cpp" /> <ClCompile Include="..\..\universe\UniverseObject.cpp" /> <ClCompile Include="..\..\universe\ValueRef.cpp" /> - <ClCompile Include="..\..\universe\ValueRefParser.cpp" /> <ClCompile Include="..\..\util\AppInterface.cpp" /> <ClCompile Include="..\..\util\DataTable.cpp" /> <ClCompile Include="..\..\util\Directories.cpp" /> Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj.filters 2011-11-06 16:13:00 UTC (rev 4474) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj.filters 2011-11-06 21:54:44 UTC (rev 4475) @@ -87,6 +87,12 @@ <Filter Include="Header Files\GG"> <UniqueIdentifier>{7e48aed2-0a7f-45a6-8c82-c1d7a143dfa7}</UniqueIdentifier> </Filter> + <Filter Include="Header Files\parse"> + <UniqueIdentifier>{24f9bbd5-8ffb-4493-9a36-f41a55d2651d}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\parse"> + <UniqueIdentifier>{b5184729-d73c-4d70-b041-723a491b6a02}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\AI\AIInterface.h"> @@ -275,9 +281,6 @@ <ClInclude Include="..\..\universe\Building.h"> <Filter>Header Files\universe</Filter> </ClInclude> - <ClInclude Include="..\..\universe\ValueRefParser.h"> - <Filter>Header Files\universe</Filter> - </ClInclude> <ClInclude Include="..\..\universe\ValueRef.h"> <Filter>Header Files\universe</Filter> </ClInclude> @@ -317,12 +320,6 @@ <ClInclude Include="..\..\universe\Planet.h"> <Filter>Header Files\universe</Filter> </ClInclude> - <ClInclude Include="..\..\universe\ParserUtil.h"> - <Filter>Header Files\universe</Filter> - </ClInclude> - <ClInclude Include="..\..\universe\Parser.h"> - <Filter>Header Files\universe</Filter> - </ClInclude> <ClInclude Include="..\..\universe\Meter.h"> <Filter>Header Files\universe</Filter> </ClInclude> @@ -350,6 +347,48 @@ <ClInclude Include="..\..\universe\EffectAccounting.h"> <Filter>Header Files\universe</Filter> </ClInclude> + <ClInclude Include="..\..\universe\Names.h"> + <Filter>Header Files\universe</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Double.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\EffectParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\EnumParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Int.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Label.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Lexer.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Parse.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ParseImpl.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ReportParseError.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ValueRefParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ValueRefParserImpl.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ConditionParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ConditionParserImpl.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\AI\ReferenceAI.cpp"> @@ -526,24 +565,12 @@ <ClCompile Include="..\..\util\SerializePathingEngine.cpp"> <Filter>Source Files\util</Filter> </ClCompile> - <ClCompile Include="..\..\universe\ConditionParser2.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> - <ClCompile Include="..\..\universe\ConditionParser1.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> - <ClCompile Include="..\..\universe\ConditionParser.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\Condition.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> <ClCompile Include="..\..\universe\Building.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\ValueRefParser.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\ValueRef.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> @@ -553,9 +580,6 @@ <ClCompile Include="..\..\universe\Universe.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\TopLevelParsers.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\Tech.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> @@ -586,9 +610,6 @@ <ClCompile Include="..\..\universe\Planet.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\ParserUtil.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\Meter.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> @@ -598,9 +619,6 @@ <ClCompile Include="..\..\universe\Enums.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\EffectParser.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\Effect.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> @@ -631,15 +649,108 @@ <ClCompile Include="..\..\AI\AIInterface.cpp"> <Filter>Source Files\AI</Filter> </ClCompile> - <ClCompile Include="..\..\universe\ConditionParser3.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\ObjectMap.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> <ClCompile Include="..\..\universe\EffectAccounting.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> + <ClCompile Include="..\..\universe\Names.cpp"> + <Filter>Source Files\universe</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ConditionParser2.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ConditionParser3.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Double.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\DoubleValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\EffectParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\EnumParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\FleetPlansParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Int.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\IntValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ItemsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Label.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Lexer.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\MonsterFleetPlansParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Parse.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\PlanetEnvironmentValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\PlanetSizeValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\PlanetTypeValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ReportParseError.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ShipDesignsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ShipHullsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ShipPartsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\SpecialsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\SpeciesParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\StarTypeValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\StringValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\TechsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\UniverseObjectTypeValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\AlignmentsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\BuildingsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ConditionParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ConditionParser1.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\log4cpp\log4cpp\Filter.hh"> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2011-11-06 16:13:00 UTC (rev 4474) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2011-11-06 21:54:44 UTC (rev 4475) @@ -116,6 +116,19 @@ <ClInclude Include="..\..\network\Message.h" /> <ClInclude Include="..\..\network\Networking.h" /> <ClInclude Include="..\..\network\ServerNetworking.h" /> + <ClInclude Include="..\..\parse\ConditionParser.h" /> + <ClInclude Include="..\..\parse\ConditionParserImpl.h" /> + <ClInclude Include="..\..\parse\Double.h" /> + <ClInclude Include="..\..\parse\EffectParser.h" /> + <ClInclude Include="..\..\parse\EnumParser.h" /> + <ClInclude Include="..\..\parse\Int.h" /> + <ClInclude Include="..\..\parse\Label.h" /> + <ClInclude Include="..\..\parse\Lexer.h" /> + <ClInclude Include="..\..\parse\Parse.h" /> + <ClInclude Include="..\..\parse\ParseImpl.h" /> + <ClInclude Include="..\..\parse\ReportParseError.h" /> + <ClInclude Include="..\..\parse\ValueRefParser.h" /> + <ClInclude Include="..\..\parse\ValueRefParserImpl.h" /> <ClInclude Include="..\..\server\SaveLoad.h" /> <ClInclude Include="..\..\server\ServerApp.h" /> <ClInclude Include="..\..\server\ServerFSM.h" /> @@ -128,9 +141,8 @@ <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\Parser.h" /> - <ClInclude Include="..\..\universe\ParserUtil.h" /> <ClInclude Include="..\..\universe\Planet.h" /> <ClInclude Include="..\..\universe\PopCenter.h" /> <ClInclude Include="..\..\universe\Predicates.h" /> @@ -145,7 +157,6 @@ <ClInclude Include="..\..\universe\UniverseObject.h" /> <ClInclude Include="..\..\universe\ValueRef.h" /> <ClInclude Include="..\..\universe\ValueRefFwd.h" /> - <ClInclude Include="..\..\universe\ValueRefParser.h" /> <ClInclude Include="..\..\util\AppInterface.h" /> <ClInclude Include="..\..\util\binreloc.h" /> <ClInclude Include="..\..\util\DataTable.h" /> @@ -251,6 +262,37 @@ <ClCompile Include="..\..\network\Message.cpp" /> <ClCompile Include="..\..\network\Networking.cpp" /> <ClCompile Include="..\..\network\ServerNetworking.cpp" /> + <ClCompile Include="..\..\parse\AlignmentsParser.cpp" /> + <ClCompile Include="..\..\parse\BuildingsParser.cpp" /> + <ClCompile Include="..\..\parse\ConditionParser.cpp" /> + <ClCompile Include="..\..\parse\ConditionParser1.cpp" /> + <ClCompile Include="..\..\parse\ConditionParser2.cpp" /> + <ClCompile Include="..\..\parse\ConditionParser3.cpp" /> + <ClCompile Include="..\..\parse\Double.cpp" /> + <ClCompile Include="..\..\parse\DoubleValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\EffectParser.cpp" /> + <ClCompile Include="..\..\parse\EnumParser.cpp" /> + <ClCompile Include="..\..\parse\FleetPlansParser.cpp" /> + <ClCompile Include="..\..\parse\Int.cpp" /> + <ClCompile Include="..\..\parse\IntValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\ItemsParser.cpp" /> + <ClCompile Include="..\..\parse\Label.cpp" /> + <ClCompile Include="..\..\parse\Lexer.cpp" /> + <ClCompile Include="..\..\parse\MonsterFleetPlansParser.cpp" /> + <ClCompile Include="..\..\parse\Parse.cpp" /> + <ClCompile Include="..\..\parse\PlanetEnvironmentValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\PlanetSizeValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\PlanetTypeValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\ReportParseError.cpp" /> + <ClCompile Include="..\..\parse\ShipDesignsParser.cpp" /> + <ClCompile Include="..\..\parse\ShipHullsParser.cpp" /> + <ClCompile Include="..\..\parse\ShipPartsParser.cpp" /> + <ClCompile Include="..\..\parse\SpecialsParser.cpp" /> + <ClCompile Include="..\..\parse\SpeciesParser.cpp" /> + <ClCompile Include="..\..\parse\StarTypeValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\StringValueRefParser.cpp" /> + <ClCompile Include="..\..\parse\TechsParser.cpp" /> + <ClCompile Include="..\..\parse\UniverseObjectTypeValueRefParser.cpp" /> <ClCompile Include="..\..\server\dmain.cpp" /> <ClCompile Include="..\..\server\SaveLoad.cpp" /> <ClCompile Include="..\..\server\ServerApp.cpp" /> @@ -258,18 +300,13 @@ <ClCompile Include="..\..\UI\StringTable.cpp" /> <ClCompile Include="..\..\universe\Building.cpp" /> <ClCompile Include="..\..\universe\Condition.cpp" /> - <ClCompile Include="..\..\universe\ConditionParser.cpp" /> - <ClCompile Include="..\..\universe\ConditionParser1.cpp" /> - <ClCompile Include="..\..\universe\ConditionParser2.cpp" /> - <ClCompile Include="..\..\universe\ConditionParser3.cpp" /> <ClCompile Include="..\..\universe\Effect.cpp" /> <ClCompile Include="..\..\universe\EffectAccounting.cpp" /> - <ClCompile Include="..\..\universe\EffectParser.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\ParserUtil.cpp" /> <ClCompile Include="..\..\universe\Planet.cpp" /> <ClCompile Include="..\..\universe\PopCenter.cpp" /> <ClCompile Include="..\..\universe\Predicates.cpp" /> @@ -280,11 +317,9 @@ <ClCompile Include="..\..\universe\Species.cpp" /> <ClCompile Include="..\..\universe\System.cpp" /> <ClCompile Include="..\..\universe\Tech.cpp" /> - <ClCompile Include="..\..\universe\TopLevelParsers.cpp" /> <ClCompile Include="..\..\universe\Universe.cpp" /> <ClCompile Include="..\..\universe\UniverseObject.cpp" /> <ClCompile Include="..\..\universe\ValueRef.cpp" /> - <ClCompile Include="..\..\universe\ValueRefParser.cpp" /> <ClCompile Include="..\..\util\AppInterface.cpp" /> <ClCompile Include="..\..\util\DataTable.cpp" /> <ClCompile Include="..\..\util\Directories.cpp" /> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters 2011-11-06 16:13:00 UTC (rev 4474) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters 2011-11-06 21:54:44 UTC (rev 4475) @@ -66,6 +66,12 @@ <Filter Include="Source Files\UI"> <UniqueIdentifier>{f6fc2133-2664-41ed-9036-7f2676f38740}</UniqueIdentifier> </Filter> + <Filter Include="Header Files\parse"> + <UniqueIdentifier>{3aa40cd4-5d9d-4ab8-9f91-cfc2f4d03e1f}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files\parse"> + <UniqueIdentifier>{653ef1a2-5aea-49d3-bc35-bdc903839efc}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\combat\CombatOrder.h"> @@ -161,9 +167,6 @@ <ClInclude Include="..\..\network\ServerNetworking.h"> <Filter>Header Files\network</Filter> </ClInclude> - <ClInclude Include="..\..\universe\ValueRefParser.h"> - <Filter>Header Files\universe</Filter> - </ClInclude> <ClInclude Include="..\..\universe\Building.h"> <Filter>Header Files\universe</Filter> </ClInclude> @@ -185,12 +188,6 @@ <ClInclude Include="..\..\universe\Meter.h"> <Filter>Header Files\universe</Filter> </ClInclude> - <ClInclude Include="..\..\universe\Parser.h"> - <Filter>Header Files\universe</Filter> - </ClInclude> - <ClInclude Include="..\..\universe\ParserUtil.h"> - <Filter>Header Files\universe</Filter> - </ClInclude> <ClInclude Include="..\..\universe\Planet.h"> <Filter>Header Files\universe</Filter> </ClInclude> @@ -311,6 +308,48 @@ <ClInclude Include="..\..\universe\EffectAccounting.h"> <Filter>Header Files\universe</Filter> </ClInclude> + <ClInclude Include="..\..\universe\Names.h"> + <Filter>Header Files\universe</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\EffectParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\EnumParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Int.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Label.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Lexer.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Parse.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ParseImpl.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ReportParseError.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ValueRefParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ValueRefParserImpl.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ConditionParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ConditionParserImpl.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Double.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\..\log4cpp\log4cpp\TriggeringEventEvaluator.hh"> @@ -618,30 +657,15 @@ <ClCompile Include="..\..\universe\ValueRef.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\ValueRefParser.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\Building.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> <ClCompile Include="..\..\universe\Condition.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\ConditionParser.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> - <ClCompile Include="..\..\universe\ConditionParser1.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> - <ClCompile Include="..\..\universe\ConditionParser2.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\Effect.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\EffectParser.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\Enums.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> @@ -651,9 +675,6 @@ <ClCompile Include="..\..\universe\Meter.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\ParserUtil.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\Planet.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> @@ -684,9 +705,6 @@ <ClCompile Include="..\..\universe\Tech.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> - <ClCompile Include="..\..\universe\TopLevelParsers.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\Universe.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> @@ -708,14 +726,107 @@ <ClCompile Include="..\..\server\dmain.cpp"> <Filter>Source Files\server</Filter> </ClCompile> - <ClCompile Include="..\..\universe\ConditionParser3.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> <ClCompile Include="..\..\universe\ObjectMap.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> <ClCompile Include="..\..\universe\EffectAccounting.cpp"> <Filter>Source Files\universe</Filter> </ClCompile> + <ClCompile Include="..\..\universe\Names.cpp"> + <Filter>Source Files\universe</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\EnumParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\FleetPlansParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Int.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\IntValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ItemsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Label.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Lexer.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\MonsterFleetPlansParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Parse.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\PlanetEnvironmentValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\PlanetSizeValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\PlanetTypeValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ReportParseError.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ShipDesignsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ShipHullsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ShipPartsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\SpecialsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\SpeciesParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\StarTypeValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\StringValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\TechsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\UniverseObjectTypeValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\AlignmentsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\BuildingsParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ConditionParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ConditionParser1.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ConditionParser2.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\ConditionParser3.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\Double.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\DoubleValueRefParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\parse\EffectParser.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> </ItemGroup> </Project> \ No newline at end of file Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2011-11-06 16:13:00 UTC (rev 4474) +++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2011-11-06 21:54:44 UTC (rev 4475) @@ -79,7 +79,6 @@ <ClInclude Include="..\..\GG\GG\utf8\core.h" /> <ClInclude Include="..\..\GG\GG\utf8\unchecked.h" /> <ClInclude Include="..\..\GG\GG\Wnd.h" /> - <ClInclude Include="..\..\GG\GG\WndEditor.h" /> <ClInclude Include="..\..\GG\GG\WndEvent.h" /> <ClInclude Include="..\..\GG\GG\ZList.h" /> </ItemGroup> @@ -117,7 +116,6 @@ <ClCompile Include="..\..\GG\src\Timer.cpp" /> <ClCompile Include="..\..\GG\src\UnicodeCharsets.cpp" /> <ClCompile Include="..\..\GG\src\Wnd.cpp" /> - <ClCompile Include="..\..\GG\src\WndEditor.cpp" /> <ClCompile Include="..\..\GG\src\WndEvent.cpp" /> <ClCompile Include="..\..\GG\src\ZList.cpp" /> </ItemGroup> Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj.filters 2011-11-06 16:13:00 UTC (rev 4474) +++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj.filters 2011-11-06 21:54:44 UTC (rev 4475) @@ -59,9 +59,6 @@ <ClInclude Include="..\..\GG\GG\Wnd.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\GG\GG\WndEditor.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\GG\GG\WndEvent.h"> <Filter>Header Files</Filter> </ClInclude> @@ -271,9 +268,6 @@ <ClCompile Include="..\..\GG\src\Wnd.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\GG\src\WndEditor.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\GG\src\WndEvent.cpp"> <Filter>Source Files</Filter> </ClCompile> |
From: <geo...@us...> - 2011-11-13 04:55:20
|
Revision: 4483 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4483&view=rev Author: geoffthemedio Date: 2011-11-13 04:55:09 +0000 (Sun, 13 Nov 2011) Log Message: ----------- MSVC 2010 project file updating. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters 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 Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2011-11-12 14:35:45 UTC (rev 4482) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2011-11-13 04:55:09 UTC (rev 4483) @@ -309,6 +309,9 @@ <ClCompile Include="..\..\Empire\Empire.cpp" /> <ClCompile Include="..\..\Empire\EmpireManager.cpp" /> <ClCompile Include="..\..\Empire\ResourcePool.cpp" /> + <ClCompile Include="..\..\GG\src\adobe\memory.cpp" /> + <ClCompile Include="..\..\GG\src\adobe\name.cpp" /> + <ClCompile Include="..\..\GG\src\adobe\string_pool.cpp" /> <ClCompile Include="..\..\log4cpp\src\Appender.cpp" /> <ClCompile Include="..\..\log4cpp\src\AppenderSkeleton.cpp" /> <ClCompile Include="..\..\log4cpp\src\BasicLayout.cpp" /> Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters 2011-11-12 14:35:45 UTC (rev 4482) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters 2011-11-13 04:55:09 UTC (rev 4483) @@ -1186,6 +1186,15 @@ <ClCompile Include="..\..\parse\UniverseObjectTypeValueRefParser.cpp"> <Filter>Source Files\parse</Filter> </ClCompile> + <ClCompile Include="..\..\GG\src\adobe\name.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\GG\src\adobe\string_pool.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\GG\src\adobe\memory.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ResourceCompile Include="FreeOrion.rc"> Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2011-11-12 14:35:45 UTC (rev 4482) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2011-11-13 04:55:09 UTC (rev 4483) @@ -206,6 +206,9 @@ <ClCompile Include="..\..\Empire\Empire.cpp" /> <ClCompile Include="..\..\Empire\EmpireManager.cpp" /> <ClCompile Include="..\..\Empire\ResourcePool.cpp" /> + <ClCompile Include="..\..\GG\src\adobe\memory.cpp" /> + <ClCompile Include="..\..\GG\src\adobe\name.cpp" /> + <ClCompile Include="..\..\GG\src\adobe\string_pool.cpp" /> <ClCompile Include="..\..\log4cpp\src\Appender.cpp" /> <ClCompile Include="..\..\log4cpp\src\AppenderSkeleton.cpp" /> <ClCompile Include="..\..\log4cpp\src\BasicLayout.cpp" /> Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj.filters 2011-11-12 14:35:45 UTC (rev 4482) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj.filters 2011-11-13 04:55:09 UTC (rev 4483) @@ -751,6 +751,15 @@ <ClCompile Include="..\..\parse\ConditionParser1.cpp"> <Filter>Source Files\parse</Filter> </ClCompile> + <ClCompile Include="..\..\GG\src\adobe\name.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\GG\src\adobe\string_pool.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\GG\src\adobe\memory.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <None Include="..\..\log4cpp\log4cpp\Filter.hh"> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2011-11-12 14:35:45 UTC (rev 4482) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2011-11-13 04:55:09 UTC (rev 4483) @@ -241,6 +241,9 @@ <ClCompile Include="..\..\Empire\Empire.cpp" /> <ClCompile Include="..\..\Empire\EmpireManager.cpp" /> <ClCompile Include="..\..\Empire\ResourcePool.cpp" /> + <ClCompile Include="..\..\GG\src\adobe\memory.cpp" /> + <ClCompile Include="..\..\GG\src\adobe\name.cpp" /> + <ClCompile Include="..\..\GG\src\adobe\string_pool.cpp" /> <ClCompile Include="..\..\log4cpp\src\Appender.cpp" /> <ClCompile Include="..\..\log4cpp\src\AppenderSkeleton.cpp" /> <ClCompile Include="..\..\log4cpp\src\BasicLayout.cpp" /> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters 2011-11-12 14:35:45 UTC (rev 4482) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj.filters 2011-11-13 04:55:09 UTC (rev 4483) @@ -828,5 +828,14 @@ <ClCompile Include="..\..\parse\EffectParser.cpp"> <Filter>Source Files\parse</Filter> </ClCompile> + <ClCompile Include="..\..\GG\src\adobe\name.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\GG\src\adobe\string_pool.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> + <ClCompile Include="..\..\GG\src\adobe\memory.cpp"> + <Filter>Source Files\parse</Filter> + </ClCompile> </ItemGroup> </Project> \ No newline at end of file |
From: <geo...@us...> - 2011-11-28 01:44:45
|
Revision: 4508 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4508&view=rev Author: geoffthemedio Date: 2011-11-28 01:44:39 +0000 (Mon, 28 Nov 2011) Log Message: ----------- log4cpp and Parsers project tweaks Modified Paths: -------------- trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj.filters trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj.filters Modified: trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj 2011-11-27 21:44:54 UTC (rev 4507) +++ trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj 2011-11-28 01:44:39 UTC (rev 4508) @@ -128,8 +128,22 @@ <ClCompile Include="..\..\parse\StringValueRefParser.cpp" /> <ClCompile Include="..\..\parse\TechsParser.cpp" /> <ClCompile Include="..\..\parse\UniverseObjectTypeValueRefParser.cpp" /> - <ClCompile Include="..\..\universe\Names.cpp" /> </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\parse\ConditionParser.h" /> + <ClInclude Include="..\..\parse\ConditionParserImpl.h" /> + <ClInclude Include="..\..\parse\Double.h" /> + <ClInclude Include="..\..\parse\EffectParser.h" /> + <ClInclude Include="..\..\parse\EnumParser.h" /> + <ClInclude Include="..\..\parse\Int.h" /> + <ClInclude Include="..\..\parse\Label.h" /> + <ClInclude Include="..\..\parse\Lexer.h" /> + <ClInclude Include="..\..\parse\Parse.h" /> + <ClInclude Include="..\..\parse\ParseImpl.h" /> + <ClInclude Include="..\..\parse\ReportParseError.h" /> + <ClInclude Include="..\..\parse\ValueRefParser.h" /> + <ClInclude Include="..\..\parse\ValueRefParserImpl.h" /> + </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> Modified: trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj.filters 2011-11-27 21:44:54 UTC (rev 4507) +++ trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj.filters 2011-11-28 01:44:39 UTC (rev 4508) @@ -12,8 +12,8 @@ <Filter Include="Source Files\parse"> <UniqueIdentifier>{75d24163-deb9-408c-9659-e28b7bddde67}</UniqueIdentifier> </Filter> - <Filter Include="Source Files\universe"> - <UniqueIdentifier>{dcef8bfc-9460-4188-9d3c-66407ac5b7ba}</UniqueIdentifier> + <Filter Include="Header Files\parse"> + <UniqueIdentifier>{89466642-7734-480c-ab15-5146bdcc8962}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> @@ -119,8 +119,46 @@ <ClCompile Include="..\..\parse\UniverseObjectTypeValueRefParser.cpp"> <Filter>Source Files\parse</Filter> </ClCompile> - <ClCompile Include="..\..\universe\Names.cpp"> - <Filter>Source Files\universe</Filter> - </ClCompile> </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\parse\ConditionParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ValueRefParserImpl.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ConditionParserImpl.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Double.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\EffectParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\EnumParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Int.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Label.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Lexer.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\Parse.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ParseImpl.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ReportParseError.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + <ClInclude Include="..\..\parse\ValueRefParser.h"> + <Filter>Header Files\parse</Filter> + </ClInclude> + </ItemGroup> </Project> \ No newline at end of file Modified: trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj 2011-11-27 21:44:54 UTC (rev 4507) +++ trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj 2011-11-28 01:44:39 UTC (rev 4508) @@ -214,7 +214,6 @@ <None Include="..\..\log4cpp\src\StringUtil.hh"> <FileType>Document</FileType> </None> - <None Include="ReadMe.txt" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\log4cpp\log4cpp\config-win32.h" /> Modified: trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj.filters 2011-11-27 21:44:54 UTC (rev 4507) +++ trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj.filters 2011-11-28 01:44:39 UTC (rev 4508) @@ -24,7 +24,6 @@ </Filter> </ItemGroup> <ItemGroup> - <None Include="ReadMe.txt" /> <None Include="..\..\log4cpp\log4cpp\AbortAppender.hh"> <Filter>Header Files\log4cpp</Filter> </None> |
From: <geo...@us...> - 2011-12-04 06:39:24
|
Revision: 4514 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4514&view=rev Author: geoffthemedio Date: 2011-12-04 06:39:18 +0000 (Sun, 04 Dec 2011) Log Message: ----------- Tweaked optimization settings for AI client and server MSVC project files, and log4cpp static library project files. Would have also tweaked the client optimization, but link time code generation causes crashes when GUI::Enter2DMode is called, which only happens in the human client, as that's the only executable that has a GUI. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2011-12-04 06:36:38 UTC (rev 4513) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2011-12-04 06:39:18 UTC (rev 4514) @@ -74,7 +74,7 @@ <CompileAsManaged>false</CompileAsManaged> <MultiProcessorCompilation>true</MultiProcessorCompilation> <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - <WholeProgramOptimization>false</WholeProgramOptimization> + <WholeProgramOptimization>true</WholeProgramOptimization> <RuntimeTypeInfo>true</RuntimeTypeInfo> <DebugInformationFormat>OldStyle</DebugInformationFormat> </ClCompile> @@ -88,7 +88,7 @@ <AdditionalDependencies>Parsers.lib;log4cpp.lib;python27.lib;boost_python-vc100-mt-1_47.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> <RandomizedBaseAddress>false</RandomizedBaseAddress> <LinkErrorReporting>SendErrorReport</LinkErrorReporting> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2011-12-04 06:36:38 UTC (rev 4513) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2011-12-04 06:39:18 UTC (rev 4514) @@ -74,7 +74,7 @@ <CompileAsManaged>false</CompileAsManaged> <MultiProcessorCompilation>true</MultiProcessorCompilation> <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - <WholeProgramOptimization>false</WholeProgramOptimization> + <WholeProgramOptimization>true</WholeProgramOptimization> <RuntimeTypeInfo>true</RuntimeTypeInfo> <DebugInformationFormat>OldStyle</DebugInformationFormat> </ClCompile> @@ -88,7 +88,7 @@ <AdditionalDependencies>Parsers.lib;log4cpp.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> <RandomizedBaseAddress>false</RandomizedBaseAddress> <LinkErrorReporting>SendErrorReport</LinkErrorReporting> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj 2011-12-04 06:36:38 UTC (rev 4513) +++ trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj 2011-12-04 06:39:18 UTC (rev 4514) @@ -59,7 +59,7 @@ <WarningLevel>Level3</WarningLevel> <PrecompiledHeader> </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> + <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
From: <geo...@us...> - 2011-12-23 13:13:05
|
Revision: 4537 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4537&view=rev Author: geoffthemedio Date: 2011-12-23 13:12:59 +0000 (Fri, 23 Dec 2011) Log Message: ----------- Added missing Universe MSVC 2010 project files. Added Paths: ----------- trunk/FreeOrion/msvc2010/Universe/ trunk/FreeOrion/msvc2010/Universe/Universe.vcxproj trunk/FreeOrion/msvc2010/Universe/Universe.vcxproj.filters Added: trunk/FreeOrion/msvc2010/Universe/Universe.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Universe/Universe.vcxproj (rev 0) +++ trunk/FreeOrion/msvc2010/Universe/Universe.vcxproj 2011-12-23 13:12:59 UTC (rev 4537) @@ -0,0 +1,135 @@ +<?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> + <ItemGroup> + <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" /> + </ItemGroup> + <ItemGroup> + <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" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{72746EEC-410C-4272-988F-835DC2665FDB}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>Universe</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/;../../../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</DisableSpecificWarnings> + </ClCompile> + <Link> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/FreeOrion/msvc2010/Universe/Universe.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/Universe/Universe.vcxproj.filters (rev 0) +++ trunk/FreeOrion/msvc2010/Universe/Universe.vcxproj.filters 2011-12-23 13:12:59 UTC (rev 4537) @@ -0,0 +1,155 @@ +<?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> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\universe\Building.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\ValueRefFwd.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Condition.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Effect.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\EffectAccounting.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Enums.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Fleet.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\InhibitableSignal.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Meter.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Names.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\ObjectMap.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Planet.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\PopCenter.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Predicates.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\ResourceCenter.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Ship.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\ShipDesign.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Special.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Species.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\System.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Tech.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\Universe.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\UniverseObject.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\universe\ValueRef.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\universe\Building.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\ValueRef.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Condition.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Effect.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\EffectAccounting.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Enums.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Fleet.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Meter.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Names.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\ObjectMap.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Planet.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\PopCenter.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Predicates.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\ResourceCenter.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Ship.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\ShipDesign.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Special.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Species.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\System.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Tech.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\UniverseObject.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\universe\Universe.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> +</Project> \ No newline at end of file |
From: <geo...@us...> - 2011-12-25 06:31:15
|
Revision: 4539 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4539&view=rev Author: geoffthemedio Date: 2011-12-25 06:31:09 +0000 (Sun, 25 Dec 2011) Log Message: ----------- -Tweaked some MSVC 2010 project files to explicitly use link time code generation. -Updated MSVC 2010 Version.cpp. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj trunk/FreeOrion/msvc2010/src/Version.cpp Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2011-12-23 13:21:40 UTC (rev 4538) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2011-12-25 06:31:09 UTC (rev 4539) @@ -91,7 +91,7 @@ <RandomizedBaseAddress>false</RandomizedBaseAddress> <LinkErrorReporting>SendErrorReport</LinkErrorReporting> <IgnoreSpecificDefaultLibraries>LIBCMT; LIBCPMT</IgnoreSpecificDefaultLibraries> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2011-12-23 13:21:40 UTC (rev 4538) +++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2011-12-25 06:31:09 UTC (rev 4539) @@ -222,7 +222,7 @@ </TreatLinkerWarningAsErrors> <AdditionalDependencies>opengl32.lib;glu32.lib;freetype244MT.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies> <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> Modified: trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj 2011-12-23 13:21:40 UTC (rev 4538) +++ trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj 2011-12-25 06:31:09 UTC (rev 4539) @@ -81,7 +81,7 @@ <SubSystem>Console</SubSystem> <LinkStatus> </LinkStatus> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj 2011-12-23 13:21:40 UTC (rev 4538) +++ trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj 2011-12-25 06:31:09 UTC (rev 4539) @@ -80,7 +80,7 @@ <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries> <SubSystem>Console</SubSystem> <RandomizedBaseAddress>false</RandomizedBaseAddress> - <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> + <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/FreeOrion/msvc2010/src/Version.cpp =================================================================== --- trunk/FreeOrion/msvc2010/src/Version.cpp 2011-12-23 13:21:40 UTC (rev 4538) +++ trunk/FreeOrion/msvc2010/src/Version.cpp 2011-12-25 06:31:09 UTC (rev 4539) @@ -1,7 +1,7 @@ #include "../../util/Version.h" namespace { - static const std::string retval = "v0.3.17+ [SVN 4524] MSVC 2010"; + static const std::string retval = "v0.3.17+ [SVN 4539] MSVC 2010"; } const std::string& FreeOrionVersionString() |
From: <geo...@us...> - 2012-01-02 09:02:14
|
Revision: 4556 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4556&view=rev Author: geoffthemedio Date: 2012-01-02 09:02:08 +0000 (Mon, 02 Jan 2012) Log Message: ----------- Disabled warning 4351 in MSVC project files. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj trunk/FreeOrion/msvc2010/Universe/Universe.vcxproj Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2012-01-02 07:22:51 UTC (rev 4555) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2012-01-02 09:02:08 UTC (rev 4556) @@ -71,7 +71,7 @@ </PrecompiledHeaderFile> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> - <DisableSpecificWarnings>4396;4251;4275;4099;4800;4091;4146;4244</DisableSpecificWarnings> + <DisableSpecificWarnings>4396;4251;4275;4099;4800;4091;4146;4244;4351</DisableSpecificWarnings> <MultiProcessorCompilation>true</MultiProcessorCompilation> <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> <CompileAsManaged>false</CompileAsManaged> Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2012-01-02 07:22:51 UTC (rev 4555) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2012-01-02 09:02:08 UTC (rev 4556) @@ -70,7 +70,7 @@ </PrecompiledHeaderFile> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> - <DisableSpecificWarnings>4099;4251;4800;4267;4275;4244;4101;4258;4996;4312;4311;4091</DisableSpecificWarnings> + <DisableSpecificWarnings>4099;4251;4800;4267;4275;4244;4101;4258;4996;4312;4311;4091;4351</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> <MultiProcessorCompilation>true</MultiProcessorCompilation> <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2012-01-02 07:22:51 UTC (rev 4555) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2012-01-02 09:02:08 UTC (rev 4556) @@ -70,7 +70,7 @@ </PrecompiledHeaderFile> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> - <DisableSpecificWarnings>4099;4251;4800;4267;4275;4244;4101;4258;4996;4312;4311;4091</DisableSpecificWarnings> + <DisableSpecificWarnings>4099;4251;4800;4267;4275;4244;4101;4258;4996;4312;4311;4091;4351</DisableSpecificWarnings> <CompileAsManaged>false</CompileAsManaged> <MultiProcessorCompilation>true</MultiProcessorCompilation> <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> Modified: trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj 2012-01-02 07:22:51 UTC (rev 4555) +++ trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj 2012-01-02 09:02:08 UTC (rev 4556) @@ -69,7 +69,7 @@ <CompileAsManaged>false</CompileAsManaged> <MultiProcessorCompilation>true</MultiProcessorCompilation> <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> - <DisableSpecificWarnings>4275; 4244; 4251</DisableSpecificWarnings> + <DisableSpecificWarnings>4275;4244;4251;4351</DisableSpecificWarnings> <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeaderFile> </PrecompiledHeaderFile> Modified: trunk/FreeOrion/msvc2010/Universe/Universe.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Universe/Universe.vcxproj 2012-01-02 07:22:51 UTC (rev 4555) +++ trunk/FreeOrion/msvc2010/Universe/Universe.vcxproj 2012-01-02 09:02:08 UTC (rev 4556) @@ -120,7 +120,7 @@ </PrecompiledHeaderFile> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> - <DisableSpecificWarnings>4275; 4244; 4251</DisableSpecificWarnings> + <DisableSpecificWarnings>4275;4244;4251;4351</DisableSpecificWarnings> </ClCompile> <Link> <SubSystem>Windows</SubSystem> |
From: <geo...@us...> - 2012-01-02 11:01:00
|
Revision: 4558 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4558&view=rev Author: geoffthemedio Date: 2012-01-02 11:00:54 +0000 (Mon, 02 Jan 2012) Log Message: ----------- Tweaked some MSVC 2010 project file settings, mostly related to debug information format. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2012-01-02 09:04:42 UTC (rev 4557) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2012-01-02 11:00:54 UTC (rev 4558) @@ -76,7 +76,7 @@ <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> <WholeProgramOptimization>true</WholeProgramOptimization> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <DebugInformationFormat>OldStyle</DebugInformationFormat> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <SubSystem>Console</SubSystem> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2012-01-02 09:04:42 UTC (rev 4557) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2012-01-02 11:00:54 UTC (rev 4558) @@ -76,7 +76,7 @@ <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> <WholeProgramOptimization>true</WholeProgramOptimization> <RuntimeTypeInfo>true</RuntimeTypeInfo> - <DebugInformationFormat>OldStyle</DebugInformationFormat> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> </ClCompile> <Link> <SubSystem>Console</SubSystem> Modified: trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj 2012-01-02 09:04:42 UTC (rev 4557) +++ trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj 2012-01-02 11:00:54 UTC (rev 4558) @@ -76,7 +76,8 @@ <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> <WholeProgramOptimization>false</WholeProgramOptimization> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <DebugInformationFormat> + </DebugInformationFormat> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> </ClCompile> <Link> Modified: trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj 2012-01-02 09:04:42 UTC (rev 4557) +++ trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj 2012-01-02 11:00:54 UTC (rev 4558) @@ -64,11 +64,14 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;LOG4CPP_HAS_DLL;LOG4CPP_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../log4cpp/</AdditionalIncludeDirectories> <WholeProgramOptimization>false</WholeProgramOptimization> - <DebugInformationFormat>OldStyle</DebugInformationFormat> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <PrecompiledHeaderFile> </PrecompiledHeaderFile> <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> + <CompileAsManaged>false</CompileAsManaged> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing> </ClCompile> <Link> <SubSystem>Console</SubSystem> |
From: <geo...@us...> - 2012-01-02 11:16:35
|
Revision: 4559 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4559&view=rev Author: geoffthemedio Date: 2012-01-02 11:16:29 +0000 (Mon, 02 Jan 2012) Log Message: ----------- Re-enabled debug symbol generation for MSVC 2010 client / server projects. Recent change to Parsers lib to disable debug info seems to have worked, so that the executables lack parser debug symbols, but can be successfully linked and generate .pdb files to allow debugging with Visual Studio again. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2012-01-02 11:00:54 UTC (rev 4558) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2012-01-02 11:16:29 UTC (rev 4559) @@ -80,7 +80,7 @@ </ClCompile> <Link> <SubSystem>Console</SubSystem> - <GenerateDebugInformation>false</GenerateDebugInformation> + <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <AdditionalLibraryDirectories>../../../lib/;../../../lib/bullet/;../../../Boost/lib/;../../</AdditionalLibraryDirectories> Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2012-01-02 11:00:54 UTC (rev 4558) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2012-01-02 11:16:29 UTC (rev 4559) @@ -80,7 +80,7 @@ </ClCompile> <Link> <SubSystem>Console</SubSystem> - <GenerateDebugInformation>false</GenerateDebugInformation> + <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <OutputFile>../../FreeOrionCA.exe</OutputFile> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2012-01-02 11:00:54 UTC (rev 4558) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2012-01-02 11:16:29 UTC (rev 4559) @@ -80,7 +80,7 @@ </ClCompile> <Link> <SubSystem>Console</SubSystem> - <GenerateDebugInformation>false</GenerateDebugInformation> + <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <OutputFile>../../FreeOrionD.exe</OutputFile> |
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] |
From: <geo...@us...> - 2013-01-01 03:00:35
|
Revision: 5596 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5596&view=rev Author: geoffthemedio Date: 2013-01-01 03:00:28 +0000 (Tue, 01 Jan 2013) Log Message: ----------- Patch by Vezzra to automatically update MSVC Version.cpp with SVN revision when building. Modified Paths: -------------- trunk/FreeOrion/msvc2010/Common/Common.vcxproj trunk/FreeOrion/msvc2010/Common/Common.vcxproj.filters trunk/FreeOrion/msvc2010/src/Version.cpp Added Paths: ----------- trunk/FreeOrion/msvc2010/src/Version.template Modified: trunk/FreeOrion/msvc2010/Common/Common.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Common/Common.vcxproj 2013-01-01 02:32:06 UTC (rev 5595) +++ trunk/FreeOrion/msvc2010/Common/Common.vcxproj 2013-01-01 03:00:28 UTC (rev 5596) @@ -39,7 +39,13 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <OutDir>../../</OutDir> + <CustomBuildBeforeTargets> + </CustomBuildBeforeTargets> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <CustomBuildBeforeTargets> + </CustomBuildBeforeTargets> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <PrecompiledHeader> @@ -52,6 +58,16 @@ <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> </Link> + <CustomBuildStep> + <Command> + </Command> + </CustomBuildStep> + <CustomBuildStep> + <Outputs> + </Outputs> + <Inputs> + </Inputs> + </CustomBuildStep> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> @@ -78,11 +94,32 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> </Link> + <CustomBuildStep> + <Command> + </Command> + </CustomBuildStep> + <CustomBuildStep> + <Outputs> + </Outputs> + <Inputs> + </Inputs> + </CustomBuildStep> </ItemDefinitionGroup> <ItemGroup> <None Include="..\..\util\Serialize.ipp"> <FileType>Document</FileType> </None> + <CustomBuild Include="..\src\Version.template"> + <FileType>Document</FileType> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\python.exe $(SolutionDir)make_versioncpp.py $(SolutionDir)src</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)src\Version.cpp;%(Outputs)</Outputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\.svn;%(AdditionalInputs)</AdditionalInputs> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Make Version.cpp</Message> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\python.exe $(SolutionDir)make_versioncpp.py $(SolutionDir)src</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Make Version.cpp</Message> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)src\Version.cpp;%(Outputs)</Outputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\.svn;%(AdditionalInputs)</AdditionalInputs> + </CustomBuild> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\combat\CombatOrder.h" /> Modified: trunk/FreeOrion/msvc2010/Common/Common.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/Common/Common.vcxproj.filters 2013-01-01 02:32:06 UTC (rev 5595) +++ trunk/FreeOrion/msvc2010/Common/Common.vcxproj.filters 2013-01-01 03:00:28 UTC (rev 5596) @@ -454,4 +454,9 @@ <Filter>Source Files\universe</Filter> </ClCompile> </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\src\Version.template"> + <Filter>Source Files\util</Filter> + </CustomBuild> + </ItemGroup> </Project> \ No newline at end of file Modified: trunk/FreeOrion/msvc2010/src/Version.cpp =================================================================== --- trunk/FreeOrion/msvc2010/src/Version.cpp 2013-01-01 02:32:06 UTC (rev 5595) +++ trunk/FreeOrion/msvc2010/src/Version.cpp 2013-01-01 03:00:28 UTC (rev 5596) @@ -1,8 +1,8 @@ -#include "../../util/Version.h" - -namespace { - static const std::string retval = "v0.4.1+ [SVN 5284] MSVC 2010"; -} - -const std::string& FreeOrionVersionString() -{ return retval; } +#include "../../util/Version.h" + +namespace { + static const std::string retval = "v0.4.1+ [SVN 5594] MSVC 2010"; +} + +const std::string& FreeOrionVersionString() +{ return retval; } Added: trunk/FreeOrion/msvc2010/src/Version.template =================================================================== --- trunk/FreeOrion/msvc2010/src/Version.template (rev 0) +++ trunk/FreeOrion/msvc2010/src/Version.template 2013-01-01 03:00:28 UTC (rev 5596) @@ -0,0 +1,8 @@ +#include "../../util/Version.h" + +namespace { + static const std::string retval = "v0.4.1+ [SVN ${WCREV}] MSVC 2010"; +} + +const std::string& FreeOrionVersionString() +{ return retval; } |
From: <geo...@us...> - 2013-01-01 18:16:32
|
Revision: 5603 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5603&view=rev Author: geoffthemedio Date: 2013-01-01 18:16:21 +0000 (Tue, 01 Jan 2013) Log Message: ----------- Removed MSVC 2010 Version.cpp (which is now generated during builds) and added make_versioncpp.py. Added Paths: ----------- trunk/FreeOrion/msvc2010/make_versioncpp.py Removed Paths: ------------- trunk/FreeOrion/msvc2010/src/Version.cpp Property Changed: ---------------- trunk/FreeOrion/msvc2010/src/ Added: trunk/FreeOrion/msvc2010/make_versioncpp.py =================================================================== --- trunk/FreeOrion/msvc2010/make_versioncpp.py (rev 0) +++ trunk/FreeOrion/msvc2010/make_versioncpp.py 2013-01-01 18:16:21 UTC (rev 5603) @@ -0,0 +1,49 @@ +import sys +import os +import subprocess as sp +from string import Template + +os.chdir(sys.argv[1]) + +try: + + svn_proc = sp.Popen(["SubWCRev.exe", "."], stdout=sp.PIPE) + svn_info = svn_proc.communicate()[0] + + for line in svn_info.splitlines(): + if line.startswith("Updated to revision"): + wc_rev = line.rpartition(" ")[2] + +except: + + try: + + svn_proc = sp.Popen(["svn", "info"], stdout=sp.PIPE) + svn_info = svn_proc.communicate()[0] + + for line in svn_info.splitlines(): + if line.startswith("Revision:"): + wc_rev = line.partition(" ")[2] + + except: + + wc_rev = "" + print "WARNING: No properly installed SVN client found" + +if wc_rev == "": + print "WARNING: Can't determine SVN working copy revision, Version.cpp not updated!" + quit() + +try: + template_file = open("Version.template") + template = Template(template_file.read()) + template_file.close() +except: + print "WARNING: Can't access template file for Version.cpp, Version.cpp not updated!" + quit() + +version_cpp = open("Version.cpp", "w") +version_cpp.write(template.substitute(WCREV=wc_rev)) +version_cpp.close() + +print "Building rev: " + wc_rev \ No newline at end of file Property changes on: trunk/FreeOrion/msvc2010/src ___________________________________________________________________ Added: svn:ignore + Version.cpp Deleted: trunk/FreeOrion/msvc2010/src/Version.cpp =================================================================== --- trunk/FreeOrion/msvc2010/src/Version.cpp 2013-01-01 08:59:20 UTC (rev 5602) +++ trunk/FreeOrion/msvc2010/src/Version.cpp 2013-01-01 18:16:21 UTC (rev 5603) @@ -1,8 +0,0 @@ -#include "../../util/Version.h" - -namespace { - static const std::string retval = "v0.4.1+ [SVN 5594] MSVC 2010"; -} - -const std::string& FreeOrionVersionString() -{ return retval; } |
From: <geo...@us...> - 2013-04-08 07:27:36
|
Revision: 5965 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5965&view=rev Author: geoffthemedio Date: 2013-04-08 07:27:19 +0000 (Mon, 08 Apr 2013) Log Message: ----------- Added extra preprocessor defines for projects using log4cpp headers, necessary after recent update to that code. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2013-04-07 22:07:31 UTC (rev 5964) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2013-04-08 07:27:19 UTC (rev 5965) @@ -64,7 +64,7 @@ <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_HUMAN;FREEORION_WIN32;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_HUMAN;FREEORION_WIN32;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;LOG4CPP_STLPORT_AND_BOOST_BUILD</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_51/;../../GG/;../include/;../../../include/OGRE/;../../../include/bullet/;../../../include/zlib/;../../../include/AL/;../../OIS/;../../PagedGeometry/include/;../../OpenSteer/include/</AdditionalIncludeDirectories> <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeaderFile> Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2013-04-07 22:07:31 UTC (rev 5964) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2013-04-08 07:27:19 UTC (rev 5965) @@ -64,7 +64,7 @@ <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_AI;FREEORION_WIN32;GiGi_EXPORTS;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_AI;FREEORION_WIN32;GiGi_EXPORTS;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;LOG4CPP_STLPORT_AND_BOOST_BUILD</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_51/;../../GG/;../../../include/Python27/;../../../include/zlib/;../../OpenSteer/include/</AdditionalIncludeDirectories> <PrecompiledHeaderFile> </PrecompiledHeaderFile> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2013-04-07 22:07:31 UTC (rev 5964) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2013-04-08 07:27:19 UTC (rev 5965) @@ -64,7 +64,7 @@ <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_SERVER;FREEORION_WIN32;GiGi_EXPORTS;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_SERVER;FREEORION_WIN32;GiGi_EXPORTS;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;LOG4CPP_STLPORT_AND_BOOST_BUILD</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_51/;../../GG/;../../../include/zlib/;../../OpenSteer/include/</AdditionalIncludeDirectories> <PrecompiledHeaderFile> </PrecompiledHeaderFile> |
From: <ve...@us...> - 2013-04-08 14:52:01
|
Revision: 5966 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5966&view=rev Author: vezzra Date: 2013-04-08 14:51:52 +0000 (Mon, 08 Apr 2013) Log Message: ----------- Added extra preprocessor defines of previous commit also to projects "Common" and "Parsers", fixing compile errors on Windows Modified Paths: -------------- trunk/FreeOrion/msvc2010/Common/Common.vcxproj trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj Modified: trunk/FreeOrion/msvc2010/Common/Common.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Common/Common.vcxproj 2013-04-08 07:27:19 UTC (rev 5965) +++ trunk/FreeOrion/msvc2010/Common/Common.vcxproj 2013-04-08 14:51:52 UTC (rev 5966) @@ -76,7 +76,7 @@ <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> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FREEORION_WIN32;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;LOG4CPP_STLPORT_AND_BOOST_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../include/zlib/;../../../Boost/include/boost_1_51/;../../GG/;../../OpenSteer/include/</AdditionalIncludeDirectories> <CompileAsManaged>false</CompileAsManaged> <MultiProcessorCompilation>true</MultiProcessorCompilation> Modified: trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj 2013-04-08 07:27:19 UTC (rev 5965) +++ trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj 2013-04-08 14:51:52 UTC (rev 5966) @@ -64,7 +64,7 @@ <Optimization>MinSpace</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PARSERS_EXPORTS;FREEORION_WIN32;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PARSERS_EXPORTS;FREEORION_WIN32;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;LOG4CPP_STLPORT_AND_BOOST_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_51/;../../GG/;../../OpenSteer/include/</AdditionalIncludeDirectories> <CompileAsManaged>false</CompileAsManaged> <MultiProcessorCompilation>true</MultiProcessorCompilation> |
From: <geo...@us...> - 2013-06-24 22:31:02
|
Revision: 6194 http://sourceforge.net/p/freeorion/code/6194 Author: geoffthemedio Date: 2013-06-24 22:30:56 +0000 (Mon, 24 Jun 2013) Log Message: ----------- Patch by adrian_broher moving ogre_plugins.cfg generation into human client project in MSVC build. Modified Paths: -------------- trunk/FreeOrion/msvc2010/Common/Common.vcxproj trunk/FreeOrion/msvc2010/Common/Common.vcxproj.filters trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters Modified: trunk/FreeOrion/msvc2010/Common/Common.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Common/Common.vcxproj 2013-06-23 23:58:00 UTC (rev 6193) +++ trunk/FreeOrion/msvc2010/Common/Common.vcxproj 2013-06-24 22:30:56 UTC (rev 6194) @@ -114,17 +114,6 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> </None> - <CustomBuild Include="..\..\ogre_plugins.cfg.in"> - <FileType>Document</FileType> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)..\python.exe" "$(SolutionDir)..\cmake\make_ogre_plugins.py" "$(SolutionDir).."</Command> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)..\python.exe" "$(SolutionDir)..\cmake\make_ogre_plugins.py" "$(SolutionDir).."</Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\ogre_plugins.cfg;%(Outputs)</Outputs> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\ogre_plugins.cfg;%(Outputs)</Outputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\.svn;%(AdditionalInputs)</AdditionalInputs> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\.svn;%(AdditionalInputs)</AdditionalInputs> - <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Configuring ogre_plugins.cfg</Message> - <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Configuring ogre_plugins.cfg</Message> - </CustomBuild> <None Include="..\..\util\Serialize.ipp"> <FileType>Document</FileType> </None> Modified: trunk/FreeOrion/msvc2010/Common/Common.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/Common/Common.vcxproj.filters 2013-06-23 23:58:00 UTC (rev 6193) +++ trunk/FreeOrion/msvc2010/Common/Common.vcxproj.filters 2013-06-24 22:30:56 UTC (rev 6194) @@ -455,8 +455,5 @@ <CustomBuild Include="..\..\util\Version.cpp.in"> <Filter>Source Files\util</Filter> </CustomBuild> - <CustomBuild Include="..\..\ogre_plugins.cfg.in"> - <Filter>Source Files</Filter> - </CustomBuild> </ItemGroup> </Project> \ No newline at end of file Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2013-06-23 23:58:00 UTC (rev 6193) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2013-06-24 22:30:56 UTC (rev 6194) @@ -205,6 +205,15 @@ </ItemGroup> <ItemGroup> <None Include="..\..\FreeOrion.ico" /> + <CustomBuild Include="..\..\ogre_plugins.cfg.in"> + <FileType>Document</FileType> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(SolutionDir)..\python.exe" "$(SolutionDir)..\cmake\make_ogre_plugins.py" "$(SolutionDir).."</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(SolutionDir)..\python.exe" "$(SolutionDir)..\cmake\make_ogre_plugins.py" "$(SolutionDir).."</Command> + <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Configuring ogre_plugins.cfg</Message> + <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Configuring ogre_plugins.cfg</Message> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\ogre_plugins.cfg;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\ogre_plugins.cfg;%(Outputs)</Outputs> + </CustomBuild> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\client\ClientApp.cpp" /> Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters 2013-06-23 23:58:00 UTC (rev 6193) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj.filters 2013-06-24 22:30:56 UTC (rev 6194) @@ -565,4 +565,9 @@ <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\ogre_plugins.cfg.in"> + <Filter>Source Files</Filter> + </CustomBuild> + </ItemGroup> </Project> \ No newline at end of file |
From: <mar...@us...> - 2013-08-09 12:16:36
|
Revision: 6315 http://sourceforge.net/p/freeorion/code/6315 Author: marcel_metz Date: 2013-08-09 12:16:33 +0000 (Fri, 09 Aug 2013) Log Message: ----------- Disabled link.exe automatic internal error reporting to microsoft to reduce msbuild noise. Modified Paths: -------------- trunk/FreeOrion/msvc2010/Common/Common.vcxproj trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj trunk/FreeOrion/msvc2010/OIS/OIS.vcxproj trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj Modified: trunk/FreeOrion/msvc2010/Common/Common.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Common/Common.vcxproj 2013-08-09 11:04:23 UTC (rev 6314) +++ trunk/FreeOrion/msvc2010/Common/Common.vcxproj 2013-08-09 12:16:33 UTC (rev 6315) @@ -57,6 +57,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> <CustomBuildStep> <Command> @@ -93,6 +94,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> <CustomBuildStep> <Command> Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2013-08-09 11:04:23 UTC (rev 6314) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2013-08-09 12:16:33 UTC (rev 6315) @@ -55,6 +55,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -89,7 +90,7 @@ <LinkStatus> </LinkStatus> <RandomizedBaseAddress>false</RandomizedBaseAddress> - <LinkErrorReporting>SendErrorReport</LinkErrorReporting> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> <IgnoreSpecificDefaultLibraries>LIBCMT; LIBCPMT</IgnoreSpecificDefaultLibraries> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2013-08-09 11:04:23 UTC (rev 6314) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2013-08-09 12:16:33 UTC (rev 6315) @@ -55,6 +55,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -87,7 +88,7 @@ <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/;../../</AdditionalLibraryDirectories> <AdditionalDependencies>Common.lib;Parsers.lib;log4cpp.lib;python27.lib;boost_python-vc100-mt-1_51.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> <RandomizedBaseAddress>false</RandomizedBaseAddress> - <LinkErrorReporting>SendErrorReport</LinkErrorReporting> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> </ItemDefinitionGroup> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2013-08-09 11:04:23 UTC (rev 6314) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2013-08-09 12:16:33 UTC (rev 6315) @@ -55,6 +55,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -87,7 +88,7 @@ <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/;../../</AdditionalLibraryDirectories> <AdditionalDependencies>Common.lib;Parsers.lib;log4cpp.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> <RandomizedBaseAddress>false</RandomizedBaseAddress> - <LinkErrorReporting>SendErrorReport</LinkErrorReporting> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> </ItemDefinitionGroup> Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2013-08-09 11:04:23 UTC (rev 6314) +++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2013-08-09 12:16:33 UTC (rev 6315) @@ -175,6 +175,7 @@ <OutputFile>../../GiGi.dll</OutputFile> <AdditionalLibraryDirectories>../../../lib;../../../Boost/lib/</AdditionalLibraryDirectories> <LinkStatus>false</LinkStatus> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -213,6 +214,7 @@ <AdditionalDependencies>opengl32.lib;glu32.lib;freetype244MT.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies> <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> Modified: trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj 2013-08-09 11:04:23 UTC (rev 6314) +++ trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj 2013-08-09 12:16:33 UTC (rev 6315) @@ -47,6 +47,7 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <LinkErrorReporting>SendErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -82,6 +83,7 @@ <LinkStatus> </LinkStatus> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj 2013-08-09 11:04:23 UTC (rev 6314) +++ trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj 2013-08-09 12:16:33 UTC (rev 6315) @@ -47,6 +47,7 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -80,6 +81,7 @@ <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries> <SubSystem>Console</SubSystem> <RandomizedBaseAddress>false</RandomizedBaseAddress> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> </Link> </ItemDefinitionGroup> Modified: trunk/FreeOrion/msvc2010/OIS/OIS.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/OIS/OIS.vcxproj 2013-08-09 11:04:23 UTC (rev 6314) +++ trunk/FreeOrion/msvc2010/OIS/OIS.vcxproj 2013-08-09 12:16:33 UTC (rev 6315) @@ -48,6 +48,7 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -72,6 +73,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <AdditionalDependencies>dinput8.lib;%(AdditionalDependencies)</AdditionalDependencies> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <ItemGroup> Modified: trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj 2013-08-09 11:04:23 UTC (rev 6314) +++ trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj 2013-08-09 12:16:33 UTC (rev 6315) @@ -55,6 +55,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -88,7 +89,7 @@ <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/;../../</AdditionalLibraryDirectories> <OutputFile>../../Parsers.dll</OutputFile> <RandomizedBaseAddress>false</RandomizedBaseAddress> - <LinkErrorReporting>SendErrorReport</LinkErrorReporting> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> <AdditionalDependencies>GiGi.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Lib> Modified: trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj 2013-08-09 11:04:23 UTC (rev 6314) +++ trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj 2013-08-09 12:16:33 UTC (rev 6315) @@ -52,6 +52,7 @@ <Link> <SubSystem>Windows</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -81,6 +82,7 @@ <OutputFile>../../log4cpp.dll</OutputFile> <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> <AdditionalLibraryDirectories>../../../Boost/lib/</AdditionalLibraryDirectories> + <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> <Lib> <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration> |
From: <mar...@us...> - 2013-08-09 16:16:32
|
Revision: 6317 http://sourceforge.net/p/freeorion/code/6317 Author: marcel_metz Date: 2013-08-09 16:16:29 +0000 (Fri, 09 Aug 2013) Log Message: ----------- Added definitions to msvc for determining the minimal win32 api version. Modified Paths: -------------- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2013-08-09 15:10:56 UTC (rev 6316) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2013-08-09 16:16:29 UTC (rev 6317) @@ -50,7 +50,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0501;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -65,7 +65,7 @@ <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_HUMAN;FREEORION_WIN32;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;LOG4CPP_STLPORT_AND_BOOST_BUILD</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_HUMAN;FREEORION_WIN32;_WIN32_WINNT=0x0501;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;LOG4CPP_STLPORT_AND_BOOST_BUILD</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_51/;../../GG/;../include/;../../../include/OGRE/;../../../include/bullet/;../../../include/zlib/;../../../include/AL/;../../OIS/;../../PagedGeometry/include/;../../OpenSteer/include/</AdditionalIncludeDirectories> <RuntimeTypeInfo>true</RuntimeTypeInfo> <PrecompiledHeaderFile> Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2013-08-09 15:10:56 UTC (rev 6316) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2013-08-09 16:16:29 UTC (rev 6317) @@ -50,7 +50,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -65,7 +65,7 @@ <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_AI;FREEORION_WIN32;GiGi_EXPORTS;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;LOG4CPP_STLPORT_AND_BOOST_BUILD</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0501;FREEORION_BUILD_AI;FREEORION_WIN32;GiGi_EXPORTS;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;LOG4CPP_STLPORT_AND_BOOST_BUILD</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_51/;../../GG/;../../../include/Python27/;../../../include/zlib/;../../OpenSteer/include/</AdditionalIncludeDirectories> <PrecompiledHeaderFile> </PrecompiledHeaderFile> Modified: trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2013-08-09 15:10:56 UTC (rev 6316) +++ trunk/FreeOrion/msvc2010/FreeOrionD/FreeOrionD.vcxproj 2013-08-09 16:16:29 UTC (rev 6317) @@ -50,7 +50,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -65,7 +65,7 @@ <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;FREEORION_BUILD_SERVER;FREEORION_WIN32;GiGi_EXPORTS;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;LOG4CPP_STLPORT_AND_BOOST_BUILD</PreprocessorDefinitions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0501;FREEORION_BUILD_SERVER;FREEORION_WIN32;GiGi_EXPORTS;_DLL;BOOST_ALL_DYN_LINK;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;LOG4CPP_STLPORT_AND_BOOST_BUILD</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../log4cpp/;../../../include/;../../../Boost/include/boost_1_51/;../../GG/;../../../include/zlib/;../../OpenSteer/include/</AdditionalIncludeDirectories> <PrecompiledHeaderFile> </PrecompiledHeaderFile> |
From: <mar...@us...> - 2013-08-10 17:37:15
|
Revision: 6320 http://sourceforge.net/p/freeorion/code/6320 Author: marcel_metz Date: 2013-08-10 17:37:12 +0000 (Sat, 10 Aug 2013) Log Message: ----------- Removed linking of default libraries with MSVC to reduce linking time. Modified Paths: -------------- trunk/FreeOrion/msvc2010/Common/Common.vcxproj trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj trunk/FreeOrion/msvc2010/OIS/OIS.vcxproj trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj Modified: trunk/FreeOrion/msvc2010/Common/Common.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Common/Common.vcxproj 2013-08-10 09:25:06 UTC (rev 6319) +++ trunk/FreeOrion/msvc2010/Common/Common.vcxproj 2013-08-10 17:37:12 UTC (rev 6320) @@ -88,6 +88,7 @@ <PrecompiledHeaderOutputFile> </PrecompiledHeaderOutputFile> <DisableSpecificWarnings>4275;4244;4251;4351</DisableSpecificWarnings> + <AdditionalDependencies></AdditionalDependencies> </ClCompile> <Link> <SubSystem>Windows</SubSystem> Modified: trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2013-08-10 09:25:06 UTC (rev 6319) +++ trunk/FreeOrion/msvc2010/FreeOrion/FreeOrion.vcxproj 2013-08-10 17:37:12 UTC (rev 6320) @@ -85,7 +85,7 @@ <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <AdditionalLibraryDirectories>../../../lib/;../../../lib/bullet/;../../../Boost/lib/;../../</AdditionalLibraryDirectories> - <AdditionalDependencies>Common.lib;Parsers.lib;log4cpp.lib;GiGi.lib;GiGiOgre.lib;OgreMain.lib;GiGiOgrePlugin_OIS.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;GiGiOgrePlugin_OIS.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;User32.lib</AdditionalDependencies> <OutputFile>../../FreeOrion.exe</OutputFile> <LinkStatus> </LinkStatus> Modified: trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2013-08-10 09:25:06 UTC (rev 6319) +++ trunk/FreeOrion/msvc2010/FreeOrionCA/FreeOrionCA.vcxproj 2013-08-10 17:37:12 UTC (rev 6320) @@ -86,7 +86,7 @@ <OptimizeReferences>true</OptimizeReferences> <OutputFile>../../FreeOrionCA.exe</OutputFile> <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/;../../</AdditionalLibraryDirectories> - <AdditionalDependencies>Common.lib;Parsers.lib;log4cpp.lib;python27.lib;boost_python-vc100-mt-1_51.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>Common.lib;Parsers.lib;log4cpp.lib;python27.lib;boost_python-vc100-mt-1_51.lib;zlib.lib</AdditionalDependencies> <RandomizedBaseAddress>false</RandomizedBaseAddress> <LinkErrorReporting>NoErrorReport</LinkErrorReporting> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> Modified: trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2013-08-10 09:25:06 UTC (rev 6319) +++ trunk/FreeOrion/msvc2010/GiGi/GiGi.vcxproj 2013-08-10 17:37:12 UTC (rev 6320) @@ -211,7 +211,7 @@ </LinkStatus> <TreatLinkerWarningAsErrors> </TreatLinkerWarningAsErrors> - <AdditionalDependencies>opengl32.lib;glu32.lib;freetype244MT.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>opengl32.lib;glu32.lib;freetype244MT.lib;libpng.lib;User32.lib</AdditionalDependencies> <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries> <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> <LinkErrorReporting>NoErrorReport</LinkErrorReporting> Modified: trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj 2013-08-10 09:25:06 UTC (rev 6319) +++ trunk/FreeOrion/msvc2010/GiGiOgre/GiGiOgre.vcxproj 2013-08-10 17:37:12 UTC (rev 6320) @@ -77,7 +77,7 @@ <OptimizeReferences>true</OptimizeReferences> <OutputFile>../../GiGiOgre.dll</OutputFile> <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/;../../</AdditionalLibraryDirectories> - <AdditionalDependencies>OgreMain.lib;GiGi.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>OgreMain.lib;GiGi.lib;opengl32.lib</AdditionalDependencies> <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries> <SubSystem>Console</SubSystem> <LinkStatus> Modified: trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj 2013-08-10 09:25:06 UTC (rev 6319) +++ trunk/FreeOrion/msvc2010/GiGiOgrePlugin_OIS/GiGiOgrePlugin_OIS.vcxproj 2013-08-10 17:37:12 UTC (rev 6320) @@ -77,7 +77,7 @@ <OptimizeReferences>true</OptimizeReferences> <OutputFile>../../GiGiOgrePlugin_OIS.dll</OutputFile> <AdditionalLibraryDirectories>../../../lib/;../../../Boost/lib/;../../</AdditionalLibraryDirectories> - <AdditionalDependencies>GiGi.lib;GiGiOgre.lib;OgreMain.lib;OIS.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>GiGi.lib;GiGiOgre.lib;OgreMain.lib;OIS.lib;User32.lib</AdditionalDependencies> <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries> <SubSystem>Console</SubSystem> <RandomizedBaseAddress>false</RandomizedBaseAddress> Modified: trunk/FreeOrion/msvc2010/OIS/OIS.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/OIS/OIS.vcxproj 2013-08-10 09:25:06 UTC (rev 6319) +++ trunk/FreeOrion/msvc2010/OIS/OIS.vcxproj 2013-08-10 17:37:12 UTC (rev 6320) @@ -72,7 +72,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>dinput8.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>dinput8.lib;User32.lib</AdditionalDependencies> <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> </ItemDefinitionGroup> Modified: trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj 2013-08-10 09:25:06 UTC (rev 6319) +++ trunk/FreeOrion/msvc2010/Parsers/Parsers.vcxproj 2013-08-10 17:37:12 UTC (rev 6320) @@ -90,7 +90,7 @@ <OutputFile>../../Parsers.dll</OutputFile> <RandomizedBaseAddress>false</RandomizedBaseAddress> <LinkErrorReporting>NoErrorReport</LinkErrorReporting> - <AdditionalDependencies>GiGi.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies></AdditionalDependencies> </Link> <Lib> <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> Modified: trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj =================================================================== --- trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj 2013-08-10 09:25:06 UTC (rev 6319) +++ trunk/FreeOrion/msvc2010/log4cpp/log4cpp.vcxproj 2013-08-10 17:37:12 UTC (rev 6320) @@ -51,6 +51,7 @@ </ClCompile> <Link> <SubSystem>Windows</SubSystem> + <AdditionalDependencies></AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <LinkErrorReporting>NoErrorReport</LinkErrorReporting> </Link> |