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

corrected enums, typecasted mallocs, changed eiger server to compile only in c++

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@665 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2013-09-13 07:02:15 +00:00
parent 99b0ea47b0
commit 2218a2e7e5
6 changed files with 80 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/eigerDetectorServer/Makefile
View File

@ -1,28 +1,30 @@
CC = powerpc-4xx-softfloat-gcc
CCX = powerpc-4xx-softfloat-g++
CLAGS += -Wall -DDACS_INT -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT -DSTOP_SERVER #-DVERBOSE #-DVIRTUAL
CFLAGS += -Wall -DDACS_INT -DEIGERD -DSLS_DETECTOR_FUNCTION_LIST -DDACS_INT -DSTOP_SERVER #-DVERBOSE #-DVIRTUAL
LDLIBS += -lm -lstdc++
PROGS = eigerDetectorServer
DESTDIR ?= bin
INSTMODE = 0777
SRC_CLNT = slsDetectorServer.c slsDetectorServer_funcs.c communication_funcs.c slsDetectorFunctionList.c
OBJS = $(SRC_CLNT:.cpp=.o)
SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c slsDetectorFunctionList.c
SRC_CLNT2 = Eiger.cxx HardwareIO.cxx LocalLinkInterface.cxx Feb.cxx
OBJS = $(SRC_CLNT:.c=.o)
OBJS2 = $(SRC_CLNT2:.cpp=.o)
all: clean $(PROGS)
boot: $(OBJS)
boot: $(OBJS) $(OBJS2)
$(PROGS):
echo $(OBJS)
echo $(OBJS) $(OBJS2)
mkdir -p $(DESTDIR)
# $(CC) $(SRC_CLNT) $(CLAGS) $(LDLIBS) -o $@
$(CC) -c $(SRC_CLNT) $(CLAGS) $(LDLIBS)
$(CCX) -o $@ slsDetectorServer.o slsDetectorServer_funcs.o communication_funcs.o slsDetectorFunctionList.o
$(CCX) -o $@ $(SRC_CLNT) $(SRC_CLNT2) $(CFLAGS) $(LDLIBS)
# $(CCX) -c $(SRC_CLNT) $(CLAGS) $(LDLIBS)
# $(CCX) -o $@ slsDetectorServer.o slsDetectorServer_funcs.o communication_funcs.o slsDetectorFunctionList.o
mv $(PROGS) $(DESTDIR)
clean: