1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00

Project finally compiles.

This commit is contained in:
DjWarmonger 2013-08-23 09:19:13 +00:00
parent 7a1752ef32
commit 0c717618c5
2 changed files with 12 additions and 7 deletions

View File

@ -93,18 +93,18 @@
<AdditionalOptions>/ENTRY:"mainCRTStartup" %(AdditionalOptions)</AdditionalOptions>
</Link>
<CustomBuildStep>
<Command>$(QTDIR)\bin\moc.exe "%(FullPath)" -o "%(RootDir)%(Directory)moc_%(Filename).cpp"</Command>
<Command>
</Command>
</CustomBuildStep>
<CustomBuildStep>
<Message>Compiling %(Filename).%(Extension) using MOC</Message>
<Message>
</Message>
</CustomBuildStep>
<CustomBuildStep>
<Outputs>%(RootDir)%(Directory)moc_%(Filename).cpp</Outputs>
<Outputs>
</Outputs>
</CustomBuildStep>
</ItemDefinitionGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<Image Include="small.ico" />
<Image Include="VCMI_launcher.ico" />
@ -160,6 +160,7 @@
<Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">
</Command>
</ClCompile>
<ClCompile Include="moc_mainwindow.cpp" />
<ClCompile Include="modManager\cdownloadmanager.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">false</ExcludedFromBuild>
<Outputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">%(RootDir)%(Directory)moc_%(Filename).cpp</Outputs>
@ -183,12 +184,16 @@
<ClCompile Include="modManager\cmodmanager.cpp">
<Message Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Compiling %(Filename)%(Extension) using MOC</Message>
</ClCompile>
<ClCompile Include="modManager\moc_cdownloadmanager.cpp" />
<ClCompile Include="modManager\moc_cmodlistmodel.cpp" />
<ClCompile Include="modManager\moc_cmodlistview.cpp" />
<ClCompile Include="settingsView\csettingsview.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">false</ExcludedFromBuild>
<Outputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">%(RootDir)%(Directory)moc_%(Filename).cpp</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Compiling %(Filename)%(Extension) using MOC</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(QTDIR)\bin\moc.exe "%(FullPath)" -o "%(RootDir)%(Directory)ui_%(Filename).cpp"</Command>
</ClCompile>
<ClCompile Include="settingsView\moc_csettingsview.cpp" />
<ClCompile Include="StdInc.cpp" />
</ItemGroup>
<ItemGroup>

View File

@ -129,7 +129,7 @@ private:
enum EState
{
ERROR,
ERROR_OCCURED,
INITIALIZED,
IN_PROGRESS,
STREAM_END,