Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
txt2doc run (followup 9b198f1)
  • Loading branch information
jef-n committed Mar 29, 2016
1 parent 755b5b6 commit f7c28f6
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
12 changes: 6 additions & 6 deletions INSTALL
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Friday March 04, 2016
Tuesday March 29, 2016


Last Updated: Friday March 04, 2016
Last Change : Friday March 04, 2016
Last Updated: Tuesday March 29, 2016
Last Change : Tuesday March 29, 2016


1. Introduction
Expand Down Expand Up @@ -443,9 +443,9 @@ and from OSGeo4W (select Advanced Installation):
This will also select packages the above packages depend on.

If you install other packages, this might cause issues. Particularly, make sure
*not* to install the msinttypes package. It installs a stdint.h file
in OsGeo4W[64]\include, that conflicts with Visual Studio own stdint.h, which
for example breaks the build of the virtuallayer provider.
not to install the msinttypes package. It installs a stdint.h file in
OSGeo4W[64]\include, that conflicts with Visual Studio own stdint.h, which for
example breaks the build of the virtuallayer provider.

Earlier versions of this document also covered how to build all above
dependencies. If you're interested in that, check the history of this page in the Wiki
Expand Down
13 changes: 9 additions & 4 deletions doc/INSTALL.html
Expand Up @@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Friday March 04, 2016</H3>
<H3>Tuesday March 29, 2016</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Friday March 04, 2016
Last Change : Friday March 04, 2016
Last Updated: Tuesday March 29, 2016
Last Change : Tuesday March 29, 2016
</P>
<DIV CLASS="toc">

Expand Down Expand Up @@ -705,6 +705,11 @@ <H3>4.1.2. Other tools and dependencies</H3>
<P></P>
This will also select packages the above packages depend on.
<P></P>
If you install other packages, this might cause issues. Particularly, make sure
<B>not</B> to install the msinttypes package. It installs a stdint.h file in
OSGeo4W[64]\include, that conflicts with Visual Studio own stdint.h, which for
example breaks the build of the virtuallayer provider.
<P></P>
Earlier versions of this document also covered how to build all above
dependencies. If you're interested in that, check the history of this page in the Wiki
or the SVN repository.
Expand Down Expand Up @@ -2979,5 +2984,5 @@ <H1>9. Authors and Acknowledgments</H1>

</DIV>
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
<!-- cmdline: txt2tags -o/home/fischer/src/qgis/debian/build-master-debug/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
<!-- cmdline: txt2tags -o/home/fischer/src/qgis/debian/build-master-pyqtwrapper-qt5/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
</BODY></HTML>
5 changes: 5 additions & 0 deletions doc/msvc.t2t
Expand Up @@ -56,6 +56,11 @@ and from OSGeo4W (select //Advanced Installation//):

This will also select packages the above packages depend on.

If you install other packages, this might cause issues. Particularly, make sure
**not** to install the msinttypes package. It installs a stdint.h file in
OSGeo4W[64]\include, that conflicts with Visual Studio own stdint.h, which for
example breaks the build of the virtuallayer provider.

Earlier versions of this document also covered how to build all above
dependencies. If you're interested in that, check the history of this page in the Wiki
or the SVN repository.
Expand Down

0 comments on commit f7c28f6

Please sign in to comment.