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

reverted Makefile

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@806 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2014-03-25 16:05:31 +00:00
parent 9229b06e75
commit 4eb233cdf0
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/slsReceiver/Makefile
View File

@ -3,14 +3,11 @@ CFLAGS += -DSLS_RECEIVER_FUNCTION_LIST -O3
CPPFLAGS = ${CFLAGS} # for MAC CPPFLAGS = ${CFLAGS} # for MAC
LDFLAG= -L/usr/lib64/ -lpthread -lm -lstdc++ LDFLAG= -L/usr/lib64/ -lpthread -lm -lstdc++
POCODIR = /afs/psi.ch/user/s/sala/public/poco-slp_6.4-64bit
JSONBOXDIR = /afs/psi.ch/user/s/sala/public/JsonBox-slp_6.4-64bit
EIGERFLAGS = -L $(JSONBOXDIR) -L $(POCODIR)/lib -Wl,-rpath=$(POCODIR)/lib -I $(POCODIR)/include -I $(JSONBOXDIR)/include
#LDLIBS += -lm -lstdc++ -lpthread #LDLIBS += -lm -lstdc++ -lpthread
LIBS?= -L$(LIBDIR) -lSlsDetector LIBS?= -L$(LIBDIR) -lSlsDetector
INCLUDES ?= -I ../MySocketTCP -I ../commonFiles -I -I ../../../slsDetectorCalibration -I . INCLUDES ?= -I ../MySocketTCP -I ../commonFiles -I -I ../../../slsDetectorCalibration -I .
SRC_CLNT = slsReceiver.cpp SRC_CLNT = slsReceiver.cpp
#../MySocketTCP/MySocketTCP.cpp slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp slsReceiverUsers.cpp #../MySocketTCP/MySocketTCP.cpp slsReceiver_funcs.cpp UHRIXCallback.cpp slsReceiverFunctionList.cpp slsReceiverUsers.cpp
@ -43,10 +40,7 @@ $(DESTDIR)/slsReceiver: lib
mkdir -p $(DESTDIR) mkdir -p $(DESTDIR)
$(CXX) -o $@ $(SRC_CLNT) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAG) $(CXX) -o $@ $(SRC_CLNT) $(FLAGS) $(INCLUDES) $(CLAGS) $(LIBS) $(LDFLAG)
eigerReceiver:
$(CXX) $(FLAGS) $(CFLAGS) $(EIGERFLAGS) -c -o eigerReceiverTest.o eigerReceiverTest.cpp -lPocoNet -lPocoFoundation -lJsonBox
$(CXX) $(FLAGS) $(CFLAGS) $(EIGERFLAGS) -c -o eigerReceiver.o eigerReceiver.cpp -lPocoNet -lPocoFoundation -lJsonBox
$(CXX) $(EIGERFLAGS) eigerReceiverTest.o eigerReceiver.o -o eigerReceiverTest -lPocoNet -lPocoFoundation -lJsonBox
lib: lib:
cd ../ && $(MAKE) DESTDIR=$(LIBDIR) cd ../ && $(MAKE) DESTDIR=$(LIBDIR)

2
slsDetectorSoftware/slsReceiver/eigerReceiver.h
View File

@ -171,7 +171,7 @@ public:
* @param i file write enable * @param i file write enable
/returns file write enable /returns file write enable
*/ */
virtual int setEnableFileWrite(const int i) = 0; virtual int setEnableFileWrite(const int i) = 0;
/** /**
* Set enable file overwrite * Set enable file overwrite