From 9c5e2aa5b794a303e8e829825e3e622432f17a8e Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Wed, 9 Apr 2014 10:29:11 +0000 Subject: [PATCH] compiling with and without root defined in makefile.include git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@269 af1100a4-978c-4157-bff7-07162d2ba061 --- slsDetectorGui/Makefile | 2 ++ slsDetectorGui/include/qDefs.h | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile index b9cccd7a7..f5ead9d49 100644 --- a/slsDetectorGui/Makefile +++ b/slsDetectorGui/Makefile @@ -13,6 +13,8 @@ INCLUDES ?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/MySocketTCP -I$(LIBRARYD ifeq ( $(EIGERSLS), yes) LDFLAG += $(EIGERFLAGS) +else ifeq ( $(ROOTSLS), yes) + LDFLAG += $(ROOTFLAGS) endif .PHONY: all lib clean mm doc htmldoc guiclient diff --git a/slsDetectorGui/include/qDefs.h b/slsDetectorGui/include/qDefs.h index 61e276e3f..497a809ba 100644 --- a/slsDetectorGui/include/qDefs.h +++ b/slsDetectorGui/include/qDefs.h @@ -217,10 +217,6 @@ static const int64_t GUI_VERSION=0x20121213; //display message 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();