Changeset 14898

Show
Ignore:
Timestamp:
07/12/08 08:18:47 (5 months ago)
Author:
mloskot
Message:

makegdal_gen.bat: Added support for setting MSVC_VER flag depending on requested version of Visual C++.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/makegdal_gen.bat

    r14896 r14898  
    4848 
    4949set _vcver_=%1 
     50set _clver_=1310 
     51 
     52if "%_vcver_%"=="6.00" ( 
     53        set _clver_=1200 
     54) 
     55if "%_vcver_%"=="7.00" ( 
     56        set _clver_=1300 
     57) 
     58if "%_vcver_%"=="7.10" ( 
     59        set _clver_=1310 
     60) 
     61if "%_vcver_%"=="8.00" ( 
     62        set _clver_=1400 
     63) 
     64if "%_vcver_%"=="9.00" ( 
     65        set _clver_=1500 
     66) 
    5067 
    5168::  ********************* 
    …… 
    7996echo                    ^<Tool 
    8097echo                            Name="VCNMakeTool" 
    81 echo                            BuildCommandLine=  ^"cd $(ProjectDir) ^&amp;^&amp; nmake -f makefile.vc DEBUG=1 ^&amp;^&amp; nmake -f makefile.vc install^" 
    82 echo                            ReBuildCommandLine=^"cd $(ProjectDir) ^&amp;^&amp; nmake -f makefile.vc DEBUG=1 clean^ ^&amp;^&amp; nmake -f makefile.vc DEBUG=1 ^&amp;^&amp; nmake -f makefile.vc install^" 
    83 echo                            CleanCommandLine=  ^"cd $(ProjectDir) ^&amp;^&amp; nmake -f makefile.vc DEBUG=1 clean^" 
     98echo                            BuildCommandLine=  ^"cd $(ProjectDir) ^&amp;^&amp; nmake -f makefile.vc MSVC_VER=%_clver_% DEBUG=1 ^&amp;^&amp; nmake -f makefile.vc install^" 
     99echo                            ReBuildCommandLine=^"cd $(ProjectDir) ^&amp;^&amp; nmake -f makefile.vc MSVC_VER=%_clver_% DEBUG=1 clean^ ^&amp;^&amp; nmake -f makefile.vc MSVC_VER=%_clver_% DEBUG=1 ^&amp;^&amp; nmake -f makefile.vc install^" 
     100echo                            CleanCommandLine=  ^"cd $(ProjectDir) ^&amp;^&amp; nmake -f makefile.vc MSVC_VER=%_clver_% DEBUG=1 clean^" 
    84101echo                            Output="gdal%_gdalnum_%.dll"/^> 
    85102echo            ^</Configuration^> 
    …… 
    91108echo                    ^<Tool 
    92109echo                            Name="VCNMakeTool" 
    93 echo                            BuildCommandLine=  ^"cd $(ProjectDir) ^&amp;^&amp; nmake -f makefile.vc ^&amp;^&amp; nmake -f makefile.vc install^" 
    94 echo                            ReBuildCommandLine=^"cd $(ProjectDir) ^&amp;^&amp; nmake -f makefile.vc clean^ ^&amp;^&amp; nmake -f makefile.vc ^&amp;^&amp; nmake -f makefile.vc install^" 
    95 echo                            CleanCommandLine=  ^"cd $(ProjectDir) ^&amp;^&amp; nmake -f makefile.vc clean^" 
     110echo                            BuildCommandLine=  ^"cd $(ProjectDir) ^&amp;^&amp; nmake -f makefile.vc MSVC_VER=%_clver_% ^&amp;^&amp; nmake -f makefile.vc MSVC_VER=%_clver_% install^" 
     111echo                            ReBuildCommandLine=^"cd $(ProjectDir) ^&amp;^&amp; nmake -f makefile.vc MSVC_VER=%_clver_% clean^ ^&amp;^&amp; nmake -f makefile.vc MSVC_VER=%_clver_% ^&amp;^&amp; nmake -f makefile.vc MSVC_VER=%_clver_% install^" 
     112echo                            CleanCommandLine=  ^"cd $(ProjectDir) ^&amp;^&amp; nmake -f makefile.vc MSVC_VER=%_clver_% clean^" 
    96113echo                            Output="gdal%_gdalnum_%.dll"/^> 
    97114echo            ^</Configuration^>