Mercurial > hg > minc-tools

changeset 1905:cb74a4aac69c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor changes for Windows
author bert <bert>
date Fri, 03 Dec 2004 21:50:59 +0000
parents c71d3fe698e4
children a6fd2dd5cc77
files Makefile.msvc-win32
diffstat 1 files changed, 113 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.msvc-win32
+++ b/Makefile.msvc-win32
@@ -5,14 +5,14 @@
 # more-or-less correctly with GNU Make for Windows (as in Cygwin).
 #
 # Builds all of the MINC command-line utilities, along with the
-# MINC libraries MINC.DLL and VOLUME_IO.DLL
+# MINC libraries MINC2.DLL and VOLUME_IO2.DLL
 #
 # Assumes that the environment variable NETCDF_ROOT points to 
 # the location of netcdf.lib and netcdf.h.  This could be made
 # more flexible to allow the library and header to reside in 
 # different directories.
 #
-# $Header: /private-cvsroot/minc/Makefile.msvc-win32,v 6.1 2004-11-01 22:22:12 bert Exp $
+# $Header: /private-cvsroot/minc/Makefile.msvc-win32,v 6.2 2004-12-03 21:50:59 bert Exp $
 #
 PROGS = worldtovoxel.exe \
 	voxeltoworld.exe \
@@ -20,9 +20,12 @@
 	mincaverage.exe \
 	minccalc.exe \
 	mincconcat.exe \
+	mincconvert.exe \
 	minccopy.exe \
+	mincdump.exe \
 	mincexpand.exe \
 	mincextract.exe \
+	mincgen.exe \
 	mincinfo.exe \
 	minclookup.exe \
 	mincmakescalar.exe \
@@ -50,8 +53,11 @@
 	libsrc\ParseArgv.h \
 	libsrc\time_stamp.h \
 	libsrc\type_limits.h \
-	libsrc\voxel_loop.h
-	
+	libsrc\voxel_loop.h \
+	libsrc\minc_error.h \
+	libsrc\minc_config.h \
+	libsrc\minc_compat.h
+
 MINC_OBJS = \
 	libsrc\ParseArgv.obj \
 	libsrc\dim_conversion.obj \
@@ -63,7 +69,24 @@
 	libsrc\netcdf_convenience.obj \
 	libsrc\time_stamp.obj \
 	libsrc\value_conversion.obj \
-	libsrc\voxel_loop.obj
+	libsrc\voxel_loop.obj \
+	libsrc\hdf_convenience.obj \
+	libsrc\minc_compat.obj
+
+MINC2_OBJS = \
+	libsrc2\convert.obj \
+	libsrc2\datatype.obj \
+	libsrc2\dimension.obj \
+	libsrc2\free.obj \
+	libsrc2\grpattr.obj \
+	libsrc2\hyper.obj \
+	libsrc2\label.obj \
+	libsrc2\m2util.obj \
+	libsrc2\record.obj \
+	libsrc2\slice.obj \
+	libsrc2\valid.obj \
+	libsrc2\volprops.obj \
+	libsrc2\volume.obj
 
 VOLIO_OBJS = \
 	volume_io/Geometry/colour.obj \
@@ -105,26 +128,27 @@
 # of the software, so we have to fix that up here:
 
 VOLIO_HDRS = \
-        volume_io\Include\volume_io\alloc.h \
-        volume_io\Include\volume_io\arrays.h \
-        volume_io\Include\volume_io\basic.h \
-        volume_io\Include\volume_io\def_math.h \
-        volume_io\Include\volume_io\files.h \
-        volume_io\Include\volume_io\geometry.h \
-        volume_io\Include\volume_io\geom_structs.h \
-        volume_io\Include\volume_io\multidim.h \
-        volume_io\Include\volume_io\progress.h \
-        volume_io\Include\volume_io\string_funcs.h \
-        volume_io\Include\volume_io\system_dependent.h \
-        volume_io\Include\volume_io\transforms.h \
-        volume_io\Include\volume_io\vol_io_prototypes.h \
-        volume_io\Include\volume_io\volume_cache.h \
-        volume_io\Include\volume_io\volume.h
+	volume_io\Include\volume_io\alloc.h \
+	volume_io\Include\volume_io\arrays.h \
+	volume_io\Include\volume_io\basic.h \
+	volume_io\Include\volume_io\def_math.h \
+	volume_io\Include\volume_io\files.h \
+	volume_io\Include\volume_io\geometry.h \
+	volume_io\Include\volume_io\geom_structs.h \
+	volume_io\Include\volume_io\multidim.h \
+	volume_io\Include\volume_io\progress.h \
+	volume_io\Include\volume_io\string_funcs.h \
+	volume_io\Include\volume_io\system_dependent.h \
+	volume_io\Include\volume_io\transforms.h \
+	volume_io\Include\volume_io\vol_io_prototypes.h \
+	volume_io\Include\volume_io\volume_cache.h \
+	volume_io\Include\volume_io\volume.h
 
-INCLUDES = -I$(NETCDF_ROOT) -Ilibsrc -Iprogs/Proglib -Ivolume_io/Include
-DEFINES = -DDLL_NETCDF -D_POSIX_
+INCLUDES = -I$(NETCDF_ROOT) -I$(HDF5_ROOT)/include -Ilibsrc -Iprogs/Proglib -Ivolume_io/Include
+DEFINES = -DDLL_NETCDF -D_POSIX_ -DMINC2 -DWIN32 -D_HDF5USEDLL_ -DHAVE_CONFIG_H
 NETCDF_LIB = $(NETCDF_ROOT)/netcdf.lib
