Some spec cond diffs.

Some Linux/Dos diffs.




git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4911 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2010-10-26 22:48:33 +00:00
parent d6d3c223d2
commit 3e8e792778

View File

@ -115,7 +115,7 @@ EFENCE_LIB=-L$(HOME)/packages/efence
# 2 Versions
# -----------------------------------------------------------------------------
ifeq ($(CFG), RELEASE)
DEFINES = -DPHREEQC_CPP -DNDEBUG $(DEFINE_INVERSE_CL1MP)
DEFINES = -DPHREEQC_CPP -DNDEBUG -DMERGE_INCLUDE_FILES $(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 $(DEFINE_INVERSE_CL1MP)
DEFINES = -DPHREEQC_CPP -DUSE_PHRQ_ALLOC -DMERGE_INCLUDE_FILES $(DEFINE_INVERSE_CL1MP)
VPATH = ..:../phreeqc
INCLUDES = -I../phreeqc
CXX = g++
@ -135,7 +135,7 @@ ifeq ($(CFG), DEBUG)
endif
ifeq ($(CFG), CLASS_DEBUG)
DEFINES = -DPHREEQC_CPP -DUSE_PHRQ_ALLOC -DPHREEQC_CLASS $(DEFINE_INVERSE_CL1MP)
DEFINES = -DPHREEQC_CPP -DUSE_PHRQ_ALLOC -DPHREEQC_CLASS -DMERGE_INCLUDE_FILES $(DEFINE_INVERSE_CL1MP)
VPATH = ..:../phreeqc
INCLUDES = -I../phreeqc -I..
CXX = g++
@ -145,7 +145,7 @@ ifeq ($(CFG), CLASS_DEBUG)
endif
ifeq ($(CFG), CLASS_RELEASE)
DEFINES = -DPHREEQC_CPP -DNDEBUG -DPHREEQC_CLASS $(DEFINE_INVERSE_CL1MP)
DEFINES = -DPHREEQC_CPP -DNDEBUG -DPHREEQC_CLASS -DMERGE_INCLUDE_FILES $(DEFINE_INVERSE_CL1MP)
VPATH = ..:../phreeqc
INCLUDES = -I../phreeqc -I..
CXX = g++