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

Merge branch 'eiger_receiver_temp' into eiger_receiver

Browse Source 
Conflicts:
	client/Makefile
This commit is contained in:
sala 2014-09-12 16:22:59 +02:00
commit 3d4b2e9fee
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorGui/Makefile
View File

@ -2,6 +2,14 @@
include ../Makefile.include
$(info )
$(info ##################################)
$(info # Compiling slsDetectorGui #)
$(info ##################################)
$(info )
PROG = $(DESTDIR)/slsDetectorGui
DESTDIR ?= ../bin

1
slsDetectorGui/client/Makefile
View File

@ -4,6 +4,7 @@ LDLIBS += -lm -lstdc++ -lpthread
LDIR = ../../slsDetectorSoftware
RDIR = ../../slsReceiverSoftware
INCLUDES = -I $(LDIR)/commonFiles -I $(LDIR)/slsDetector -I ../include -I $(RDIR)/include
SRC_CLNT = qClient.cpp $(RDIR)/src/MySocketTCP.cpp