-LIBS = minc.lib volume_io.lib $(NETCDF_LIB)
+HDF5_LIB = $(HDF5_ROOT)/dll/hdf5dll.lib
+LIBS = minc2.lib volume_io2.lib $(NETCDF_LIB) $(HDF5_LIB)
 CFLAGS = $(INCLUDES) $(DEFINES)
 
 .SUFFIXES: .obj
@@ -132,7 +156,7 @@
 .c.obj:
 	cl /nologo $(CFLAGS) -c -Fo$*.obj $<
 
-all: $(PROGS) minc.dll volume_io.dll
+all: $(PROGS) minc2.dll volume_io2.dll
 
 clean:
 	-del /s *.obj
@@ -140,81 +164,84 @@
 	-del *.lib
 	-del *.dll
 	-del *.exe
+	-del *.map
 
 LINK = link
 
-$(PROGS): minc.dll volume_io.dll
+$(PROGS): minc2.dll volume_io2.dll
 
 $(MINC_OBJS):  libsrc\config.h $(MINC_HDRS)
 
-minc.dll: $(MINC_OBJS)
-	link /dll /nologo /out:minc.dll $(MINC_OBJS) $(NETCDF_LIB)
+$(MINC2_OBJS): libsrc2\minc2.h libsrc2\minc2_private.h
 
-volume_io.dll: $(VOLIO_OBJS) minc.dll
-	link /dll /nologo /out:volume_io.dll $(VOLIO_OBJS) minc.lib $(NETCDF_LIB)
+minc2.dll: $(MINC_OBJS) $(MINC2_OBJS)
+	link /dll /nologo /map:minc2.map /out:minc2.dll $(MINC_OBJS) $(MINC2_OBJS) $(NETCDF_LIB) $(HDF5_LIB) ws2_32.lib
+
+volume_io2.dll: $(VOLIO_OBJS) minc2.dll
+	link /dll /nologo /map:volume_io2.map /out:volume_io2.dll $(VOLIO_OBJS) minc2.lib $(NETCDF_LIB) $(HDF5_LIB)
 
 $(VOLIO_OBJS): $(VOLIO_HDRS)
 
 volume_io\Include\volume_io\alloc.h: volume_io\Include\alloc.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\arrays.h: volume_io\Include\arrays.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\basic.h: volume_io\Include\basic.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\def_math.h: volume_io\Include\def_math.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\files.h: volume_io\Include\files.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\geometry.h: volume_io\Include\geometry.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\geom_structs.h: volume_io\Include\geom_structs.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\multidim.h: volume_io\Include\multidim.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\progress.h: volume_io\Include\progress.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\string_funcs.h: volume_io\Include\string_funcs.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\system_dependent.h: volume_io\Include\system_dependent.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\transforms.h: volume_io\Include\transforms.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\vol_io_prototypes.h: volume_io\Include\vol_io_prototypes.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\volume_cache.h: volume_io\Include\volume_cache.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
 
 volume_io\Include\volume_io\volume.h: volume_io\Include\volume.h
-        -mkdir volume_io\Include\volume_io
-        copy $? $@
-        
+	-mkdir volume_io\Include\volume_io
+	copy $? $@
+
 libsrc\config.h: libsrc\config.h.msvc-win32
 	copy libsrc\config.h.msvc-win32 libsrc\config.h
 
@@ -253,10 +280,22 @@
 mincconcat.exe: $(MINCCONCAT_OBJS)
 	$(LINK) $(MINCCONCAT_OBJS) $(LIBS) 
 
+MINCCONVERT_OBJS = progs/mincconvert/mincconvert.obj
+mincconvert.exe: $(MINCCONVERT_OBJS)
+	$(LINK) $(MINCCONVERT_OBJS) $(LIBS) 
+
 MINCCOPY_OBJS = progs/minccopy/minccopy.obj
 minccopy.exe: $(MINCCOPY_OBJS)
 	$(LINK) $(MINCCOPY_OBJS) $(LIBS) 
 
+MINCDUMP_OBJS = \
+	progs/mincdump/mincdump.obj \
+	progs/mincdump/vardata.obj \
+	progs/mincdump/dumplib.obj \
+	progs/mincdump/getopt.obj
+mincdump.exe: $(MINCDUMP_OBJS)
+	$(LINK) $(MINCDUMP_OBJS) $(LIBS) 
+
 MINCEXPAND_OBJS = progs/mincexpand/mincexpand.obj
 mincexpand.exe: $(MINCEXPAND_OBJS)
 	$(LINK) $(MINCEXPAND_OBJS) $(LIBS) 
@@ -265,6 +304,20 @@
 mincextract.exe: $(MINCEXTRACT_OBJS)
 	$(LINK) $(MINCEXTRACT_OBJS) $(LIBS) 
 
+MINCGEN_OBJS = \
+	progs/mincgen/escapes.obj \
+	progs/mincgen/genlib.obj \
+	progs/mincgen/getfill.obj \
+	progs/mincgen/init.obj \
+	progs/mincgen/load.obj \
+	progs/mincgen/main.obj \
+	progs/mincgen/ncgentab.obj \
+	progs/mincgen/ncgenyy.obj \
+	progs/mincdump/getopt.obj
+
+mincgen.exe: $(MINCGEN_OBJS)
+	$(LINK) $(MINCGEN_OBJS) $(LIBS) 
+
 MINCINFO_OBJS = progs/mincinfo/mincinfo.obj
 mincinfo.exe: $(MINCINFO_OBJS)
 	$(LINK) $(MINCINFO_OBJS) $(LIBS)