mirror of
				https://github.com/vcmi/vcmi.git
				synced 2025-10-31 00:07:39 +02:00 
			
		
		
		
	Major overhaul of VS related files
This commit is contained in:
		| @@ -21,6 +21,7 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{C0300513-E845-43B4-9A4F-E8817EAEF57C}</ProjectGuid> | ||||
|     <RootNamespace>BattleAI</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| @@ -40,7 +41,7 @@ | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <PlatformToolset>v140_xp</PlatformToolset> | ||||
|     <PlatformToolset>v140</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
| @@ -80,7 +81,7 @@ | ||||
|     <OutDir>$(VCMI_Out)\AI\</OutDir> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'"> | ||||
|     <OutDir>..</OutDir> | ||||
|     <OutDir>$(VCMI_Out)/AI</OutDir> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'"> | ||||
|     <OutDir>$(VCMI_Out)\AI\</OutDir> | ||||
| @@ -112,12 +113,11 @@ | ||||
|     <ClCompile> | ||||
|       <PrecompiledHeader>Use</PrecompiledHeader> | ||||
|       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> | ||||
|       <AdditionalOptions>/Zm159 %(AdditionalOptions)</AdditionalOptions> | ||||
|       <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
|       <AdditionalDependencies>VCMI_lib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|       <AdditionalLibraryDirectories>..\..\..\libs;..\..</AdditionalLibraryDirectories> | ||||
|       <AdditionalLibraryDirectories>$(VCMI_Out)</AdditionalLibraryDirectories> | ||||
|     </Link> | ||||
|   </ItemDefinitionGroup> | ||||
|   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'"> | ||||
|   | ||||
| @@ -35,6 +35,7 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{C41C4EB6-6F74-4F37-9FB0-9FA6BF377837}</ProjectGuid> | ||||
|     <RootNamespace>EmptyAI</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| @@ -54,7 +55,7 @@ | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <PlatformToolset>v140_xp</PlatformToolset> | ||||
|     <PlatformToolset>v140</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
| @@ -96,7 +97,7 @@ | ||||
|     <OutDir>$(VCMI_Out)\AI\</OutDir> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'"> | ||||
|     <OutDir>..</OutDir> | ||||
|     <OutDir>$(VCMI_Out)/AI</OutDir> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'"> | ||||
|     <OutDir>$(VCMI_Out)\AI\</OutDir> | ||||
| @@ -143,7 +144,6 @@ | ||||
|       <PrecompiledHeader>Use</PrecompiledHeader> | ||||
|       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> | ||||
|       <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
|       <AdditionalOptions>/Zm130 %(AdditionalOptions)</AdditionalOptions> | ||||
|       <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
| @@ -152,7 +152,7 @@ | ||||
|       <OptimizeReferences>true</OptimizeReferences> | ||||
|       <AdditionalDependencies>VCMI_lib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|       <OutputFile>$(OutDir)EmptyAI.dll</OutputFile> | ||||
|       <AdditionalLibraryDirectories>..\..\..\libs;..\..</AdditionalLibraryDirectories> | ||||
|       <AdditionalLibraryDirectories>$(VCMI_Out)</AdditionalLibraryDirectories> | ||||
|     </Link> | ||||
|   </ItemDefinitionGroup> | ||||
|   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'"> | ||||
|   | ||||
| @@ -21,6 +21,7 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{15DABC90-234A-4B6B-9EEB-777C4768B82B}</ProjectGuid> | ||||
|     <RootNamespace>StupidAI</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| @@ -40,7 +41,7 @@ | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <PlatformToolset>v140_xp</PlatformToolset> | ||||
|     <PlatformToolset>v140</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
| @@ -80,7 +81,7 @@ | ||||
|     <OutDir>$(VCMI_Out)\AI\</OutDir> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'"> | ||||
|     <OutDir>..</OutDir> | ||||
|     <OutDir>$(VCMI_Out)/AI</OutDir> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'"> | ||||
|     <OutDir>$(VCMI_Out)\AI\</OutDir> | ||||
| @@ -111,12 +112,11 @@ | ||||
|     <ClCompile> | ||||
|       <PrecompiledHeader>Use</PrecompiledHeader> | ||||
|       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> | ||||
|       <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions> | ||||
|       <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
|       <AdditionalDependencies>VCMI_lib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|       <AdditionalLibraryDirectories>..\..\..\libs;..\..</AdditionalLibraryDirectories> | ||||
|       <AdditionalLibraryDirectories>$(VCMI_Out)</AdditionalLibraryDirectories> | ||||
|     </Link> | ||||
|   </ItemDefinitionGroup> | ||||
|   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'"> | ||||
|   | ||||
| @@ -21,6 +21,7 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{276C3DB0-7A6B-4417-8E5C-322B08633AAC}</ProjectGuid> | ||||
|     <RootNamespace>StupidAI</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| @@ -40,7 +41,7 @@ | ||||
|     <UseDebugLibraries>false</UseDebugLibraries> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <PlatformToolset>v140_xp</PlatformToolset> | ||||
|     <PlatformToolset>v140</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
| @@ -80,7 +81,7 @@ | ||||
|     <OutDir>$(VCMI_Out)\AI\</OutDir> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'"> | ||||
|     <OutDir>..</OutDir> | ||||
|     <OutDir>$(VCMI_Out)/AI</OutDir> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'"> | ||||
|     <OutDir>$(VCMI_Out)\AI\</OutDir> | ||||
| @@ -112,15 +113,14 @@ | ||||
|   </ItemDefinitionGroup> | ||||
|   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'"> | ||||
|     <ClCompile> | ||||
|       <AdditionalIncludeDirectories>$(FUZZYLITEDIR)</AdditionalIncludeDirectories> | ||||
|       <AdditionalIncludeDirectories>..\FuzzyLite\fuzzylite</AdditionalIncludeDirectories> | ||||
|       <PrecompiledHeader>Use</PrecompiledHeader> | ||||
|       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> | ||||
|       <AdditionalOptions>/Zm199 %(AdditionalOptions)</AdditionalOptions> | ||||
|       <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
|       <AdditionalDependencies>VCMI_lib.lib;FuzzyLite.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|       <AdditionalLibraryDirectories>..\..\..\libs;..\..;..</AdditionalLibraryDirectories> | ||||
|       <AdditionalLibraryDirectories>$(VCMI_Out);$(SolutionDir)\AI</AdditionalLibraryDirectories> | ||||
|     </Link> | ||||
|   </ItemDefinitionGroup> | ||||
|   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'"> | ||||
|   | ||||
| @@ -1,9 +1,6 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||||
|   <ImportGroup Label="PropertySheets" /> | ||||
|   <PropertyGroup Label="UserMacros"> | ||||
|     <VCMI_Out>$(SolutionDir)</VCMI_Out> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup /> | ||||
|   <ItemDefinitionGroup> | ||||
|     <ClCompile> | ||||
| @@ -13,10 +10,4 @@ | ||||
|       <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
|     </Link> | ||||
|   </ItemDefinitionGroup> | ||||
|   <ItemGroup> | ||||
|     <BuildMacro Include="VCMI_Out"> | ||||
|       <Value>$(VCMI_Out)</Value> | ||||
|       <EnvironmentVariable>true</EnvironmentVariable> | ||||
|     </BuildMacro> | ||||
|   </ItemGroup> | ||||
| </Project> | ||||
| @@ -1,9 +1,6 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||||
|   <ImportGroup Label="PropertySheets" /> | ||||
|   <PropertyGroup Label="UserMacros"> | ||||
|     <VCMI_Out>C:\Temp\RD</VCMI_Out> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup /> | ||||
|   <ItemDefinitionGroup> | ||||
|     <ClCompile> | ||||
| @@ -29,9 +26,4 @@ | ||||
|       <GenerateDebugInformation>true</GenerateDebugInformation> | ||||
|     </Link> | ||||
|   </ItemDefinitionGroup> | ||||
|   <ItemGroup> | ||||
|     <BuildMacro Include="VCMI_Out"> | ||||
|       <Value>$(VCMI_Out)</Value> | ||||
|     </BuildMacro> | ||||
|   </ItemGroup> | ||||
| </Project> | ||||
| @@ -2,7 +2,8 @@ | ||||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||||
|   <ImportGroup Label="PropertySheets" /> | ||||
|   <PropertyGroup Label="UserMacros"> | ||||
|     <QTDIR>C:\Qt\Qt5.1.0-32-no-opengl\5.1.0\msvc2012\</QTDIR> | ||||
|     <QTDIR>D:\Program files co nie\Qt\5.9.1\msvc2015\</QTDIR> | ||||
|     <VCMI_Out>D:\VCMI\vcmi_devversion</VCMI_Out> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup /> | ||||
|   <ItemDefinitionGroup /> | ||||
| @@ -10,5 +11,9 @@ | ||||
|     <BuildMacro Include="QTDIR"> | ||||
|       <Value>$(QTDIR)</Value> | ||||
|     </BuildMacro> | ||||
|     <BuildMacro Include="VCMI_Out"> | ||||
|       <Value>$(VCMI_Out)</Value> | ||||
|       <EnvironmentVariable>true</EnvironmentVariable> | ||||
|     </BuildMacro> | ||||
|   </ItemGroup> | ||||
| </Project> | ||||
| @@ -21,13 +21,14 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}</ProjectGuid> | ||||
|     <RootNamespace>VCMI_client</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
|     <CharacterSet>Unicode</CharacterSet> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <PlatformToolset>v140_xp</PlatformToolset> | ||||
|     <PlatformToolset>v140</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
| @@ -75,7 +76,7 @@ | ||||
|     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCMI_Out)</OutDir> | ||||
|     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> | ||||
|     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir> | ||||
|     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">..</OutDir> | ||||
|     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(VCMI_Out)</OutDir> | ||||
|     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(VCMI_Out)</OutDir> | ||||
|     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(Configuration)\</IntDir> | ||||
|     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(Configuration)\</IntDir> | ||||
| @@ -141,7 +142,8 @@ | ||||
|     <ClCompile> | ||||
|       <PrecompiledHeader>Use</PrecompiledHeader> | ||||
|       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> | ||||
|       <AdditionalOptions>/MP4 /Zm150</AdditionalOptions> | ||||
|       <AdditionalOptions> | ||||
|       </AdditionalOptions> | ||||
|       <AdditionalIncludeDirectories>$(FFMPEGDIR);$(SDLDIR);$(BOOSTDIR);$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||||
|       <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||||
|     </ClCompile> | ||||
| @@ -151,7 +153,7 @@ | ||||
|       <LinkTimeCodeGeneration> | ||||
|       </LinkTimeCodeGeneration> | ||||
|       <ShowProgress>NotSet</ShowProgress> | ||||
|       <AdditionalLibraryDirectories>$(FFMPEGDIR)\lib;.;..\..\libs;..</AdditionalLibraryDirectories> | ||||
|       <AdditionalLibraryDirectories>$(VCMI_Out)</AdditionalLibraryDirectories> | ||||
|       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> | ||||
|       <OptimizeReferences>true</OptimizeReferences> | ||||
|       <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions> | ||||
|   | ||||
| @@ -14,6 +14,7 @@ | ||||
|     <ProjectGuid>{5B6946C8-A24F-4223-8415-5E16A238ACED}</ProjectGuid> | ||||
|     <Keyword>Win32Proj</Keyword> | ||||
|     <RootNamespace>VCMI_launcher</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||||
| @@ -50,11 +51,11 @@ | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'"> | ||||
|     <LinkIncremental> | ||||
|     </LinkIncremental> | ||||
|     <IncludePath>.\GeneratedFiles;D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtGui;D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtCore;D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtANGLE;D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtWidgets;D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include;$(IncludePath)</IncludePath> | ||||
|     <IncludePath>$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;.\GeneratedFiles;$(IncludePath)</IncludePath> | ||||
|     <CustomBuildBeforeTargets> | ||||
|     </CustomBuildBeforeTargets> | ||||
|     <LibraryPath>D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\lib;$(LibraryPath)</LibraryPath> | ||||
|     <OutDir>..</OutDir> | ||||
|     <LibraryPath>$(QTDIR)\lib;$(LibraryPath)</LibraryPath> | ||||
|     <OutDir>$(VCMI_Out)</OutDir> | ||||
|   </PropertyGroup> | ||||
|   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||||
|     <ClCompile> | ||||
| @@ -73,13 +74,12 @@ | ||||
|       <PrecompiledHeader>Use</PrecompiledHeader> | ||||
|       <Optimization>Full</Optimization> | ||||
|       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> | ||||
|       <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions> | ||||
|       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
|       <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
|       <AdditionalDependencies>VCMI_lib.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Network.lib;SDL2.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|       <AdditionalLibraryDirectories>..\..\libs;..</AdditionalLibraryDirectories> | ||||
|       <AdditionalLibraryDirectories>$(VCMI_Out)</AdditionalLibraryDirectories> | ||||
|     </Link> | ||||
|     <CustomBuildStep> | ||||
|       <Command> | ||||
| @@ -133,10 +133,10 @@ | ||||
|       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Calling D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe for %(Filename) file...</Message> | ||||
|       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> | ||||
|       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fStdInc.h" "-f..\..\%(RecursiveDir)%(Filename).h"  -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtCore" "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtGui" "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtWidgets" "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtSvg"</Command> | ||||
|       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe;%(FullPath)</AdditionalInputs> | ||||
|       <Message Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Calling D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe for %(Filename) file...</Message> | ||||
|       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs> | ||||
|       <Message Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Calling $(QTDIR)\bin\moc.exe for %(Filename) file...</Message> | ||||
|       <Outputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> | ||||
|       <Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">"D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fStdInc.h" "-f..\..\%(RecursiveDir)%(Filename).h"  -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtCore" "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtGui" "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtWidgets" "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtSvg"</Command> | ||||
|       <Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fStdInc.h" "-f..\..\%(RecursiveDir)%(Filename).h"  -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-IC:\Qt\Qt5.8.0\5.8\msvc2015\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-IC:\Qt\Qt5.8.0\5.8\msvc2015\include\QtCore" "-IC:\Qt\Qt5.8.0\5.8\msvc2015\include\QtGui" "-IC:\Qt\Qt5.8.0\5.8\msvc2015\include\QtWidgets" "-IC:\Qt\Qt5.8.0\5.8\msvc2015\include\QtSvg"</Command> | ||||
|       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RD|x64'">D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe;%(FullPath)</AdditionalInputs> | ||||
|       <Message Condition="'$(Configuration)|$(Platform)'=='RD|x64'">Calling D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe for %(Filename) file...</Message> | ||||
|       <Outputs Condition="'$(Configuration)|$(Platform)'=='RD|x64'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs> | ||||
| @@ -153,10 +153,10 @@ | ||||
|       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Uic%27ing %(Identity)...</Message> | ||||
|       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs> | ||||
|       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command> | ||||
|       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs> | ||||
|       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(QTDIR)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs> | ||||
|       <Message Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Uic%27ing %(Identity)...</Message> | ||||
|       <Outputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs> | ||||
|       <Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">"D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command> | ||||
|       <Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"</Command> | ||||
|       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RD|x64'">D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs> | ||||
|       <Message Condition="'$(Configuration)|$(Platform)'=='RD|x64'">Uic%27ing %(Identity)...</Message> | ||||
|       <Outputs Condition="'$(Configuration)|$(Platform)'=='RD|x64'">.\GeneratedFiles\ui_%(Filename).h;%(Outputs)</Outputs> | ||||
|   | ||||
| @@ -21,13 +21,14 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{B952FFC5-3039-4DE1-9F08-90ACDA483D8F}</ProjectGuid> | ||||
|     <RootNamespace>VCMI_lib</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
|     <CharacterSet>Unicode</CharacterSet> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <PlatformToolset>v140_xp</PlatformToolset> | ||||
|     <PlatformToolset>v140</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>DynamicLibrary</ConfigurationType> | ||||
| @@ -76,7 +77,7 @@ | ||||
|     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCMI_Out)</OutDir> | ||||
|     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> | ||||
|     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir> | ||||
|     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">..</OutDir> | ||||
|     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(VCMI_Out)</OutDir> | ||||
|     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(VCMI_Out)</OutDir> | ||||
|     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(Configuration)\</IntDir> | ||||
|     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(Configuration)\</IntDir> | ||||
| @@ -135,7 +136,7 @@ | ||||
|   </ItemDefinitionGroup> | ||||
|   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'"> | ||||
|     <ClCompile> | ||||
|       <AdditionalOptions>/Oy- /bigobj /Zm150 </AdditionalOptions> | ||||
|       <AdditionalOptions>/Oy- /bigobj</AdditionalOptions> | ||||
|       <PreprocessorDefinitions>VCMI_DLL;VCMI_NO_EXTRA_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||||
|       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> | ||||
|       <PrecompiledHeader>Use</PrecompiledHeader> | ||||
|   | ||||
| @@ -21,13 +21,14 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{8AF697C3-465E-4910-B31B-576A9ECDB309}</ProjectGuid> | ||||
|     <RootNamespace>VCMI_server</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
|     <CharacterSet>MultiByte</CharacterSet> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <PlatformToolset>v140_xp</PlatformToolset> | ||||
|     <PlatformToolset>v140</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
| @@ -75,7 +76,7 @@ | ||||
|     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCMI_Out)</OutDir> | ||||
|     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> | ||||
|     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir> | ||||
|     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">..</OutDir> | ||||
|     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(VCMI_Out)</OutDir> | ||||
|     <OutDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(VCMI_Out)</OutDir> | ||||
|     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(Configuration)\</IntDir> | ||||
|     <IntDir Condition="'$(Configuration)|$(Platform)'=='RD|x64'">$(Configuration)\</IntDir> | ||||
| @@ -124,7 +125,7 @@ | ||||
|   </ItemDefinitionGroup> | ||||
|   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'"> | ||||
|     <ClCompile> | ||||
|       <AdditionalOptions>/Oy- %(AdditionalOptions)/Zm200</AdditionalOptions> | ||||
|       <AdditionalOptions>/Oy- %(AdditionalOptions)</AdditionalOptions> | ||||
|       <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> | ||||
|       <PrecompiledHeader>Use</PrecompiledHeader> | ||||
|       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> | ||||
| @@ -132,7 +133,7 @@ | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
|       <AdditionalDependencies>VCMI_lib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||||
|       <AdditionalLibraryDirectories>..\..\libs;..</AdditionalLibraryDirectories> | ||||
|       <AdditionalLibraryDirectories>$(VCMI_Out)</AdditionalLibraryDirectories> | ||||
|     </Link> | ||||
|   </ItemDefinitionGroup> | ||||
|   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'"> | ||||
|   | ||||
| @@ -21,13 +21,14 @@ | ||||
|   <PropertyGroup Label="Globals"> | ||||
|     <ProjectGuid>{BA25F3F0-EB87-4164-AAB9-073C50A3557A}</ProjectGuid> | ||||
|     <RootNamespace>VCMI_client</RootNamespace> | ||||
|     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||||
|   </PropertyGroup> | ||||
|   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
|     <CharacterSet>Unicode</CharacterSet> | ||||
|     <WholeProgramOptimization>true</WholeProgramOptimization> | ||||
|     <PlatformToolset>v140_xp</PlatformToolset> | ||||
|     <PlatformToolset>v140</PlatformToolset> | ||||
|   </PropertyGroup> | ||||
|   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'" Label="Configuration"> | ||||
|     <ConfigurationType>Application</ConfigurationType> | ||||
| @@ -133,7 +134,8 @@ | ||||
|     <ClCompile> | ||||
|       <PrecompiledHeader>Use</PrecompiledHeader> | ||||
|       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> | ||||
|       <AdditionalOptions>/MP4 /Zm150</AdditionalOptions> | ||||
|       <AdditionalOptions> | ||||
|       </AdditionalOptions> | ||||
|       <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||||
|     </ClCompile> | ||||
|     <Link> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user