• R/O
  • HTTP
  • SSH
  • HTTPS

hostdependX86MAC64: Commit

binary repository for general OS-X(64bits)


Commit MetaInfo

Revision104328461964946c0f78b5a4d3d63258094a1f4e (tree)
Time2022-01-21 20:04:43
AuthorKenta-morimori <takemori.kenta.official@gmai...>
CommiterKenta-morimori

Log Message

Merge remote-tracking branch 'refs/remotes/origin/master'

It looks like you may be committing a merge.
If this is not correct, please run

git update-ref -d MERGE_HEAD

and try again.
Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
All conflicts fixed but you are still merging.
Changes to be committed:

modified: bin/X86MAC64/mrc2bild
modified: lib/X86MAC64/libEosObjects.a
modified: lib/X86MAC64/libbildFile.a
modified: lib/X86MAC64/shared/lmrc2bild.sharedo
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
modified: src/Tools/filter/mrc2bild/src/X86MAC64/util.o
modified: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/.Depend
new file: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/X86MAC64
modified: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/argCheck.o
modified: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/init.o
modified: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/mrcImageBlurByTemperatureFactor
modified: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/mrcImageBlurByTemperatureFactor.o
modified: src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/usage.o

Change Summary

Incremental Difference

Binary files a/bin/X86MAC64/mrc2bild and b/bin/X86MAC64/mrc2bild differ
Binary files a/lib/X86MAC64/libEosObjects.a and b/lib/X86MAC64/libEosObjects.a differ
Binary files a/lib/X86MAC64/libbildFile.a and b/lib/X86MAC64/libbildFile.a differ
Binary files a/lib/X86MAC64/shared/lmrc2bild.sharedo and b/lib/X86MAC64/shared/lmrc2bild.sharedo differ
Binary files a/src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.a and b/src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.a differ
Binary files a/src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.debug.a and b/src/Objects/DataManip/bildFile/src/X86MAC64/libbildFile.debug.a differ
Binary files a/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.debugo and b/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.debugo differ
Binary files a/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.o and b/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.o differ
Binary files a/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.sharedo and b/src/Objects/DataManip/bildFile/src/X86MAC64/lmrc2bild.sharedo differ
Binary files a/src/Tools/filter/mrc2bild/src/X86MAC64/argCheck.o and b/src/Tools/filter/mrc2bild/src/X86MAC64/argCheck.o differ
Binary files a/src/Tools/filter/mrc2bild/src/X86MAC64/init.o and b/src/Tools/filter/mrc2bild/src/X86MAC64/init.o differ
Binary files a/src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild and b/src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild differ
Binary files a/src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild.o and b/src/Tools/filter/mrc2bild/src/X86MAC64/mrc2bild.o differ
Binary files a/src/Tools/filter/mrc2bild/src/X86MAC64/usage.o and b/src/Tools/filter/mrc2bild/src/X86MAC64/usage.o differ
Binary files a/src/Tools/filter/mrc2bild/src/X86MAC64/util.o and b/src/Tools/filter/mrc2bild/src/X86MAC64/util.o differ
--- a/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/.Depend
+++ b/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/.Depend
@@ -180,6 +180,93 @@ init.o: init.c \
180180 /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/i386/limits.h \
181181 /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/i386/_limits.h \
182182 /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/syslimits.h
183+mrcImageBlurByTemperatureFactor.o: mrcImageBlurByTemperatureFactor.c \
184+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/stdio.h \
185+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/_stdio.h \
186+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/cdefs.h \
187+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_symbol_aliasing.h \
188+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_posix_availability.h \
189+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/Availability.h \
190+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/AvailabilityVersions.h \
191+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/AvailabilityInternal.h \
192+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/_types.h \
193+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types.h \
194+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/machine/_types.h \
195+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/i386/_types.h \
196+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_pthread/_pthread_types.h \
197+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_va_list.h \
198+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/machine/types.h \
199+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/i386/types.h \
200+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_int8_t.h \
201+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_int16_t.h \
202+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_int32_t.h \
203+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_int64_t.h \
204+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_u_int8_t.h \
205+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_u_int16_t.h \
206+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_u_int32_t.h \
207+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_u_int64_t.h \
208+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_intptr_t.h \
209+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_uintptr_t.h \
210+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_size_t.h \
211+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_null.h \
212+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/stdio.h \
213+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/_ctermid.h \
214+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_off_t.h \
215+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_ssize_t.h \
216+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/secure/_stdio.h \
217+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/secure/_common.h \
218+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/stdlib.h \
219+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/wait.h \
220+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_pid_t.h \
221+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_id_t.h \
222+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/signal.h \
223+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/appleapiopts.h \
224+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/machine/signal.h \
225+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/i386/signal.h \
226+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/machine/_mcontext.h \
227+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/i386/_mcontext.h \
228+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/mach/machine/_structs.h \
229+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/mach/i386/_structs.h \
230+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_pthread/_pthread_attr_t.h \
231+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_sigaltstack.h \
232+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_ucontext.h \
233+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_sigset_t.h \
234+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_uid_t.h \
235+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/resource.h \
236+ /Library/Developer/CommandLineTools/usr/lib/clang/12.0.0/include/stdint.h \
237+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/stdint.h \
238+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/_types/_uint8_t.h \
239+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/_types/_uint16_t.h \
240+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/_types/_uint32_t.h \
241+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/_types/_uint64_t.h \
242+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/_types/_intmax_t.h \
243+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/_types/_uintmax_t.h \
244+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_timeval.h \
245+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/machine/endian.h \
246+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/i386/endian.h \
247+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_endian.h \
248+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/libkern/_OSByteOrder.h \
249+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/libkern/i386/_OSByteOrder.h \
250+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/alloca.h \
251+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_ct_rune_t.h \
252+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_rune_t.h \
253+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_wchar_t.h \
254+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/malloc/_malloc.h \
255+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_dev_t.h \
256+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_mode_t.h \
257+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/string.h \
258+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_rsize_t.h \
259+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/_types/_errno_t.h \
260+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/strings.h \
261+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/secure/_strings.h \
262+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/secure/_string.h \
263+ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/math.h \
264+ ../inc/config.h ../inc/../inc/mrcImageBlurByTemperatureFactor.h \
265+ /Users/tacyas1/Eos/include/genUtil.h \
266+ /Users/tacyas1/Eos/include/mrcImage.h \
267+ /Users/tacyas1/Eos/include/Matrix3D.h \
268+ /Users/tacyas1/Eos/include/Vector.h /Users/tacyas1/Eos/include/Array.h \
269+ /Users/tacyas1/Eos/include/ctfInfo.h
183270 usage.o: usage.c \
184271 /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/stdio.h \
185272 /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/_stdio.h \
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/X86MAC64
@@ -0,0 +1 @@
1+../../../../../hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64
\ No newline at end of file
Binary files a/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/argCheck.o and b/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/argCheck.o differ
Binary files a/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/init.o and b/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/init.o differ
Binary files a/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/mrcImageBlurByTemperatureFactor and b/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/mrcImageBlurByTemperatureFactor differ
Binary files a/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/mrcImageBlurByTemperatureFactor.o and b/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/mrcImageBlurByTemperatureFactor.o differ
Binary files a/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/usage.o and b/src/Tools/mrcImage/mrcImageBlurByTemperatureFactor/src/X86MAC64/usage.o differ
Show on old repository browser