NMAKE: Allow users to tweak/append extras to KAKINC (OSGeo#1584)

Set KAKADU_7_5_OR_LATER=YES by default, unless user already defined it.
kadyb · May 28, 2019 · bf968bd · bf968bd
1 parent b898e61
commit bf968bd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/gdal/frmts/jp2kak/makefile.vc b/gdal/frmts/jp2kak/makefile.vc
@@ -5,7 +5,9 @@ GDAL_ROOT	=	..\..
 !INCLUDE $(GDAL_ROOT)\nmake.opt
 
 KAKINC = -I$(KAKSRC)/managed/all_includes \
-       -I$(KAKSRC)/apps/jp2
+       -I$(KAKSRC)/apps/jp2 \
+       $(KAKEXTRAINCS)
+
 OBJ_EXT =	obj
 OBJ_PREFIX =	$(KAKOBJDIR)
 OBJ_CONFIG =	release

diff --git a/gdal/frmts/jpipkak/makefile.vc b/gdal/frmts/jpipkak/makefile.vc
@@ -2,7 +2,8 @@ PLUGIN_DLL 	= gdal_JPIPKAK.dll
 GDAL_ROOT	=	..\..
 
 KAKINC = -I$(KAKSRC)/managed/all_includes \
-       -I$(KAKSRC)/apps/jp2 -I$(KAKSRC)/apps/caching_sources
+       -I$(KAKSRC)/apps/jp2 -I$(KAKSRC)/apps/caching_sources \
+       $(KAKEXTRAINCS)
 
 OBJ	=	jpipkakdataset.obj
 # Starting with Kakadu V7.9.1, one can use both Kakadu DLLs

diff --git a/gdal/nmake.opt b/gdal/nmake.opt
@@ -433,9 +433,12 @@ JPEG12_SUPPORTED = 1
 #KAKDIR = C:\0_PGH\SRC_CSD\CSD_INTEGRATION\cots\kakadu\download\dev
 #KAKLIB = $(KAKDIR)\lib_x64\kdu_v79R.lib 	$(KAKDIR)\lib_x64\kdu_a79R.lib
 #KAKSRC = $(KAKDIR)\v7_9_1-01156C
+#KAKEXTRAINC=-I$(KAKDIR)
 #KAKOBJDIR =  $(KAKDIR)\v7_generated_x86
-KAKADU_7_5_OR_LATER = YES
 #JP2KAK_PLUGIN = YES
+!IFNDEF KAKADU_7_5_OR_LATER
+KAKADU_7_5_OR_LATER = YES
+!ENDIF
 
 # Uncomment the following and update to enable NCSA HDF Release 4 support.
 #HDF4_PLUGIN = NO