Commit 0e448735 authored by seb's avatar seb
Browse files

- add a config.inc to choose which camera you want to compile

  and modify Makefile


git-svn-id: https://scm.blissgarden.org/svn/lima/trunk@226 45c4679d-1946-429d-baad-37912b19538b
parent fa625d85
...@@ -2,5 +2,11 @@ sub-dirs = third-party common hardware control camera build ...@@ -2,5 +2,11 @@ sub-dirs = third-party common hardware control camera build
all: src test all: src test
include config.inc
include global.inc include global.inc
config.inc:
@echo "Creating default \"config.inc\" with LImA core"
@echo "Please edit it to activate compilation of hardware modules"
cp config.inc_default config.inc
lima-objs := ../common/src/Common.o \ lima-objs := ../common/src/Common.o \
../hardware/src/Hw.o \ ../hardware/src/Hw.o \
../control/src/Ct.o \ ../control/src/Ct.o \
../camera/simulator/src/Simu.o \ ../camera/simulator/src/Simu.o
../camera/common/espia/src/Espia.o \
../camera/frelon/src/Frelon.o \
../camera/maxipix/src/Maxipix.o
include ../config.inc
ifneq ($(COMPILE_ESPIA),0)
lima-objs += ../camera/common/espia/src/Espia.o
include ../camera/common/espia/include/espia.inc include ../camera/common/espia/include/espia.inc
LDLIBS += -lespia
LDFLAGS += -L$(ESPIA_DRV_LIB)
endif
ifneq ($(COMPILE_FRELON),0)
lima-objs += ../camera/frelon/src/Frelon.o
endif
ifneq ($(COMPILE_MAXIPIX),0)
lima-objs += ../camera/maxipix/src/Maxipix.o
endif
LDFLAGS += -L../third-party/Processlib/build -L$(ESPIA_DRV_LIB) LDFLAGS += -L../third-party/Processlib/build
LDLIBS += -lprocesslib -lespia LDLIBS += -lprocesslib
src: liblima.so src: liblima.so
......
sub-dirs = common simulator frelon maxipix sub-dirs = common simulator
include ../config.inc
ifndef COMPILE_FRELON
COMPILE_FRELON = 0
endif
ifneq ($(COMPILE_FRELON),0)
sub-dirs += frelon
endif
ifndef COMPILE_MAXIPIX
COMPILE_MAXIPIX = 0
endif
ifndef ($(COMPILE_MAXIPIX),0)
sub-dirs += maxipix
endif
include ../global.inc include ../global.inc
sub-dirs = espia sub-dirs =
include ../../config.inc
ifndef COMPILE_ESPIA
COMPILE_ESPIA = 0
endif
ifneq ($(COMPILE_ESPIA),0)
sub-dirs += espia
endif
include ../../global.inc include ../../global.inc
...@@ -54,11 +54,11 @@ class _ImageReader(threading.Thread) : ...@@ -54,11 +54,11 @@ class _ImageReader(threading.Thread) :
lastDirectoryTime = None lastDirectoryTime = None
with self.__cond: with self.__cond:
while(self.__continue) : while(self.__continue) :
newDirectoryTime = os.fstat(self.__dirFd)[8] newDirectoryTime = os.fstat(self.__dirFd).st_mtime
while(not self.__continue and not self.__waitFlag and while(not self.__continue and not self.__waitFlag and
lastDirectoryTime == newDirectoryTime): lastDirectoryTime == newDirectoryTime):
self.__cond.wait(0.5) self.__cond.wait(0.5)
newDirectoryTime = os.fstat(self.__dirFd)[8] newDirectoryTime = os.fstat(self.__dirFd).st_mtime
while(self.__continue and not self.__waitFlag) : while(self.__continue and not self.__waitFlag) :
nextFrameId = self.__lastImageRead + 1 nextFrameId = self.__lastImageRead + 1
......
COMPILE_CORE=1
COMPILE_ESPIA=0
COMPILE_FRELON=0
COMPILE_MAXIPIX=0
export COMPILE_CORE COMPILE_ESPIA COMPILE_FRELON COMPILE_MAXIPIX
...@@ -25,3 +25,4 @@ test: ...@@ -25,3 +25,4 @@ test:
clean: clean:
cd Processlib/sip/ && python clean.py cd Processlib/sip/ && python clean.py
make -C Processlib/build clean make -C Processlib/build clean
rm -f Sps/Src/sps.o
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment