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

edited the gui makefile to be able to compile withot errors from this directory

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@170 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2013-04-04 07:23:19 +00:00
parent 10e47581e0
commit d56b2b480b
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorGui/Makefile
View File

@ -1,10 +1,12 @@
PROG= $(DESTDIR)/slsDetectorGui PROG= $(DESTDIR)/slsDetectorGui
#DIR= $(shell ls src/* slsDetectorPlotting/include/* slsDetectorPlotting/src/* include/ forms/*)
DESTDIR?=bin DESTDIR?=bin
DOCDIR?=docs DOCDIR?=docs
LIBDIR?=../slsDetectorSoftware
LIBDIR?=../bin
LIBRARYDIR?=../slsDetectorSoftware
INCLUDES?= $(LIBRARYDIR)/commonFiles -I$(LIBRARYDIR)/MySocketTCP -I$(LIBRARYDIR)/slsReceiverInterface -I$(LIBRARYDIR)/slsDetector -I$(LIBRARYDIR)/slsDetectorAnalysis -I$(LIBRARYDIR)/multiSlsDetector -I$(LIBRARYDIR)/usersFunctions
LDFLAG?=-L$(LIBRARYDIR)/bin -lSlsDetector
all: $(PROG) Makefile.gui guiclient all: $(PROG) Makefile.gui guiclient

8
slsDetectorGui/slsDetectorGui.pro
View File

@ -46,14 +46,14 @@ DEPENDPATH += \
INCLUDEPATH = \ INCLUDEPATH = \
$(QWTDIR)/include\ $(QWTDIR)/include\
$(QWTDIR) \ $(QWTDIR) \
$(QWTDIR)/src\ $(QWTDIR)/src\
$(QWT3D)/include\ $(QWT3D)/include\
slsDetectorPlotting/include\ slsDetectorPlotting/include\
include\ include\
forms/include\ forms/include\
$(INCLUDES) $(INCLUDES)
# $(shell echo "/lib/modules/`uname -r`/build/include") \ # $(shell echo "/lib/modules/`uname -r`/build/include") \
# ../slsDetectorSoftware/commonFiles\ # ../slsDetectorSoftware/commonFiles\
# ../slsDetectorSoftware/MySocketTCP\ # ../slsDetectorSoftware/MySocketTCP\
# ../slsDetectorSoftware/slsReceiverInterface\ # ../slsDetectorSoftware/slsReceiverInterface\