Permalink
Browse files

Merge pull request #1081 from rouault/add_msvc_charls

Windows build: add support for JPEGLS driver (derived from contribution by @arturredzko, fixes #1078)
  • Loading branch information...
rouault committed Nov 8, 2018
2 parents 7635067 + 17716b3 commit 0c16944c3594557e6240dfd7c27b54dc07c12a47
Showing with 26 additions and 1 deletion.
  1. +15 −0 gdal/frmts/jpegls/makefile.vc
  2. +4 −0 gdal/frmts/makefile.vc
  3. +7 −1 gdal/nmake.opt
@@ -0,0 +1,15 @@
GDAL_ROOT = ..\..
!INCLUDE $(GDAL_ROOT)\nmake.opt
OBJ = jpeglsdataset.obj
EXTRAFLAGS = -I.. -I..\.. $(CHARLS_INC) $(CHARLS_FLAGS)
default: $(OBJ)
xcopy /D /Y *.obj ..\o
cd ..
clean:
-del *.obj
cd ..
@@ -199,6 +199,10 @@ PLUGINFLAGS = $(PLUGINFLAGS) -DFRMT_kea
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_mrf
!ENDIF
!IFDEF CHARLS_LIB
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_jpegls
!ENDIF
default: o\gdalallregister.obj subdirs
list:
@@ -785,6 +785,12 @@ ADD_LIBS =
HAVE_LERC=1
!ENDIF
# Comment out the following if you want to build JPEGLS with CHARLS support
#CHARLS_INC=-IE:\work\GIS\gdal\supportlibs\charls\include\
#CHARLS_LIB=e:\work\GIS\gdal\supportlibs\charls\bin\Release\x86\CharLS.lib
# Comment out for API 2.x:
#CHARLS_FLAGS = -DCHARLS_2
########### END OF STUFF THAT NORMALLY NEEDS TO BE UPDATED ##################
@@ -979,5 +985,5 @@ EXTERNAL_LIBS = $(OGDILIB) $(XERCES_LIB) $(EXPAT_LIB) $(OCI_LIB) $(PG_LIB) \
$(ODBCLIB) $(JASPER_LIB) $(PNG_LIB) $(ZLIB_LIB) $(ADD_LIBS) $(OPENJPEG_LIB) \
$(MRSID_LIDAR_LIB) $(LIBKML_LIBS) $(SOSI_LIBS) $(PDF_LIB_LINK) $(LZMA_LIBS) $(ZSTD_LIBS) \
$(LIBICONV_LIBRARY) $(WEBP_LIBS) $(FGDB_LIB_LINK) $(FREEXL_LIBS) $(GTA_LIBS) \
$(INGRES_LIB) $(LIBXML2_LIB) $(PCRE_LIB) $(MONGODB_LIB_LINK) $(CRYPTOPP_LIB) $(OPENSSL_LIB) ws2_32.lib \
$(INGRES_LIB) $(LIBXML2_LIB) $(PCRE_LIB) $(MONGODB_LIB_LINK) $(CRYPTOPP_LIB) $(OPENSSL_LIB) $(CHARLS_LIB) ws2_32.lib \
kernel32.lib psapi.lib

0 comments on commit 0c16944

Please sign in to comment.