Changeset 14744

Show
Ignore:
Timestamp:
06/21/08 02:54:31 (5 months ago)
Author:
warmerdam
Message:

rename ecw plugin gdal_ECW_JP2ECW.so/dll (#2320)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.5/gdal/frmts/ecw/GNUmakefile

    r11717 r14744  
    1313install-obj:    $(O_OBJ) 
    1414 
    15 plugin: gdal_ECW.so 
     15plugin: gdal_ECW_JP2ECW.so 
    1616 
    1717gdal_ECW.so:    $(OBJ) 
    1818        $(LD_SHARED) $(LNK_FLAGS) $(OBJ) $(CONFIG_LIBS) $(EXTRA_LIBS) \ 
    19                 -o gdal_ECW.so 
     19                -o gdal_ECW_JP2ECW.so 

  • branches/1.5/gdal/frmts/ecw/ecwdataset.cpp

    r14009 r14744  
    15071507    } 
    15081508#endif /* def FRMT_ecw */ 
     1509} 
     1510 
     1511/************************************************************************/ 
     1512/*                      GDALRegister_ECW_JP2ECW()                       */ 
     1513/*                                                                      */ 
     1514/*      This function exists so that when built as a plugin, there      */ 
     1515/*      is a function that will register both drivers.                  */ 
     1516/************************************************************************/ 
     1517 
     1518void GDALRegister_ECW_JP2ECW() 
     1519 
     1520{ 
     1521    GDALRegister_ECW(); 
     1522    GDALRegister_JP2ECW(); 
    15091523} 
    15101524 

  • branches/1.5/gdal/frmts/ecw/makefile.vc

    r11571 r14744  
    55 
    66OBJ     =       ecwdataset.obj ecwcreatecopy.obj jp2userbox.obj 
     7 
     8PLUGIN_DLL =    gdal_ECW_JP2ECW.dll 
    79 
    810GDAL_ROOT       =       ..\.. 
    …… 
    2628        $(CC) /MD $(EXTRAFLAGS) ecw_example1.c $(ECWLIB) 
    2729         
    28 plugin: gdal_ECW.dll 
     30plugin: $(PLUGIN_DLL) 
    2931 
    30 gdal_ECW.dll: $(OBJ) 
    31         link /dll /out:gdal_ECW.dll $(OBJ) \ 
     32$(PLUGIN_DLL): $(OBJ) 
     33        link /dll /out:$(PLUGIN_DLL) $(OBJ) \ 
    3234                $(GDALLIB) $(ECWLIB) 
    33         if exist gdal_ECW.dll.manifest mt -manifest gdal_ECW.dll.manifest -outputresource:gdal_ECW.dll;2 
     35        if exist gdal_ECW.dll.manifest mt -manifest $(PLUGIN_DLL).manifest -outputresource:$(PLUGIN_DLL);2