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

fixed non-rest compilation

Browse Source
This commit is contained in:
sala
2014-11-17 17:06:50 +01:00
parent f36d742cd3
commit a2fdcce711
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/Makefile
View File

@ -45,9 +45,9 @@ intdoc: $(SRC_H) $(SRC_CLNT)
$(BUILDDIR)/%.o : $(SRCDIR)/%.cpp Makefile $(BUILDDIR)/%.o : $(SRCDIR)/%.cpp Makefile
ifeq ($(ROOTSLS),yes) ifeq ($(ROOTSLS),yes)
$(CXX) -DROOTSLS -o $@ -c $< $(INCLUDES) $(DFLAGS) $(ROOTFLAGS) -fPIC $(EPICSFLAGS) -L/usr/lib64/ #$(FLAGS) $(CXX) -DROOTSLS -o $@ -c $< $(INCLUDES) $(DFLAGS) $(ROOTFLAGS) -fPIC $(EPICSFLAGS) $(LDFLAGRXR) -L/usr/lib64/ #$(FLAGS)
else else
$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -lpthread #$(FLAGS) $(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) $(LDFLAGRXR) -lpthread #$(FLAGS)
endif endif
lib: $(OBJS) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a lib: $(OBJS) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a

7
slsReceiverSoftware/src/UDPInterface.cpp
View File

@ -13,8 +13,9 @@ using namespace std;
#include "UDPInterface.h" #include "UDPInterface.h"
#include "UDPBaseImplementation.h" #include "UDPBaseImplementation.h"
#include "UDPStandardImplementation.h" #include "UDPStandardImplementation.h"
#ifdef REST
#include "UDPRESTImplementation.h" #include "UDPRESTImplementation.h"
#endif
using namespace std; using namespace std;
@ -26,11 +27,11 @@ UDPInterface * UDPInterface::create(string receiver_type){
cout << "Starting " << receiver_type << endl; cout << "Starting " << receiver_type << endl;
return new UDPStandardImplementation(); return new UDPStandardImplementation();
} }
//#ifdef REST #ifdef REST
else if (receiver_type == "REST"){ else if (receiver_type == "REST"){
return new UDPRESTImplementation(); return new UDPRESTImplementation();
} }
//#endif #endif
else{ else{
FILE_LOG(logWARNING) << "[ERROR] UDP interface not supported, using standard implementation"; FILE_LOG(logWARNING) << "[ERROR] UDP interface not supported, using standard implementation";
return new UDPBaseImplementation(); return new UDPBaseImplementation();