749 changes: 303 additions & 446 deletions lib/ivis_opengl/textdraw.cpp
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/Warzone2100_msvc_2015.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,8 @@ $(Qt5dir)\bin\moc.exe multiint.h -o multiint_moc.h</Command>
<Import Project="..\win32\packages\libiconv.vp.1.14.0.1\build\native\libiconv.vp.targets" Condition="Exists('..\win32\packages\libiconv.vp.1.14.0.1\build\native\libiconv.vp.targets')" />
<Import Project="..\win32\packages\libintl.vp.redist.0.19.8.2\build\native\libintl.vp.redist.targets" Condition="Exists('..\win32\packages\libintl.vp.redist.0.19.8.2\build\native\libintl.vp.redist.targets')" />
<Import Project="..\win32\packages\libintl.vp.0.19.8.2\build\native\libintl.vp.targets" Condition="Exists('..\win32\packages\libintl.vp.0.19.8.2\build\native\libintl.vp.targets')" />
<Import Project="..\win32\packages\freetype2.2.6.0.1\build\native\freetype2.targets" Condition="Exists('..\win32\packages\freetype2.2.6.0.1\build\native\freetype2.targets')" />
<Import Project="..\win32\packages\harfbuzz.0.9.41.1\build\native\harfbuzz.targets" Condition="Exists('..\win32\packages\harfbuzz.0.9.41.1\build\native\harfbuzz.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand All @@ -626,5 +628,7 @@ $(Qt5dir)\bin\moc.exe multiint.h -o multiint_moc.h</Command>
<Error Condition="!Exists('..\win32\packages\libiconv.vp.1.14.0.1\build\native\libiconv.vp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\win32\packages\libiconv.vp.1.14.0.1\build\native\libiconv.vp.targets'))" />
<Error Condition="!Exists('..\win32\packages\libintl.vp.redist.0.19.8.2\build\native\libintl.vp.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\win32\packages\libintl.vp.redist.0.19.8.2\build\native\libintl.vp.redist.targets'))" />
<Error Condition="!Exists('..\win32\packages\libintl.vp.0.19.8.2\build\native\libintl.vp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\win32\packages\libintl.vp.0.19.8.2\build\native\libintl.vp.targets'))" />
<Error Condition="!Exists('..\win32\packages\freetype2.2.6.0.1\build\native\freetype2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\win32\packages\freetype2.2.6.0.1\build\native\freetype2.targets'))" />
<Error Condition="!Exists('..\win32\packages\harfbuzz.0.9.41.1\build\native\harfbuzz.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\win32\packages\harfbuzz.0.9.41.1\build\native\harfbuzz.targets'))" />
</Target>
</Project>
2 changes: 2 additions & 0 deletions src/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<package id="libintl.redist" version="0.18.2.10" targetFramework="native" />
<package id="libintl.vp" version="0.19.8.2" targetFramework="native" />
<package id="libintl.vp.redist" version="0.19.8.2" targetFramework="native" />
<package id="freetype2" version="2.6.0.1" targetFramework="native" />
<package id="harfbuzz" version="0.9.41.1" targetFramework="native" />
<package id="libpng" version="1.6.23.1" targetFramework="native" />
<package id="libpng.redist" version="1.6.23.1" targetFramework="native" />
<package id="openssl" version="1.0.2.0" targetFramework="native" />
Expand Down