From: Takuo Yasunaga Date: Thu, 17 Mar 2016 07:05:34 +0000 (+0900) Subject: -Length: Added X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c5348a973913d2b0d4daf785256286e86f50ff61;p=eos%2FhostdependX86MAC64.git -Length: Added modified: bin/X86MAC64/mrcImageInfo Source code refactaring: modified: bin/X86MAC64/mrcImageMeanFreePathCalc --- diff --git a/bin/X86MAC64/mrcImageInfo b/bin/X86MAC64/mrcImageInfo index ed790f2ef..2f262739c 100755 Binary files a/bin/X86MAC64/mrcImageInfo and b/bin/X86MAC64/mrcImageInfo differ diff --git a/bin/X86MAC64/mrcImageMeanFreePathCalc b/bin/X86MAC64/mrcImageMeanFreePathCalc index fb65091b6..d1b4c3b36 100755 Binary files a/bin/X86MAC64/mrcImageMeanFreePathCalc and b/bin/X86MAC64/mrcImageMeanFreePathCalc differ diff --git a/lib/X86MAC64/libEosObjects.a b/lib/X86MAC64/libEosObjects.a index b026b3b64..51e59f02e 100644 Binary files a/lib/X86MAC64/libEosObjects.a and b/lib/X86MAC64/libEosObjects.a differ diff --git a/lib/X86MAC64/libmrcImageShape.a b/lib/X86MAC64/libmrcImageShape.a index c6a183b23..04c4248d0 100644 Binary files a/lib/X86MAC64/libmrcImageShape.a and b/lib/X86MAC64/libmrcImageShape.a differ diff --git a/lib/X86MAC64/shared/lmrcImageMeanFreePath.sharedo b/lib/X86MAC64/shared/lmrcImageMeanFreePath.sharedo new file mode 100644 index 000000000..cef5d4c1c Binary files /dev/null and b/lib/X86MAC64/shared/lmrcImageMeanFreePath.sharedo differ diff --git a/lib/X86MAC64/shared/lmrcImageShapeModePrint.sharedo b/lib/X86MAC64/shared/lmrcImageShapeModePrint.sharedo index 1aebad408..5b2cfa3fc 100644 Binary files a/lib/X86MAC64/shared/lmrcImageShapeModePrint.sharedo and b/lib/X86MAC64/shared/lmrcImageShapeModePrint.sharedo differ diff --git a/lib/X86MAC64/shared/lmrcImageShapeSearch.sharedo b/lib/X86MAC64/shared/lmrcImageShapeSearch.sharedo index 1e55a806a..73a141fc0 100644 Binary files a/lib/X86MAC64/shared/lmrcImageShapeSearch.sharedo and b/lib/X86MAC64/shared/lmrcImageShapeSearch.sharedo differ diff --git a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/.Depend b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/.Depend index e69de29bb..20a3a2008 100644 --- a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/.Depend +++ b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/.Depend @@ -0,0 +1,3 @@ +X86MAC64/lmrcImageMeanFreePath.o:lmrcImageMeanFreePath.o +X86MAC64/lmrcImageShapeModePrint.o:lmrcImageShapeModePrint.o +X86MAC64/lmrcImageShapeSearch.o:lmrcImageShapeSearch.o diff --git a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/.Source b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/.Source index 0b01c5ad1..655134e8d 100644 --- a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/.Source +++ b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/.Source @@ -1,36 +1,45 @@ SRC = \ +lmrcImageMeanFreePath.c \ lmrcImageShapeModePrint.c \ lmrcImageShapeSearch.c \ OBJ = \ +lmrcImageMeanFreePath.o \ lmrcImageShapeModePrint.o \ lmrcImageShapeSearch.o \ SHAREDOBJ = \ +lmrcImageMeanFreePath.sharedo \ lmrcImageShapeModePrint.sharedo \ lmrcImageShapeSearch.sharedo \ REALOBJ = \ +X86MAC64/lmrcImageMeanFreePath.o \ X86MAC64/lmrcImageShapeModePrint.o \ X86MAC64/lmrcImageShapeSearch.o \ REALSHAREDOBJ = \ +X86MAC64/lmrcImageMeanFreePath.sharedo \ X86MAC64/lmrcImageShapeModePrint.sharedo \ X86MAC64/lmrcImageShapeSearch.sharedo \ OBJDEBUG = \ +lmrcImageMeanFreePath.debugo \ lmrcImageShapeModePrint.debugo \ lmrcImageShapeSearch.debugo \ REALOBJDEBUG = \ +X86MAC64/lmrcImageMeanFreePath.debugo \ X86MAC64/lmrcImageShapeModePrint.debugo \ X86MAC64/lmrcImageShapeSearch.debugo \ OBJCUDAGDB = \ +lmrcImageMeanFreePath.cudagdb.o \ lmrcImageShapeModePrint.cudagdb.o \ lmrcImageShapeSearch.cudagdb.o \ REALOBJCUDAGDB = \ +X86MAC64/lmrcImageMeanFreePath.cudagdb.o \ X86MAC64/lmrcImageShapeModePrint.cudagdb.o \ X86MAC64/lmrcImageShapeSearch.cudagdb.o \ diff --git a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/libmrcImageShape.a b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/libmrcImageShape.a index 705575b33..04c4248d0 100644 Binary files a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/libmrcImageShape.a and b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/libmrcImageShape.a differ diff --git a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/libmrcImageShape.debug.a b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/libmrcImageShape.debug.a index 4968d810f..8edafde3f 100644 Binary files a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/libmrcImageShape.debug.a and b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/libmrcImageShape.debug.a differ diff --git a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageMeanFreePath.c b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageMeanFreePath.c new file mode 120000 index 000000000..29d5deef1 --- /dev/null +++ b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageMeanFreePath.c @@ -0,0 +1 @@ +../lmrcImageMeanFreePath.c \ No newline at end of file diff --git a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageMeanFreePath.debugo b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageMeanFreePath.debugo new file mode 100644 index 000000000..06ca9d0f8 Binary files /dev/null and b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageMeanFreePath.debugo differ diff --git a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageMeanFreePath.o b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageMeanFreePath.o new file mode 100644 index 000000000..cef5d4c1c Binary files /dev/null and b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageMeanFreePath.o differ diff --git a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageMeanFreePath.sharedo b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageMeanFreePath.sharedo new file mode 100644 index 000000000..cef5d4c1c Binary files /dev/null and b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageMeanFreePath.sharedo differ diff --git a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageShapeSearch.debugo b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageShapeSearch.debugo index 393512fc6..9c23e2ee4 100644 Binary files a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageShapeSearch.debugo and b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageShapeSearch.debugo differ diff --git a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageShapeSearch.o b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageShapeSearch.o index 1e55a806a..73a141fc0 100644 Binary files a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageShapeSearch.o and b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageShapeSearch.o differ diff --git a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageShapeSearch.sharedo b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageShapeSearch.sharedo index 1e55a806a..73a141fc0 100644 Binary files a/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageShapeSearch.sharedo and b/src/Objects/DataManip/mrcImageShape/src/X86MAC64/lmrcImageShapeSearch.sharedo differ diff --git a/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/.Depend b/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/.Depend index e118069e3..85f63915f 100644 --- a/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/.Depend +++ b/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/.Depend @@ -19,7 +19,7 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.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 \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.2/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 \ @@ -33,13 +33,11 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.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/hisanagakouji/Eos/include/string.h /usr/include/math.h \ - ../inc/config.h ../inc/../inc/mrcImageInfo.h \ - /Users/hisanagakouji/Eos/include/genUtil.h \ - /Users/hisanagakouji/Eos/include/File.h \ - /Users/hisanagakouji/Eos/include/Memory.h \ - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.0/include/limits.h \ + /usr/include/sys/_types/_mode_t.h /Users/tacyas/Eos/include/string.h \ + /usr/include/math.h ../inc/config.h ../inc/../inc/mrcImageInfo.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.2/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 @@ -64,7 +62,7 @@ init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.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 \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.2/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 \ @@ -78,13 +76,11 @@ init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.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/hisanagakouji/Eos/include/string.h /usr/include/math.h \ - ../inc/config.h ../inc/../inc/mrcImageInfo.h \ - /Users/hisanagakouji/Eos/include/genUtil.h \ - /Users/hisanagakouji/Eos/include/File.h \ - /Users/hisanagakouji/Eos/include/Memory.h \ - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.0/include/limits.h \ + /usr/include/sys/_types/_mode_t.h /Users/tacyas/Eos/include/string.h \ + /usr/include/math.h ../inc/config.h ../inc/../inc/mrcImageInfo.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.2/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 @@ -109,7 +105,7 @@ mrcImageInfo.o: mrcImageInfo.c /usr/include/stdio.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 \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.2/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 \ @@ -124,14 +120,12 @@ mrcImageInfo.o: mrcImageInfo.c /usr/include/stdio.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 /usr/include/math.h ../inc/config.h \ - ../inc/../inc/mrcImageInfo.h \ - /Users/hisanagakouji/Eos/include/genUtil.h \ - /Users/hisanagakouji/Eos/include/string.h \ - /Users/hisanagakouji/Eos/include/mrcImage.h \ - /Users/hisanagakouji/Eos/include/Matrix3D.h \ - /Users/hisanagakouji/Eos/include/Vector.h \ - /Users/hisanagakouji/Eos/include/Array.h \ - /Users/hisanagakouji/Eos/include/ctfInfo.h + ../inc/../inc/mrcImageInfo.h /Users/tacyas/Eos/include/genUtil.h \ + /Users/tacyas/Eos/include/string.h \ + /Users/tacyas/Eos/include/mrcImage.h \ + /Users/tacyas/Eos/include/Matrix3D.h \ + /Users/tacyas/Eos/include/Vector.h /Users/tacyas/Eos/include/Array.h \ + /Users/tacyas/Eos/include/ctfInfo.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 \ @@ -153,7 +147,7 @@ usage.o: usage.c /usr/include/stdio.h /usr/include/sys/cdefs.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 \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.2/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 \ @@ -190,7 +184,7 @@ util.o: util.c /usr/include/stdio.h /usr/include/sys/cdefs.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 \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/7.0.2/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 \ diff --git a/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/argCheck.o b/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/argCheck.o index b1427c21c..07d5c5b7e 100644 Binary files a/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/argCheck.o and b/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/argCheck.o differ diff --git a/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/init.o b/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/init.o index 23163b2a5..ca9dff58b 100644 Binary files a/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/init.o and b/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/init.o differ diff --git a/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/mrcImageInfo b/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/mrcImageInfo index ed790f2ef..2f262739c 100755 Binary files a/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/mrcImageInfo and b/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/mrcImageInfo differ diff --git a/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/mrcImageInfo.o b/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/mrcImageInfo.o index 67b8284d2..aad9261d9 100644 Binary files a/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/mrcImageInfo.o and b/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/mrcImageInfo.o differ diff --git a/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/usage.o b/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/usage.o index 70e037250..a261cd9e6 100644 Binary files a/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/usage.o and b/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/usage.o differ diff --git a/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/X86MAC64/mrcImageMeanFreePathCalc b/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/X86MAC64/mrcImageMeanFreePathCalc index fb65091b6..d1b4c3b36 100755 Binary files a/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/X86MAC64/mrcImageMeanFreePathCalc and b/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/X86MAC64/mrcImageMeanFreePathCalc differ diff --git a/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/X86MAC64/mrcImageMeanFreePathCalc.o b/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/X86MAC64/mrcImageMeanFreePathCalc.o index 9e1c55219..433dbeb08 100644 Binary files a/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/X86MAC64/mrcImageMeanFreePathCalc.o and b/src/Tools/mrcImage/mrcImageMeanFreePathCalc/src/X86MAC64/mrcImageMeanFreePathCalc.o differ