Changeset 13873

Show
Ignore:
Timestamp:
02/25/08 12:36:01 (4 months ago)
Author:
warmerdam
Message:

add plugin building on win32, improved jpeg2000 support

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • spike/grib/degrib18/g2clib-1.0.4/makefile.vc

    r13653 r13873  
    1 OBJ = gridtemplates.obj drstemplates.obj pdstemplates.obj gbits.obj g2_free.obj g2_unpack1.obj g2_unpack2.obj g2_unpack3.obj g2_unpack4.obj g2_unpack5.obj g2_unpack6.obj g2_unpack7.obj g2_info.obj g2_getfld.obj simunpack.obj comunpack.obj pack_gp.obj reduce.obj specpack.obj specunpack.obj rdieee.obj mkieee.obj int_power.obj simpack.obj compack.obj cmplxpack.obj misspack.obj g2_create.obj g2_addlocal.obj g2_addgrid.obj g2_addfield.obj g2_gribend.obj getdim.obj g2_miss.obj getpoly.obj seekgb.obj pngunpack.obj pngpack.obj dec_png.obj enc_png.obj 
     1OBJ = gridtemplates.obj drstemplates.obj pdstemplates.obj gbits.obj g2_free.obj g2_unpack1.obj g2_unpack2.obj g2_unpack3.obj g2_unpack4.obj g2_unpack5.obj g2_unpack6.obj g2_unpack7.obj g2_info.obj g2_getfld.obj simunpack.obj comunpack.obj pack_gp.obj reduce.obj specpack.obj specunpack.obj rdieee.obj mkieee.obj int_power.obj simpack.obj compack.obj cmplxpack.obj misspack.obj g2_create.obj g2_addlocal.obj g2_addgrid.obj g2_addfield.obj g2_gribend.obj getdim.obj g2_miss.obj getpoly.obj seekgb.obj pngunpack.obj pngpack.obj dec_png.obj enc_png.obj \ 
     2        dec_jpeg2000.obj jpcunpack.obj jpcpack.obj enc_jpeg2000.obj 
     3         
    24 
    35EXTRAFLAGS = -I ../../../png/libpng -I ../../../zlib -DUSE_PNG 
    …… 
    810 
    911!IFDEF JASPER_DIR 
    10 OBJ = $(OBJ) dec_jpeg2000.obj jpcunpack.obj jpcpack.obj enc_jpeg2000.obj 
    11 EXTRAFLAGS = $(EXTRAFLAGS) $(JASPER_INCLUDE) -DUSE_JPEG2000 
    12 !ELSE 
    13 !IFDEF ECWDIR 
    14 OBJ = $(OBJ) dec_jpeg2000.obj jpcunpack.obj jpcpack.obj enc_jpeg2000.obj 
    15 EXTRAFLAGS = $(EXTRAFLAGS) -DUSE_JPEG2000 -DUSE_JPEG2000_J2KSUBFILE 
    16 !ENDIF 
     12EXTRAFLAGS = $(EXTRAFLAGS) $(JASPER_INCLUDE) -DHAVE_JASPER 
    1713!ENDIF 
    1814 

  • spike/grib/makefile.vc

    r12203 r13873  
    55 
    66!INCLUDE $(GDAL_ROOT)\nmake.opt 
     7 
     8!IF DEFINED(PNG_LIB) 
     9LINK_PNG        =       $(PNG_LIB) 
     10!ELSE 
     11LINK_PNG        =       ..\png\libpng\*.obj 
     12!ENDIF 
     13 
    714 
    815default:        $(OBJ) 
    …… 
    1421        -del degrib18\degrib\*.obj 
    1522        -del degrib18\g2clib-1.0.4\*.obj 
     23        -del *.dll 
     24        -del *.exp 
     25        -del *.lib 
    1626 
     27plugin: gdal_GRIB.dll 
     28 
     29gdal_GRIB.dll: default 
     30        link /dll /out:gdal_GRIB.dll \ 
     31                $(OBJ) degrib18\degrib\*.obj degrib18\g2clib-1.0.4\*.obj \ 
     32                $(GDAL_ROOT)/gdal_i.lib $(LINK_PNG) ..\zlib\*.obj