modified: bin/X86MAC64/mrc2bild

	modified:   bin/X86MAC64/mrcImageAreaCalc
	modified:   lib/CommandEntry.wish
	modified:   lib/X86MAC64/libEosObjects.a
	modified:   lib/X86MAC64/libbildFile.a
	modified:   lib/X86MAC64/shared/lmrc2bild.sharedo
	new file:   lib/defaultLoad.wish
	modified:   lib/tclIndex
	new file:   src/Objects/DataExpress/pngFile/src/X86MAC64/.Depend
	new file:   src/Objects/DataExpress/pngFile/src/X86MAC64/.Source
	modified:   src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.a
	modified:   src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.debug.a
	modified:   src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.debugo
	modified:   src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.o
	modified:   src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.sharedo
	modified:   src/Tools/filter/mrc2bild/src/X86MAC64/argCheck.o
	modified:   src/Tools/filter/mrc2bild/src/X86MAC64/init.o
	modified:   src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild
	modified:   src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild.o
	modified:   src/Tools/filter/mrc2bild/src/X86MAC64/usage.o
	new file:   src/Tools/filter/mrc2png/src/X86MAC64/.Depend
	new file:   src/Tools/filter/mrc2png/src/X86MAC64/Makefile
	new file:   src/Tools/filter/mrc2png/src/X86MAC64/argCheck.o
	new file:   src/Tools/filter/mrc2png/src/X86MAC64/init.o
	new file:   src/Tools/filter/mrc2png/src/X86MAC64/usage.o
	new file:   src/Tools/filter/mrc2png/src/X86MAC64/util.o
	modified:   src/Tools/mrcImage/mrcImageAreaCalc/src/X86MAC64/mrcImageAreaCalc
	modified:   src/Tools/mrcImage/mrcImageAreaCalc/src/X86MAC64/usage.o

diff --git a/bin/X86MAC64/mrc2bild b/bin/X86MAC64/mrc2bild
index 3f9091a..92f8a69 100755 (executable)
Binary files a/bin/X86MAC64/mrc2bild and b/bin/X86MAC64/mrc2bild differ

diff --git a/bin/X86MAC64/mrcImageAreaCalc b/bin/X86MAC64/mrcImageAreaCalc
index 839a19e..e5c9ad0 100755 (executable)
Binary files a/bin/X86MAC64/mrcImageAreaCalc and b/bin/X86MAC64/mrcImageAreaCalc differ

