From 51aef530dedd864b25bd6ed5663a85624c781cf8 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Tue, 25 Oct 2011 16:05:57 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7195
f3b2605a-c512-4ea7-a41b-209d697bcdaa
---
src/MAKE/Makefile.linux | 6 +++---
src/read_data.cpp | 3 ---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/MAKE/Makefile.linux b/src/MAKE/Makefile.linux
index f0348b3eea..cf39084f2d 100755
--- a/src/MAKE/Makefile.linux
+++ b/src/MAKE/Makefile.linux
@@ -24,7 +24,7 @@ SIZE = size
# LAMMPS ifdef settings, OPTIONAL
# see possible settings in doc/Section_start.html#2_2 (step 4)
-LMP_INC = -DLAMMPS_GZIP
+LMP_INC = -DLAMMPS_GZIP -DLAMMPS_JPEG
# MPI library, REQUIRED
# see discussion in doc/Section_start.html#2_2 (step 5)
@@ -35,7 +35,7 @@ LMP_INC = -DLAMMPS_GZIP
MPI_INC = -DMPICH_SKIP_MPICXX
MPI_PATH =
-MPI_LIB = -lmpich -lpthread
+MPI_LIB = -lmpich -lmpl -lpthread
# FFT library, OPTIONAL
# see discussion in doc/Section_start.html#2_2 (step 6)
@@ -57,7 +57,7 @@ FFT_LIB = -lfftw
JPG_INC =
JPG_PATH =
-JPG_LIB =
+JPG_LIB = -ljpeg
# ---------------------------------------------------------------------
# build rules and dependencies
diff --git a/src/read_data.cpp b/src/read_data.cpp
index 772c3a3824..a96a566b01 100644
--- a/src/read_data.cpp
+++ b/src/read_data.cpp
@@ -46,9 +46,6 @@ using namespace LAMMPS_NS;
// customize for new sections
#define NSECTIONS 23 // change when add to header::section_keywords
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-
/* ---------------------------------------------------------------------- */
ReadData::ReadData(LAMMPS *lmp) : Pointers(lmp)
--
GitLab