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 is up to date with 'origin/master'.

 Changes to be committed:
	new file:   .gitattributes
	modified:   .gitignore
	new file:   Integration/SerialEM/Nav/serialEMNav.py
	modified:   hostdepend/ARM64MAC64
	modified:   util/src/MATH/Makefile
	modified:   util/src/Makefile

 Changes not staged for commit:
	modified:   include/eosMATH.h

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..e899692
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.c text=auto
+hostdepend/*/* -text

diff --git a/.gitignore b/.gitignore
index 2190e9c..4831c20 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ src/Tools/Test/
 # hostdepend
 hostdepend/OTHERS/
 hostdepend/X86MAC64/
+hostdepend/ARC86MAC64/
 hostdepend/X86LINUX64/
 hostdepend/X86LINUX64ICC/
 

diff --git a/Integration/SerialEM/Nav/serialEMNav.py b/Integration/SerialEM/Nav/serialEMNav.py
new file mode 100644 (file)
index 0000000..194f9e9
--- /dev/null
+++ b/Integration/SerialEM/Nav/serialEMNav.py
@@ -0,0 +1,29 @@
+# FileFormats 
+# https://bio3d.colorado.edu/SerialEM/stableHlp/html/about_formats.htm
+#
+
+class serialEMNaviItem:
+    Color = 0
+    Stage
+    NumPts
+    Regis
+    Type
+    Note
+    GroundID
+    Imported
+    OrigReg
+    MapFile
+    MapID
+    MapMontage
+    MapSection
+    MapBinnign
+
+
+class serialEMNavi:
+    AdhocVersion="2.00"
+
+
+
+    def set(self):
+
+

diff --git a/hostdepend/ARM64MAC64 b/hostdepend/ARM64MAC64
index b8324d9..6d3d24d 160000 (submodule)
--- a/hostdepend/ARM64MAC64
+++ b/hostdepend/ARM64MAC64
@@ -1 +1 @@
-Subproject commit b8324d995ef7bb8396599304680be33b59b81c5e
+Subproject commit 6d3d24da19cdb9041477469e7c3340567e3579af

diff --git a/util/src/MATH/Makefile b/util/src/MATH/Makefile
index bf53398..534e8d7 100755 (executable)
--- a/util/src/MATH/Makefile
+++ b/util/src/MATH/Makefile
@@ -1,6 +1,8 @@
 include ${EOS_HOME}/src/Config/${EOS_HOST}${FLAG_ICC}.inc
 -include Config/Define.inc
 
+
+FFTWWHERE=http://www.fftw.org/
 FFTWVERSION=3.3.10
 NRVERSION=1.1
 #GSLVERSION=1.16
@@ -29,7 +31,7 @@ fftw::
 
 fftwCheck::
        #ln -sf ../../src/MATH/fftw-$(FFTWVERSION).tar.gz .
-       curl -L http://www.fftw.org/fftw-$(FFTWVERSION).tar.gz > fftw-$(FFTWVERSION).tar.gz
+       curl -L $(FFTWWHERE)/fftw-$(FFTWVERSION).tar.gz > fftw-$(FFTWVERSION).tar.gz
        gzip -dc fftw-$(FFTWVERSION).tar.gz | tar xvf -
 
 fftwConfig:

diff --git a/util/src/Makefile b/util/src/Makefile
index 5396f43..a527a34 100644 (file)
--- a/util/src/Makefile
+++ b/util/src/Makefile
@@ -1,16 +1,5 @@
 include ${EOS_HOME}/src/Config/${EOS_HOST}.inc
 
-#CLASS = \
-       Admin    \
-       AI       \
-       Database \
-       Graphics \
-       TclTk    \
-       MATH     \
-       Ruby     \
-       Parallel \
-       ImageAnalysis
-
 CLASS = \
        Admin    \
        AI \