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

changed all -lpthread to -pthread

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-05-01 09:39:19 +02:00
parent c6cb499758
commit 78d1504d66
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.include
View File

@ -5,9 +5,9 @@
CC = g++ CC = g++
CXX = $(CC) CXX = $(CC)
ASM=$(shell echo "/lib/modules/`uname -r`/build/include") ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
LDFLAGDET = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread LDFLAGDET = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread
LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread
FLAGS= -Wall -DHDF5C #-DEIGER_DEBUG2 FLAGS= -Wall -pthread -DHDF5C #-DEIGER_DEBUG2
# -DVERBOSE # -DVERBOSE
# Setting up the verbose flags # Setting up the verbose flags
@ -27,7 +27,7 @@ HDF5 = yes
HDF5_DIR = /opt/hdf5v1.10.0 HDF5_DIR = /opt/hdf5v1.10.0
ifeq ($(HDF5),yes) ifeq ($(HDF5),yes)
LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L$(HDF5_DIR)/lib -Wl,-rpath=$(HDF5_DIR)/lib -lhdf5 -lhdf5_cpp -lsz -lz -DHDF5C -L/usr/lib64/ -lpthread LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L$(HDF5_DIR)/lib -Wl,-rpath=$(HDF5_DIR)/lib -lhdf5 -lhdf5_cpp -lsz -lz -DHDF5C -L/usr/lib64/ -pthread
INCLUDESRXR = -I$(HDF5_DIR)/include INCLUDESRXR = -I$(HDF5_DIR)/include
endif endif

4
manual/manual-api/Makefile
View File

@ -2,8 +2,8 @@ INCLUDES = -I .
SRC_DET = mainClient.cpp SRC_DET = mainClient.cpp
SRC_REC = mainReceiver.cpp SRC_REC = mainReceiver.cpp
LIBDIR = ../../bin LIBDIR = ../../bin
LDFLAG_DET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread LDFLAG_DET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread
LDFLAG_REC = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread LDFLAG_REC = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread
DESTDIR ?= ../docs DESTDIR ?= ../docs

2
manual/manual-api/mainClient.cpp
View File

@ -4,7 +4,7 @@
This file is an example of how to implement the slsDetectorUsers class This file is an example of how to implement the slsDetectorUsers class
You can compile it linking it to the slsDetector library You can compile it linking it to the slsDetector library
gcc mainClient.cpp -L lib -l SlsDetector -lm -lpthread gcc mainClient.cpp -L lib -l SlsDetector -lm -pthread
where lib is the location of libSlsDetector.so where lib is the location of libSlsDetector.so

2
manual/manual-api/mainReceiver.cpp
View File

@ -9,7 +9,7 @@
This file is an example of how to implement the slsDetectorUsers class This file is an example of how to implement the slsDetectorUsers class
You can compile it linking it to the slsDetector library You can compile it linking it to the slsDetector library
gcc mainReceiver.cpp -L lib -l SlsDetector -lm -lpthread gcc mainReceiver.cpp -L lib -l SlsDetector -lm -pthread
where lib is the location of libSlsDetector.so where lib is the location of libSlsDetector.so

4
users/Makefile
View File

@ -2,8 +2,8 @@ WD = $(shell pwd)
LIBDIR = $(WD)/../bin LIBDIR = $(WD)/../bin
LIBRARYRXRDIR = $(WD)/../slsReceiverSoftware LIBRARYRXRDIR = $(WD)/../slsReceiverSoftware
LIBRARYDETDIR = $(WD)/../slsDetectorSoftware LIBRARYDETDIR = $(WD)/../slsDetectorSoftware
LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread
LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread
INCLUDESRXR = -I $(LIBRARYRXRDIR)/include INCLUDESRXR = -I $(LIBRARYRXRDIR)/include
INCLUDESDET = -I $(LIBRARYRXRDIR)/include -I $(LIBRARYDETDIR)/slsDetector -I $(LIBRARYDETDIR)/slsDetectorAnalysis INCLUDESDET = -I $(LIBRARYRXRDIR)/include -I $(LIBRARYDETDIR)/slsDetector -I $(LIBRARYDETDIR)/slsDetectorAnalysis

4
users/Makefile_new
View File

@ -2,8 +2,8 @@ WD = $(shell pwd)
LIBDIR = $(WD)/../bin LIBDIR = $(WD)/../bin
LIBRARYRXRDIR = $(WD)/../slsReceiverSoftware LIBRARYRXRDIR = $(WD)/../slsReceiverSoftware
LIBRARYDETDIR = $(WD)/../slsDetectorSoftware LIBRARYDETDIR = $(WD)/../slsDetectorSoftware
LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread
LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread
INCLUDESRXR = -I $(LIBRARYRXRDIR)/include INCLUDESRXR = -I $(LIBRARYRXRDIR)/include
INCLUDESDET = -I $(LIBRARYDETDIR)/slsDetector -I $(LIBRARYDETDIR)/slsDetectorAnalysis INCLUDESDET = -I $(LIBRARYDETDIR)/slsDetector -I $(LIBRARYDETDIR)/slsDetectorAnalysis

4
users/mainClient.cpp
View File

@ -4,10 +4,10 @@
This file is an example of how to implement the slsDetectorUsers class This file is an example of how to implement the slsDetectorUsers class
You can compile it linking it to the slsDetector library You can compile it linking it to the slsDetector library
gcc mainClient.cpp -L lib -l SlsDetector -lm -lpthread gcc mainClient.cpp -L lib -l SlsDetector -lm -pthread
where lib is the location of libSlsDetector.so where lib is the location of libSlsDetector.so
gcc mainClient.cpp -L . -l SlsDetector -lm -lpthread -o users gcc mainClient.cpp -L . -l SlsDetector -lm -pthread -o users
*/ */