added FITS support to windows makefiles

git-svn-id: https://svn.osgeo.org/gdal/trunk@5065 f0d54148-0727-0410-94bb-9a71ac55c965
OSGeo-jp · Jul 17, 2003 · 8f1edbf · 8f1edbf
1 parent 3700164
commit 8f1edbf
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-16  Simon Perkins  <s.perkins@lanl.gov>
+
+	* Added FITS support to windows makefiles.
+
+	* Added GDALFillraster to gdalbridge.{cpp,h} 
+
 2003-06-27  Frank Warmerdam  <warmerdam@pobox.com>
 
 	* Release 1.1.9 of GDAL/OGR.

diff --git a/frmts/fits/makefile.vc b/frmts/fits/makefile.vc
@@ -0,0 +1,15 @@
+
+OBJ	=	fitsdataset.obj
+
+EXTRAFLAGS = 	-I$(FITS_DIR) -DFRMT_fits 
+
+GDAL_ROOT	=	..\..
+
+!INCLUDE $(GDAL_ROOT)\nmake.opt
+
+default:	$(OBJ)
+	copy *.obj ..\o
+
+clean:
+	-del *.obj
+
diff --git a/frmts/makefile.vc b/frmts/makefile.vc
@@ -6,7 +6,7 @@ EXTRAFLAGS =	-DFRMT_ceos -DFRMT_aigrid -DFRMT_elas -DFRMT_hfa -DFRMT_gtiff\
 		-DFRMT_dted -DFRMT_mem -DFRMT_jdem -DFRMT_gif \
 		-DFRMT_envisat -DFRMT_aaigrid -DFRMT_usgsdem -DFRMT_l1b \
 		-DFRMT_fit -DFRMT_vrt -DFRMT_xpm -DFRMT_bmp -DFRMT_bsb \
-		-DFRMT_nitf $(JPEGDEF) $(JP2KAKDEF) $(MRSIDDEF) \
+		-DFRMT_nitf $(JPEGDEF) $(JP2KAKDEF) $(MRSIDDEF) $(FITSDEF) \
 		$(JPEG2000DEF) $(ECWDEF) $(OGDIDEF) $(HDFDEF) $(ZLIBDEF)
 
 MOREEXTRA =	
@@ -45,7 +45,9 @@ HDFDEF	=	-DFRMT_hdf4
 MRSIDDEF	=	-DFRMT_mrsid
 !ENDIF
 
-
+!IFDEF FITS_DIR
+FITSDEF		=	-DFRMT_fits
+!ENDIF
 
 default:	o\gdalallregister.obj subdirs
 

diff --git a/makefile.vc b/makefile.vc
@@ -128,10 +128,12 @@ $(GDAL_DLL):	lib
 	link /dll /debug $(OGR_INCLUDE) $(BASE_INCLUDE) $(LIBOBJ) \
 		$(ECWLIB) $(OGDILIB) $(XERCES_LIB) $(FME_LIB) $(JASPER_LIB)\
 		$(HDF4_LIB) $(OCI_LIB) $(PNG_LIB) $(JPEG_LIB) $(PG_LIB) \
-		$(MRSID_LIB) \
+		$(MRSID_LIB) $(FITS_LIB) \
 		 /out:$(GDAL_DLL) /implib:gdal_i.lib $(LINKER_FLAGS)
 
 install: $(GDAL_DLL) apps_dir pymod_dir
+  -mkdir $(BINDIR)
+  -mkdir $(DATADIR)
 	xcopy /y /r /d /f $(GDAL_DLL) $(BINDIR)
 	cd apps
 	$(MAKE) /f makefile.vc install
@@ -146,6 +148,8 @@ install: $(GDAL_DLL) apps_dir pymod_dir
 	cd ..
 
 devinstall: install
+  -mkdir $(INCDIR)
+  -mkdir $(LIBDIR)
 	copy port\*.h $(INCDIR)
 	copy gcore\*.h $(INCDIR)
 	copy alg\*.h $(INCDIR)

diff --git a/nmake.opt b/nmake.opt
@@ -1,11 +1,14 @@
 
 # Location to install .exe, .dll and python stuff
+# Edit as required. GDAL_HOME is used for convenience here,
+# but this particular relative organization is not mandatory.
 
-BINDIR = D:\bin
-PY_INST_DIR = D:\bin\pymod
-LIBDIR = D:\bin\lib
-INCDIR = D:\bin\include
-DATADIR = D:\bin\data
+GDAL_HOME = "D:\Program Files\GDAL"
+BINDIR = $(GDAL_HOME)\bin
+PY_INST_DIR = $(GDAL_HOME)\pymod
+LIBDIR = $(GDAL_HOME)\lib
+INCDIR = $(GDAL_HOME)\include
+DATADIR = $(GDAL_HOME)\data
 
 # Set this to the installed directory containing python.  If you don't
 # have python just let it point to a directory that does not exist (as now). 
@@ -83,6 +86,10 @@ JPEG_SUPPORTED = 1
 # Uncomment the following and update to enable FME support.
 #FME_DIR =	d:\Software\fme
 
+# Uncomment the following to enable FITS format support
+#FITS_DIR =	"D:\Users\154712\My Documents\Visual Studio Projects\cfitsio"
+#FITS_LIB =	$(FITS_DIR)\cfitsio.lib
+
 !IFDEF ORACLE_HOME
 OCI_LIB =	$(ORACLE_HOME)\oci\lib\msvc\ociw32.lib \
 		$(ORACLE_HOME)\oci\lib\msvc\oci.lib

diff --git a/pymod/makefile.vc b/pymod/makefile.vc
@@ -18,5 +18,6 @@ clean:
 	-del *.obj *.dll *.lib
 
 install:	$(PYGDAL_DLL)
+  -mkdir $(PY_INST_DIR)
 	copy *.py $(PY_INST_DIR)
 	copy $(PYGDAL_DLL) $(PY_INST_DIR)