games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Almost there, linker issues are gone.

Browse Source
This commit is contained in:
DjWarmonger
2013-08-23 08:30:31 +00:00
parent 4be6f131c4
commit 7a1752ef32
2 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
launcher/VCMI_launcher.vcxproj
View File

@@ -88,8 +88,9 @@
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>VCMI_lib.lib;Qt5Core.lib;Qt5Widgets.lib;Qt5Network.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>VCMI_lib.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Network.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\libs;..\..;$(QTDIR)\lib</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\..\libs;..\..;$(QTDIR)\lib</AdditionalLibraryDirectories>
<AdditionalOptions>/ENTRY:"mainCRTStartup" %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
<CustomBuildStep> <CustomBuildStep>
<Command>$(QTDIR)\bin\moc.exe "%(FullPath)" -o "%(RootDir)%(Directory)moc_%(Filename).cpp"</Command> <Command>$(QTDIR)\bin\moc.exe "%(FullPath)" -o "%(RootDir)%(Directory)moc_%(Filename).cpp"</Command>
@@ -110,30 +111,41 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="launcherdirs.h" /> <ClInclude Include="launcherdirs.h" />
<ClInclude Include="mainwindow.h"> <ClInclude Include="modManager\ui_cmodlistview.h" />
<Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(QTDIR)\bin\moc.exe "%(FullPath)" -o "%(RootDir)%(Directory)ui_%(Filename).h"</Command> <ClInclude Include="ui_mainwindow.h" />
<CustomBuild Include="mainwindow.h">
<Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(QTDIR)\bin\moc.exe "%(FullPath)" -o "%(RootDir)%(Directory)moc_%(Filename).cpp"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Compiling %(Filename)%(Extension) using MOC</Message> <Message Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Compiling %(Filename)%(Extension) using MOC</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">%(RootDir)%(Directory)ui_%(Filename).h</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">%(RootDir)%(Directory)moc_%(Filename).cpp</Outputs>
</ClInclude> </CustomBuild>
<ClInclude Include="modManager\cdownloadmanager.h" /> <CustomBuild Include="modManager\cdownloadmanager.h">
<Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(QTDIR)\bin\moc.exe "%(FullPath)" -o "%(RootDir)%(Directory)moc_%(Filename).cpp"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Compiling %(Filename)%(Extension) using MOC</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">%(RootDir)%(Directory)moc_%(Filename).cpp</Outputs>
</CustomBuild>
<ClInclude Include="modManager\cmodlist.h" /> <ClInclude Include="modManager\cmodlist.h" />
<ClInclude Include="modManager\cmodlistmodel.h" /> <CustomBuild Include="modManager\cmodlistmodel.h">
<ClInclude Include="modManager\cmodlistview.h"> <Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(QTDIR)\bin\moc.exe "%(FullPath)" -o "%(RootDir)%(Directory)moc_%(Filename).cpp"</Command>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">false</ExcludedFromBuild>
<Outputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">%(RootDir)%(Directory)ui_%(Filename).h</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).h"</Command> <Outputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">%(RootDir)%(Directory)moc_%(Filename).cpp</Outputs>
</ClInclude> </CustomBuild>
<CustomBuild Include="modManager\cmodlistview.h">
<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)moc_%(Filename).cpp"</Command>
</CustomBuild>
<ClInclude Include="modManager\cmodmanager.h"> <ClInclude Include="modManager\cmodmanager.h">
<Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'"> <Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">
</Command> </Command>
</ClInclude> </ClInclude>
<ClInclude Include="settingsView\csettingsview.h"> <CustomBuild Include="settingsView\csettingsview.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">false</ExcludedFromBuild>
<Outputs Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">%(RootDir)%(Directory)ui_%(Filename).h</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).h"</Command> <Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">$(QTDIR)\bin\moc.exe "%(FullPath)" -o "%(RootDir)%(Directory)moc_%(Filename).cpp"</Command>
</ClInclude> </CustomBuild>
<ClInclude Include="settingsView\ui_csettingsview.h" />
<ClInclude Include="StdInc.h" /> <ClInclude Include="StdInc.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -148,34 +160,35 @@
<Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'"> <Command Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">
</Command> </Command>
</ClCompile> </ClCompile>
<CustomBuild 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>
<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>
<Message Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Compiling %(Filename)%(Extension) using MOC</Message> <Message Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Compiling %(Filename)%(Extension) using MOC</Message>
</CustomBuild> </ClCompile>
<ClCompile Include="modManager\cmodlist.cpp" /> <ClCompile Include="modManager\cmodlist.cpp" />
<CustomBuild Include="modManager\cmodlistmodel.cpp"> <ClCompile Include="modManager\cmodlistmodel.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>
</CustomBuild> </ClCompile>
<CustomBuild Include="modManager\cmodlistview.cpp"> <ClCompile Include="modManager\cmodlistview.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'">
</Command>
</ClCompile>
<ClCompile Include="modManager\cmodmanager.cpp">
<Message Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Compiling %(Filename)%(Extension) using MOC</Message>
</ClCompile>
<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>
</CustomBuild> </ClCompile>
<CustomBuild Include="modManager\cmodmanager.cpp">
<Message Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">Compiling %(Filename)%(Extension) using MOC</Message>
</CustomBuild>
<CustomBuild 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>
</CustomBuild>
<ClCompile Include="StdInc.cpp" /> <ClCompile Include="StdInc.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>