Unverified Commit 1cf65375 authored by Dmytro Kresan's avatar Dmytro Kresan Committed by GitHub
Browse files

Merge pull request #2 from kresan/new_urqmd

Add support of newer UrQMD version
parents 8bdb5018 64a30a57
......@@ -30,7 +30,7 @@ lib : $(TOPDIR)/lib/lib$(TARGET).so rootmap
$(TOPDIR)/lib/lib$(TARGET).so : $(objects) $(TARGET)Dict.o
@echo 'Creating library' $@ '...'
@mkdir -p $(TOPDIR)/lib
@$(LD) $^ $(LDFLAGS) --shared -o $@
@$(LD) $^ $(dependencies) $(LDFLAGS) --shared -o $@
rootmap: $(TOPDIR)/lib/lib$(TARGET).rootmap
......
......@@ -3,14 +3,9 @@
# assuming that this macro is sitting at its original location,
# its path can be used to set the unigen enviroment
filnam=$BASH_SOURCE # filename of this (sourced) macro
absnam=`readlink -f $filnam` # absolute filename
pather=`dirname $absnam` # path to the config directory
pather=`dirname $pather` # path to the top unigen directory
export UNIGEN=$pather
export UNIGEN=$PWD
export PATH=${UNIGEN}/lib':'${UNIGEN}/bin':'${PATH}
export LD_LIBRARY_PATH=${UNIGEN}/lib':'${LD_LIBRARY_PATH}
echo UNIGEN = $UNIGEN
\ No newline at end of file
echo UNIGEN = $UNIGEN
File mode changed from 100755 to 100644
......@@ -142,12 +142,16 @@ int main(int argc, char *argv[]) {
comment.clear();
// read 3 lines of options and 4 lines of params
for (int i=0; i<7; i++) {
getline(in,line);
for (int i=0; i<100; i++) {
getline(in,line);
if(0 == line.substr(0, 4).compare("pvec"))
{
break;
}
comment.append(line);
comment.append("\n");
}
in.ignore(777,'\n');
//in.ignore(777,'\n');
ev->Clear();
ev->SetEventNr(nr);
......
......@@ -7,6 +7,7 @@ TARGET=Tasks
INCDIR=-Iinclude -I$(TOPDIR)/base/include
CXXFLAGS+=$(INCDIR)
rlibmap_deps=-d $(TOPDIR)/lib/libUniGen.so
dependencies=-L $(TOPDIR)/lib -lUniGen
# Target files
sources=$(wildcard src/*.cxx)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment