Merge branch 'dev'

ovilab · Oct 29, 2015 · c3305f1 · c3305f1
2 parents 2aee508 + 9833744
commit c3305f1
Show file tree

Hide file tree

Showing 33 changed files with 634 additions and 981 deletions.
diff --git a/atomify-lammps/CPcompute.cpp b/atomify-lammps/CPcompute.cpp
diff --git a/atomify-lammps/CPcompute.h b/atomify-lammps/CPcompute.h
diff --git a/atomify-lammps/atomify-lammps.pro b/atomify-lammps/atomify-lammps.pro
@@ -12,8 +12,8 @@ CONFIG += warn_off
 
 android {
     DEFINES += LAMMPS_XDR
-    SOURCES += stdioext.c
-    HEADERS += stdioext.h
+    SOURCES +=
+    HEADERS +=
     LIBS += -fopenmp
     include(../lammps-android.pri)
 } else {
@@ -43,8 +43,6 @@ SOURCES += \
     mysimulator.cpp \
     lammpscontroller.cpp \
     highlighter.cpp \
-    CPcompute.cpp \
-    lammpsoutput.cpp \
     atomstyle.cpp \
     fileio.cpp \
     scriptparser.cpp \
@@ -54,14 +52,14 @@ SOURCES += \
     scriptcommand.cpp \
     linegraph.cpp \
     graph.cpp \
-    figure.cpp
+    figure.cpp \
+    cpfix.cpp \
+    cpcompute.cpp
 
 HEADERS += \
     mysimulator.h \
     lammpscontroller.h \
     highlighter.h \
-    CPcompute.h \
-    lammpsoutput.h \
     atomstyle.h \
     fileio.h \
     scriptparser.h \
@@ -71,7 +69,9 @@ HEADERS += \
     scriptcommand.h \
     linegraph.h \
     graph.h \
-    figure.h
+    figure.h \
+    cpfix.h \
+    cpcompute.h
 
 DISTFILES += \
     iOS.plist \