Skip to content
Snippets Groups Projects
Commit 823d3266 authored by matta's avatar matta
Browse files

merge of '4db60b47f6f2dd13ae7ac5f6836e75afffe24baf'

     and '730c97071be88f20a364d83a296e681bc525d0ac'
parents 9ce03bd8 06b602d7
No related branches found
No related tags found
No related merge requests found
...@@ -117,9 +117,9 @@ endif ...@@ -117,9 +117,9 @@ endif
ifeq ($(ARCH),linuxx8664gcc) ifeq ($(ARCH),linuxx8664gcc)
# AMD Opteron and Intel EM64T (64 bit mode) Linux with gcc 3.x # AMD Opteron and Intel EM64T (64 bit mode) Linux with gcc 3.x
CXX = g++ CXX = g++
CXXFLAGS = $(OPT2) -Wall -fPIC CXXFLAGS = $(OPT2) -Wall -fPIC -Xlinker --no-as-needed
LD = g++ LD = g++
LDFLAGS = $(OPT2) LDFLAGS = $(OPT2) -Xlinker --no-as-needed
SOFLAGS = -shared SOFLAGS = -shared
endif endif
......
...@@ -110,7 +110,6 @@ void Beam::ReadConfigurationFile(string Path){ ...@@ -110,7 +110,6 @@ void Beam::ReadConfigurationFile(string Path){
bool check_AllEnergy = false; bool check_AllEnergy = false;
bool check_AllEmittance = false; bool check_AllEmittance = false;
ifstream ReactionFile;
string GlobalPath = getenv("NPTOOL"); string GlobalPath = getenv("NPTOOL");
string StandardPath = GlobalPath + "/Inputs/EventGenerator/" + Path; string StandardPath = GlobalPath + "/Inputs/EventGenerator/" + Path;
ReactionFile.open(StandardPath.c_str()); ReactionFile.open(StandardPath.c_str());
......
...@@ -19,6 +19,7 @@ G4BIN = ./bin ...@@ -19,6 +19,7 @@ G4BIN = ./bin
CPPFLAGS += $(shell root-config --cflags) CPPFLAGS += $(shell root-config --cflags)
CPPFLAGS += -I$(NPTOOL)/NPLib/include CPPFLAGS += -I$(NPTOOL)/NPLib/include
CPPFLAGS += -Xlinker --no-as-needed
EXTRALIBS = $(shell root-config --glibs) -lMathMore EXTRALIBS = $(shell root-config --glibs) -lMathMore
EXTRALIBS += `$(NPTOOL)/NPLib/liblist` EXTRALIBS += `$(NPTOOL)/NPLib/liblist`
.PHONY: all .PHONY: all
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment