Merge

Wed, 22 Dec 2010 12:27:14 -0800

author
ohair
date
Wed, 22 Dec 2010 12:27:14 -0800
changeset 277
4d044e6e1080
parent 276
dc9eb519c6ed
parent 275
4346ba98938b
child 278
c1af03f88627

Merge

README-builds.html file | annotate | diff | comparison | revisions
     1.1 --- a/Makefile	Wed Dec 22 12:25:52 2010 -0800
     1.2 +++ b/Makefile	Wed Dec 22 12:27:14 2010 -0800
     1.3 @@ -456,7 +456,6 @@
     1.4  DEVTOOLS_PATH.desc         = Directory containing zip and gnumake
     1.5  CUPS_HEADERS_PATH.desc     = Include directory location for CUPS header files
     1.6  DXSDK_PATH.desc            = Root directory of DirectX SDK
     1.7 -MSDEVTOOLS_PATH.desc       = Root directory of VC++ tools (e.g. rc.exe)
     1.8  MSVCRT_DLL_PATH.desc       = Directory containing mscvrt.dll
     1.9  
    1.10  # Make variables to print out (description and value)
    1.11 @@ -487,12 +486,10 @@
    1.12  
    1.13  VARIABLE_PRINTVAL_LIST +=       \
    1.14      DXSDK_PATH                  \
    1.15 -    MSDEVTOOLS_PATH             \
    1.16      MSVCRT_DLL_PATH
    1.17  
    1.18  VARIABLE_CHECKDIR_LIST +=       \
    1.19      DXSDK_PATH                  \
    1.20 -    MSDEVTOOLS_PATH             \
    1.21      MSVCRT_DLL_PATH
    1.22  
    1.23  endif
     2.1 --- a/README-builds.html	Wed Dec 22 12:25:52 2010 -0800
     2.2 +++ b/README-builds.html	Wed Dec 22 12:27:14 2010 -0800
     2.3 @@ -1728,13 +1728,16 @@
     2.4                  <dt><strong>Windows specific:</strong></dt>
     2.5                  <dd>
     2.6                      <dl>
     2.7 -                        <dt><a name="ALT_MSDEVTOOLS_PATH"><tt>ALT_MSDEVTOOLS_PATH</tt></a> </dt>
     2.8 +                        <dt><a name="ALT_WINDOWSSDKDIR"><tt>ALT_WINDOWSSDKDIR</tt></a> </dt>
     2.9                          <dd>
    2.10                              The location of the 
    2.11 -                            Microsoft Visual Studio
    2.12 -                            tools 'bin' directory.
    2.13 -                            The default is usually derived from
    2.14 -                            <a href="#ALT_COMPILER_PATH"><tt>ALT_COMPILER_PATH</tt></a>.
    2.15 +                            Microsoft Windows SDK where some tools will be
    2.16 +			    located.
    2.17 +			    The default is whatever WINDOWSSDKDIR is set to
    2.18 +			    (or WindowsSdkDir) or the path
    2.19 +			    <pre>
    2.20 +                            c:\Program Files\Microsoft SDKs\Windows\v6.1a
    2.21 +			    </pre>
    2.22                          </dd>
    2.23                          <dt><tt><a name="ALT_DXSDK_PATH">ALT_DXSDK_PATH</a></tt> </dt>
    2.24                          <dd>

mercurial