diff --git a/lib/CommandEntry.wish b/lib/CommandEntry.wish
index 896eda9..9fcca27 100644 (file)
--- a/lib/CommandEntry.wish
+++ b/lib/CommandEntry.wish
@@ -7,8 +7,10 @@
 # CommandEntry
 #
 proc CommandEntry { name label width command args } {
+
        set f [ frame $name ]
-       label $name.label -text $label -width [ expr $width * 5] -anchor w 
+       label $name.label -text $label -anchor w 
+       #label $name.label -text $label -width [ expr $width*20 ] -anchor w 
        #label $name.label -text $label -width 20 -anchor w
        #labelframe $name -text $label -labelanchor w
 

diff --git a/lib/X86MAC64/libEosObjects.a b/lib/X86MAC64/libEosObjects.a
index b363c8c..d11110a 100644 (file)
Binary files a/lib/X86MAC64/libEosObjects.a and b/lib/X86MAC64/libEosObjects.a differ

diff --git a/lib/X86MAC64/libbildFile.a b/lib/X86MAC64/libbildFile.a
index 3053c26..3e3237c 100644 (file)
Binary files a/lib/X86MAC64/libbildFile.a and b/lib/X86MAC64/libbildFile.a differ

diff --git a/lib/X86MAC64/shared/lmrc2bild.sharedo b/lib/X86MAC64/shared/lmrc2bild.sharedo
index 28b79de..900facf 100644 (file)
Binary files a/lib/X86MAC64/shared/lmrc2bild.sharedo and b/lib/X86MAC64/shared/lmrc2bild.sharedo differ

diff --git a/lib/defaultLoad.wish b/lib/defaultLoad.wish
new file mode 100644 (file)
index 0000000..1173302
--- /dev/null
+++ b/lib/defaultLoad.wish
@@ -0,0 +1,22 @@
+proc defaultLoad { { filename "default" } { dir "~/.Eos/" } { procdef defaultLoadProcTemplate } } {
+       if [ file isdirectory $dir ] {
+               #
+       } else {
+               file mkdir $dir
+       }
+
+       if [ file exists $filename ] {
+               source $filename
+       } elseif [ file exists $dir/$filename ] {
+               source $dir/$filename
+       } else {
+               eval "$procdef $dir/$filename"
+       }
+}
+
+proc defaultLoadProcTemplate { f } {
+       fpt [ open $f r 600 ] 
+       puts $fpt "option add font {{Arial} 10}"
+}
+
+

diff --git a/lib/tclIndex b/lib/tclIndex
index 422092f..f808d10 100644 (file)
--- a/lib/tclIndex
+++ b/lib/tclIndex
@@ -74,6 +74,8 @@ set auto_index(::CTF::ctfInfoCTFCalculation) [list source [file join $dir ctfInf
 set auto_index(::CTF::ctfInfoScatteringCalc) [list source [file join $dir ctfInfo.wish]]
 set auto_index(::CTF::ctfInfoListGet) [list source [file join $dir ctfInfo.wish]]
 set auto_index(::CTF::ctfInfoAppend) [list source [file join $dir ctfInfo.wish]]
+set auto_index(defaultLoad) [list source [file join $dir defaultLoad.wish]]
+set auto_index(defaultLoadProcTemplate) [list source [file join $dir defaultLoad.wish]]
 set auto_index(fileSaveSureWin) [list source [file join $dir fileSave.wish]]
 set auto_index(fileSaveSureOK) [list source [file join $dir fileSave.wish]]
 set auto_index(fileSaveSureCancel) [list source [file join $dir fileSave.wish]]

diff --git a/src/Objects/DataExpress/pngFile/src/X86MAC64/.Depend b/src/Objects/DataExpress/pngFile/src/X86MAC64/.Depend
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/Objects/DataExpress/pngFile/src/X86MAC64/.Source b/src/Objects/DataExpress/pngFile/src/X86MAC64/.Source
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.a b/src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.a
index 3053c26..3e3237c 100644 (file)
Binary files a/src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.a and b/src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.a differ

diff --git a/src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.debug.a b/src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.debug.a
index 48ce551..82b61c5 100644 (file)
Binary files a/src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.debug.a and b/src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.debug.a differ

diff --git a/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.debugo b/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.debugo
index 0da8f1f..09aa102 100644 (file)
Binary files a/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.debugo and b/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.debugo differ

diff --git a/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.o b/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.o
index 28b79de..900facf 100644 (file)
Binary files a/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.o and b/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.o differ

diff --git a/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.sharedo b/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.sharedo
index 28b79de..900facf 100644 (file)
Binary files a/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.sharedo and b/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.sharedo differ

diff --git a/src/Tools/filter/mrc2bild/src/X86MAC64/argCheck.o b/src/Tools/filter/mrc2bild/src/X86MAC64/argCheck.o
index 3207c3e..90e5e65 100644 (file)
Binary files a/src/Tools/filter/mrc2bild/src/X86MAC64/argCheck.o and b/src/Tools/filter/mrc2bild/src/X86MAC64/argCheck.o differ

diff --git a/src/Tools/filter/mrc2bild/src/X86MAC64/init.o b/src/Tools/filter/mrc2bild/src/X86MAC64/init.o
index b43b603..61c352d 100644 (file)
Binary files a/src/Tools/filter/mrc2bild/src/X86MAC64/init.o and b/src/Tools/filter/mrc2bild/src/X86MAC64/init.o differ

diff --git a/src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild b/src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild
index 3f9091a..92f8a69 100755 (executable)
Binary files a/src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild and b/src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild differ

diff --git a/src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild.o b/src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild.o
index cce4d50..0acbf56 100644 (file)
Binary files a/src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild.o and b/src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild.o differ

diff --git a/src/Tools/filter/mrc2bild/src/X86MAC64/usage.o b/src/Tools/filter/mrc2bild/src/X86MAC64/usage.o
index 3402f40..2c8e0ab 100644 (file)
Binary files a/src/Tools/filter/mrc2bild/src/X86MAC64/usage.o and b/src/Tools/filter/mrc2bild/src/X86MAC64/usage.o differ

diff --git a/src/Tools/filter/mrc2png/src/X86MAC64/.Depend b/src/Tools/filter/mrc2png/src/X86MAC64/.Depend
new file mode 100644 (file)
index 0000000..9a3a2e9
--- /dev/null
+++ b/src/Tools/filter/mrc2png/src/X86MAC64/.Depend
@@ -0,0 +1,160 @@
+argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/sys/_pthread/_pthread_types.h \
+  /usr/include/sys/_types/_va_list.h /usr/include/sys/_types/_size_t.h \
+  /usr/include/sys/_types/_null.h /usr/include/sys/stdio.h \
+  /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \
+  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
+  /usr/include/stdlib.h /usr/include/sys/wait.h \
+  /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \
+  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
+  /usr/include/machine/signal.h /usr/include/i386/signal.h \
+  /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \
+  /usr/include/mach/i386/_structs.h \
+  /usr/include/sys/_pthread/_pthread_attr_t.h \
+  /usr/include/sys/_types/_sigaltstack.h \
+  /usr/include/sys/_types/_ucontext.h \
+  /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
+  /usr/include/sys/resource.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.0/include/stdint.h \
+  /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
+  /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
+  /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
+  /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \
+  /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \
+  /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \
+  /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \
+  /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \
+  /usr/include/i386/types.h /usr/include/sys/_types/_dev_t.h \
+  /usr/include/sys/_types/_mode_t.h /Users/tacyas/Eos/include/string.h \
+  /usr/include/math.h ../inc/config.h ../inc/../inc/mrc2png.h \
+  /Users/tacyas/Eos/include/genUtil.h /Users/tacyas/Eos/include/File.h \
+  /Users/tacyas/Eos/include/Memory.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.0/include/limits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h
+init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/sys/_pthread/_pthread_types.h \
+  /usr/include/sys/_types/_va_list.h /usr/include/sys/_types/_size_t.h \
+  /usr/include/sys/_types/_null.h /usr/include/sys/stdio.h \
+  /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \
+  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
+  /usr/include/stdlib.h /usr/include/sys/wait.h \
+  /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \
+  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
+  /usr/include/machine/signal.h /usr/include/i386/signal.h \
+  /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \
+  /usr/include/mach/i386/_structs.h \
+  /usr/include/sys/_pthread/_pthread_attr_t.h \
+  /usr/include/sys/_types/_sigaltstack.h \
+  /usr/include/sys/_types/_ucontext.h \
+  /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
+  /usr/include/sys/resource.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.0/include/stdint.h \
+  /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
+  /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
+  /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
+  /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \
+  /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \
+  /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \
+  /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \
+  /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \
+  /usr/include/i386/types.h /usr/include/sys/_types/_dev_t.h \
+  /usr/include/sys/_types/_mode_t.h /Users/tacyas/Eos/include/string.h \
+  /usr/include/math.h ../inc/config.h ../inc/../inc/mrc2png.h \
+  /Users/tacyas/Eos/include/genUtil.h /Users/tacyas/Eos/include/File.h \
+  /Users/tacyas/Eos/include/Memory.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.0/include/limits.h \
+  /usr/include/limits.h /usr/include/machine/limits.h \
+  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+  /usr/include/sys/syslimits.h
+usage.o: usage.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/sys/_pthread/_pthread_types.h \
+  /usr/include/sys/_types/_va_list.h /usr/include/sys/_types/_size_t.h \
+  /usr/include/sys/_types/_null.h /usr/include/sys/stdio.h \
+  /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \
+  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
+  /usr/include/stdlib.h /usr/include/sys/wait.h \
+  /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \
+  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
+  /usr/include/machine/signal.h /usr/include/i386/signal.h \
+  /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \
+  /usr/include/mach/i386/_structs.h \
+  /usr/include/sys/_pthread/_pthread_attr_t.h \
+  /usr/include/sys/_types/_sigaltstack.h \
+  /usr/include/sys/_types/_ucontext.h \
+  /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
+  /usr/include/sys/resource.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.0/include/stdint.h \
+  /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
+  /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
+  /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
+  /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \
+  /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \
+  /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \
+  /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \
+  /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \
+  /usr/include/i386/types.h /usr/include/sys/_types/_dev_t.h \
+  /usr/include/sys/_types/_mode_t.h ../inc/config.h \
+  ../inc/../inc/mrc2png.h
+util.o: util.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+  /usr/include/sys/_symbol_aliasing.h \
+  /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
+  /usr/include/AvailabilityInternal.h /usr/include/_types.h \
+  /usr/include/sys/_types.h /usr/include/machine/_types.h \
+  /usr/include/i386/_types.h /usr/include/sys/_pthread/_pthread_types.h \
+  /usr/include/sys/_types/_va_list.h /usr/include/sys/_types/_size_t.h \
+  /usr/include/sys/_types/_null.h /usr/include/sys/stdio.h \
+  /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \
+  /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
+  /usr/include/stdlib.h /usr/include/sys/wait.h \
+  /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \
+  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
+  /usr/include/machine/signal.h /usr/include/i386/signal.h \
+  /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \
+  /usr/include/mach/i386/_structs.h \
+  /usr/include/sys/_pthread/_pthread_attr_t.h \
+  /usr/include/sys/_types/_sigaltstack.h \
+  /usr/include/sys/_types/_ucontext.h \
+  /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
+  /usr/include/sys/resource.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.0/include/stdint.h \
+  /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
+  /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
+  /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
+  /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \
+  /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \
+  /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \
+  /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \
+  /usr/include/machine/endian.h /usr/include/i386/endian.h \
+  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
+  /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \
+  /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \
+  /usr/include/i386/types.h /usr/include/sys/_types/_dev_t.h \
+  /usr/include/sys/_types/_mode_t.h ../inc/config.h \
+  ../inc/../inc/mrc2png.h

diff --git a/src/Tools/filter/mrc2png/src/X86MAC64/Makefile b/src/Tools/filter/mrc2png/src/X86MAC64/Makefile
new file mode 100755 (executable)
index 0000000..ec61247
--- /dev/null
+++ b/src/Tools/filter/mrc2png/src/X86MAC64/Makefile
@@ -0,0 +1,114 @@
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/Config/Define.inc
+include $(EOS_HOME)/src/$(WORLDNAME)/Config/Define.inc
+include $(EOS_HOME)/src/Config/DefineTool.inc
+
+LIBFILES   = \
+                       $(LIBPREFIX)EosObjects$(LIBSUFFIX) 
+
+LIBFILESDEBUG   = \
+                       $(LIBPREFIX)EosObjects.debug$(LIBSUFFIX) 
+
+SRCC  = \
+                       $(OBJECTNAME).c \
+                       init.c \
+                       argCheck.c \
+                       usage.c  \
+                       util.c 
+
+SRCCXX  = \
+                       $(OBJECTNAME).cc \
+                       init.cc \
+                       argCheck.cc \
+                       usage.cc  \
+                       util.cc 
+
+MODULES    = \
+                       $(OBJECTNAME).o \
+                       init.o \
+                       argCheck.o \
+                       usage.o  \
+                       util.o 
+
+REALMODULES    = \
+                       $(OSTYPE)/$(OBJECTNAME).o \
+                       $(OSTYPE)/init.o \
+                       $(OSTYPE)/argCheck.o \
+                       $(OSTYPE)/usage.o \
+                       $(OSTYPE)/util.o 
+
+MODULESDEBUG    = \
+                       $(OBJECTNAME).debugo \
+                       init.debugo \
+                       argCheck.debugo \
+                       usage.debugo  \
+                       util.debugo 
+
+MODULESCUDAGDB    = \
+                       $(OBJECTNAME).cudagdb.o \
+                       init.cudagdb.o \
+                       argCheck.cudagdb.o \
+                       usage.cudagdb.o  \
+                       util.cudagdb.o 
+
+REALMODULESDEBUG    = \
+                       $(OSTYPE)/$(OBJECTNAME).debugo \
+                       $(OSTYPE)/init.debugo \
+                       $(OSTYPE)/argCheck.debugo \
+                       $(OSTYPE)/usage.debugo \
+                       $(OSTYPE)/util.debugo 
+
+
+$(OBJECTNAME): $(MODULES) $(LIBFILES)
+       @if [ -f $(VPATH)/$(OBJECTNAME).c ] ; \
+       then \
+               echo $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
+               $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
+       fi
+       @if [ -f $(VPATH)/$(OBJECTNAME).cc ] ; \
+       then \
+               echo $(CXX) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
+               $(CXX) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
+       fi
+       @if [ -f $(VPATH)/$(OBJECTNAME).ccm ] ; \
+       then \
+               echo "MICO"; \
+               echo $(MICOLD) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
+               $(MICOLD) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
+       fi
+       @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \
+       then \
+               echo $(NVCC) $(NVCCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) $(CUDALIB) $(CUDAINC) -o $@ ;  \
+               $(NVCC) $(NVCCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) $(CUDALIB) $(CUDAINC) -o $@ ;  \
+       fi
+
+
+$(OBJECTNAME).debug: $(MODULESDEBUG) $(LIBFILESDEBUG)
+       @if [ -f $(VPATH)/$(OBJECTNAME).c ] ; \
+       then \
+               echo $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
+               $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
+       fi
+       @if [ -f $(VPATH)/$(OBJECTNAME).cc ] ; \
+       then \
+               echo $(CXX) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
+               $(CXX) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
+       fi
+       @if [ -f $(VPATH)/$(OBJECTNAME).ccm ] ; \
+       then \
+               echo "MICO"; \
+               echo $(MICOLD) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
+               $(MICOLD) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@  ; \
+       fi
+       @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \
+       then \
+               echo $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
+               $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ;  \
+       fi
+
+$(OBJECTNAME).cudagdb: $(MODULESCUDAGDB) $(LIBFILESDEBUG)
+       echo $(NVCC) "$(NVCCOPTSCUDAGDB) $(MODULESCUDAGDB) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@"
+       $(NVCC) $(NVCCOPTSCUDAGDB) $(MODULESCUDAGDB) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@
+
+include ./.Depend
+include  $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Target.inc

diff --git a/src/Tools/filter/mrc2png/src/X86MAC64/argCheck.o b/src/Tools/filter/mrc2png/src/X86MAC64/argCheck.o
new file mode 100644 (file)
index 0000000..a13b88b
Binary files /dev/null and b/src/Tools/filter/mrc2png/src/X86MAC64/argCheck.o differ

diff --git a/src/Tools/filter/mrc2png/src/X86MAC64/init.o b/src/Tools/filter/mrc2png/src/X86MAC64/init.o
new file mode 100644 (file)
index 0000000..c16ece9
Binary files /dev/null and b/src/Tools/filter/mrc2png/src/X86MAC64/init.o differ

diff --git a/src/Tools/filter/mrc2png/src/X86MAC64/usage.o b/src/Tools/filter/mrc2png/src/X86MAC64/usage.o
new file mode 100644 (file)
index 0000000..be71d6f
Binary files /dev/null and b/src/Tools/filter/mrc2png/src/X86MAC64/usage.o differ

diff --git a/src/Tools/filter/mrc2png/src/X86MAC64/util.o b/src/Tools/filter/mrc2png/src/X86MAC64/util.o
new file mode 100644 (file)
index 0000000..1c96097
Binary files /dev/null and b/src/Tools/filter/mrc2png/src/X86MAC64/util.o differ

diff --git a/src/Tools/mrcImage/mrcImageAreaCalc/src/X86MAC64/mrcImageAreaCalc b/src/Tools/mrcImage/mrcImageAreaCalc/src/X86MAC64/mrcImageAreaCalc
index 839a19e..e5c9ad0 100755 (executable)
Binary files a/src/Tools/mrcImage/mrcImageAreaCalc/src/X86MAC64/mrcImageAreaCalc and b/src/Tools/mrcImage/mrcImageAreaCalc/src/X86MAC64/mrcImageAreaCalc differ

diff --git a/src/Tools/mrcImage/mrcImageAreaCalc/src/X86MAC64/usage.o b/src/Tools/mrcImage/mrcImageAreaCalc/src/X86MAC64/usage.o
index eb17df2..6cdfbc5 100644 (file)
Binary files a/src/Tools/mrcImage/mrcImageAreaCalc/src/X86MAC64/usage.o and b/src/Tools/mrcImage/mrcImageAreaCalc/src/X86MAC64/usage.o differ