Changes between Version 39 and Version 40 of BuildingUsingGenericBuildsystem

Timestamp:

05/15/12 11:24:03 (12 years ago)

Author:

Samuli Seppänen

Comment:

--

BuildingUsingGenericBuildsystem

@@ -50 +50 @@
 }}}
 
-= Cross-compiling on *NIX ("generic" buildsystem) =
+= Cross-compiling on *NIX ("generic" subdir) =
 
 == Installing prequisites ==
@@ -202 +202 @@
 }}}
 
-
-= Building natively on Windows using the MSVC toolchain ("msvc" buildsystem) =
+= Creating a NSIS installer ("windows-nsis" subdir) =
+
+You can use the scripts in ''openvpn-build/windows-nsis'' to create a [http://nsis.sourceforge.net NSIS] installer for Windows. The scripts use the generic build system to build OpenVPN and it's dependencies (e.g. lzo, openssl), and use [http://sourceforge.net/projects/osslsigncode osslsigncode] for signing the resulting binaries, if requested.
+
+NSIS must be available on system. If installed not in path or standard location set MAKENSIS environment variable. Same goes for OSSLSIGNCODE.
+
+First check out ''openvpn-build'' as described [wiki:BuildingUsingGenericBuildsystem#Checkingoutopenvpn-buildrepository here]. Then do the following:
+
+{{{
+$ cd openvpn-build/windows-nsis
+$ ./build-complete
+}}}
+
+Refer to ./build-complete --help for more options.
+
+'''NOTE:''' To make sure fresh tarballs are used, empty ../generic/sources directory before building.
+
+= Building natively on Windows using the MSVC toolchain ("msvc" subdir) =
 
 == Installing prequisites ==
@@ -265 +281 @@
 }}}
 
-= Creating a NSIS installer =
-
-You can use the scripts in ''openvpn-build/windows-nsis'' to create a [http://nsis.sourceforge.net NSIS] installer for Windows. The scripts use the generic build system to build OpenVPN and it's dependencies (e.g. lzo, openssl), and use [http://sourceforge.net/projects/osslsigncode osslsigncode] for signing the resulting binaries, if requested.
-
-NSIS must be available on system. If installed not in path or standard location set MAKENSIS environment variable. Same goes for OSSLSIGNCODE.
-
-First check out ''openvpn-build'' as described [wiki:BuildingUsingGenericBuildsystem#Checkingoutopenvpn-buildrepository here]. Then do the following:
-
-{{{
-$ cd openvpn-build/windows-nsis
-$ ./build-complete
-}}}
-
-Refer to ./build-complete --help for more options.
-
-'''NOTE:''' To make sure fresh tarballs are used, empty ../generic/sources directory before building.
-
-= TAP-Windows =
+= Building TAP-Windows =
 
 Required software: Recent Windows DDK, [http://nsis.sourceforge.net NSIS].