detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-09 19:40:42 +02:00
Code Issues Actions Packages Releases Activity

compiling with and without root defined in makefile.include

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@269 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d 2014-04-09 10:29:11 +00:00
parent 02c4a5e18e
commit 9c5e2aa5b7
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/Makefile
View File

@ -13,6 +13,8 @@ INCLUDES ?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/MySocketTCP -I$(LIBRARYD
ifeq ( $(EIGERSLS), yes) ifeq ( $(EIGERSLS), yes)
LDFLAG += $(EIGERFLAGS) LDFLAG += $(EIGERFLAGS)
else ifeq ( $(ROOTSLS), yes)
LDFLAG += $(ROOTFLAGS)
endif endif
.PHONY: all lib clean mm doc htmldoc guiclient .PHONY: all lib clean mm doc htmldoc guiclient

4
slsDetectorGui/include/qDefs.h
View File

@ -217,10 +217,6 @@ static const int64_t GUI_VERSION=0x20121213;
//display message //display message
qDefs::Message((MessageIndex)errorLevel,retval,title); qDefs::Message((MessageIndex)errorLevel,retval,title);
if(retval.find("CAKE")!=string::npos){
qDefs::Message((MessageIndex)errorLevel,"So You will get a cake tomorrow right?",title);
}
} }
myDet->clearAllErrorMask(); myDet->clearAllErrorMask();