games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-29 21:56:54 +02:00
Code Issues Releases Activity

Project finally compiles.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
launcher/VCMI_launcher.vcxproj
View File

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

2
lib/filesystem/CCompressedStream.h
View File

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