latest phreeqcpp

modified calc_SC to 273.15

Makefile does not merge for nonclass versions


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4992 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2010-12-22 16:55:54 +00:00
parent f3f50f0219
commit e2c2949e1d

View File

@ -115,7 +115,7 @@ EFENCE_LIB=-L$(HOME)/packages/efence
# 2 Versions
# -----------------------------------------------------------------------------
ifeq ($(CFG), RELEASE)
DEFINES = -DPHREEQC_CPP -DNDEBUG -DMERGE_INCLUDE_FILES $(DEFINE_INVERSE_CL1MP)
DEFINES = -DPHREEQC_CPP -DNDEBUG $(DEFINE_INVERSE_CL1MP)
VPATH = ..:../phreeqc
INCLUDES = -I../phreeqc
CXX = g++
@ -125,7 +125,7 @@ ifeq ($(CFG), RELEASE)
endif
ifeq ($(CFG), DEBUG)
DEFINES = -DPHREEQC_CPP -DUSE_PHRQ_ALLOC -DMERGE_INCLUDE_FILES $(DEFINE_INVERSE_CL1MP)
DEFINES = -DPHREEQC_CPP -DUSE_PHRQ_ALLOC $(DEFINE_INVERSE_CL1MP)
VPATH = ..:../phreeqc
INCLUDES = -I../phreeqc
CXX = g++