diff options
Diffstat (limited to 'externals/grill/vasp')
| -rw-r--r-- | externals/grill/vasp/config-pd-linux.txt | 3 | ||||
| -rw-r--r-- | externals/grill/vasp/makefile.pd-linux | 14 | ||||
| -rw-r--r-- | externals/grill/vasp/vasp.cw | bin | 356360 -> 356360 bytes |
3 files changed, 15 insertions, 2 deletions
diff --git a/externals/grill/vasp/config-pd-linux.txt b/externals/grill/vasp/config-pd-linux.txt index 9aca43b3..32fdb9fc 100644 --- a/externals/grill/vasp/config-pd-linux.txt +++ b/externals/grill/vasp/config-pd-linux.txt @@ -33,3 +33,6 @@ HELPDIR=${PD}/doc/5.reference # (check if they fit to your system!) # UFLAGS=-mcpu=pentium3 -msse -mfpmath=sse -fprefetch-loop-arrays UFLAGS=-mcpu=pentiumpro + +# define to link against shared flext library (flext version >= 0.5.0) +#FLEXT_SHARED=1 diff --git a/externals/grill/vasp/makefile.pd-linux b/externals/grill/vasp/makefile.pd-linux index 4caa0097..04d971ef 100644 --- a/externals/grill/vasp/makefile.pd-linux +++ b/externals/grill/vasp/makefile.pd-linux @@ -24,6 +24,16 @@ LDFLAGS=-Wl,-s LIBS=m + +ifdef FLEXT_SHARED +CFLAGS+=-DFLEXT_SHARED +LDFLAGS+=-Bdynamic +LINKFLEXT=-lflext +else +LINKFLEXT=$(FLEXTLIB) +endif + + # ---------------------------------------------- # the rest can stay untouched # ---------------------------------------------- @@ -48,8 +58,8 @@ $(TARGDIR): $(TARGDIR)/%.o : $(SRCDIR)/%.cpp $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@ -$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB) - $(CXX) $(LDFLAGS) -shared $^ $(patsubst %,-l%,$(LIBS)) -o $@ +$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) + $(CXX) $(LDFLAGS) -shared $^ $(patsubst %,-l%,$(LIBS)) -L$(FLEXTPATH) $(LINKFLEXT) -o $@ strip --strip-unneeded $@ chmod 755 $@ diff --git a/externals/grill/vasp/vasp.cw b/externals/grill/vasp/vasp.cw Binary files differindex f0229a51..5d268ff4 100644 --- a/externals/grill/vasp/vasp.cw +++ b/externals/grill/vasp/vasp.cw |