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

changed all -lpthread to -pthread

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-04-07 14:24:49 +02:00
parent 1afb9e3e48
commit 9aef802bea
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.include
View File

@ -5,9 +5,9 @@
CC = g++
CXX = $(CC)
ASM=$(shell echo "/lib/modules/`uname -r`/build/include")
LDFLAGDET = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread
LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread
FLAGS= -Wall #-DEIGER_DEBUG2 -DEIGER_DEBUG -DEIGER_DEBUG3 #-DFIFO_DEBUG
LDFLAGDET = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread
LDFLAGRXR = -L$(LIBDIR) -Wl,-rpath=$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread
FLAGS= -Wall -DVERBOSE -DVERYVERBOSE #-DEIGER_DEBUG2 -DEIGER_DEBUG -DEIGER_DEBUG3 #-DFIFO_DEBUG
# -DVERBOSE
# Setting up the verbose flags

4
manual/manual-api/Makefile
View File

@ -2,8 +2,8 @@ INCLUDES = -I .
SRC_DET = mainClient.cpp
SRC_REC = mainReceiver.cpp
LIBDIR = ../../bin
LDFLAG_DET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread
LDFLAG_REC = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread
LDFLAG_DET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread
LDFLAG_REC = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread
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
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

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

@ -9,7 +9,7 @@
This file is an example of how to implement the slsDetectorUsers class
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

4
users/Makefile
View File

@ -2,8 +2,8 @@ WD = $(shell pwd)
LIBDIR = $(WD)/../bin
LIBRARYRXRDIR = $(WD)/../slsReceiverSoftware
LIBRARYDETDIR = $(WD)/../slsDetectorSoftware
LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread
LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread
LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread
LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread
INCLUDESRXR = -I $(LIBRARYRXRDIR)/include
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
LIBRARYRXRDIR = $(WD)/../slsReceiverSoftware
LIBRARYDETDIR = $(WD)/../slsDetectorSoftware
LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -lpthread
LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -lpthread
LDFLAGRXR = -L$(LIBDIR) -lSlsReceiver -L/usr/lib64/ -pthread
LDFLAGDET = -L$(LIBDIR) -lSlsDetector -L/usr/lib64/ -pthread
INCLUDESRXR = -I $(LIBRARYRXRDIR)/include
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
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
gcc mainClient.cpp -L . -l SlsDetector -lm -lpthread -o users
gcc mainClient.cpp -L . -l SlsDetector -lm -pthread -o users
*/

4
users/mainClient_new.cpp
View File

@ -5,10 +5,10 @@
This file is an example of how to implement the slsDetectorUsers class
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
gcc mainClient.cpp -L . -l SlsDetector -lm -lpthread -o users
gcc mainClient.cpp -L . -l SlsDetector -lm -pthread -o users
*/