Skip to content
Snippets Groups Projects
Commit d6fc8b7c authored by simon.fanetti's avatar simon.fanetti
Browse files

fixed .so and adjust files

parent 57148536
No related branches found
No related tags found
No related merge requests found
Showing with 46 additions and 42 deletions
include src/common.mk include src/common.mk
SRCS=$(wildcard ./*.cpp) OBJSALL=$(shell find src -name '*.o')
OBJS=$(SRCS:%.cpp=%.o)
OBJSALL=$(shell find . -name '*.o')
LIBNAME=libsandbox LIBNAME=libsandbox
LIB_MINOR_VERS=0.0 LIB_MINOR_VERS=0.0
LIB_MAJOR_VERS=1 LIB_MAJOR_VERS=1
LIB_VERS=$(LIB_MAJOR_VERS).$(LIB_MINOR_VERS) LIB_VERS=$(LIB_MAJOR_VERS).$(LIB_MINOR_VERS)
LIB_FULL_NAME=$(LIBNAME).so.$(LIB_VERS) LIB_FULL_NAME=$(LIBNAME).so.$(LIB_VERS)
path=$(shell pwd)
ld_libs=$(shell echo $$LD_LIBRARY_PATH)
all: all:
$(MAKE) -C src $(MAKE) -C src
$(MAKE) build -C .
$(MAKE) pack -C . $(MAKE) pack -C .
$(MAKE) link -C . $(MAKE) link -C .
build: $(OBJS)
%.o: %.cpp
$(CCP) -c $(CFLAGS) $< -o $@
pack: pack:
gcc -shared -Wl,-soname,$(LIB_FULL_NAME) -o $(LIB_FULL_NAME) $(OBJSALL) $(OPENCVFLAG) $(CAMERAFLAG) gcc -shared -Wl,-soname,$(LIB_FULL_NAME) -o $(LIB_FULL_NAME) $(OBJSALL)
link: link:
-ln -s $(LIB_FULL_NAME) $(LIBNAME).so.$(LIB_MAJOR_VERS) -ln -s $(LIB_FULL_NAME) $(LIBNAME).so.$(LIB_MAJOR_VERS)
......
SCREEN=DVI-D-0
SCN_RES=1920x1080
BEAMER=HDMI-0
BM_RES=1400x1050
xrandr --output $SCREEN --rate 60 --mode $SCN_RES --fb $SCN_RES --panning $SCN_RES* \
--output $BEAMER --mode $BM_RES --same-as $SCREEN > /dev/null
dep.mk 0 → 100644
OPENCVFLAG=`pkg-config --libs --cflags opencv`
CAMERAFLAG=-lrealsense2
DEP_SANDBOX=$(OPENCVFLAG) $(CAMERAFLAG)
\ No newline at end of file
#!/bin/bash #!/bin/bash
export LD_LIBRARY_PATH=$(pwd) && \ export LD_LIBRARY_PATH=$(pwd)
make link
...@@ -34,12 +34,12 @@ class Controller ...@@ -34,12 +34,12 @@ class Controller
Beamer beamer; Beamer beamer;
void createWindowsFullScreen(char *windowName); void createWindowsFullScreen(char *windowName);
void showImage(cv::Mat* image, char *windowName); void showImage(cv::Mat* image, char *windowName);
bool readSandboxPosition(std::vector<cv::Point> &rectPoints); //bool readSandboxPosition(std::vector<cv::Point> &rectPoints);
void writeSandboxPosition(std::vector<cv::Point> rectPoints); //void writeSandboxPosition(std::vector<cv::Point> rectPoints);
double toDegrees(double radians); double toDegrees(double radians);
void sanboxBorder(); void sanboxBorder();
void sandboxBorderLoad(); //void sandboxBorderLoad();
bool configFilesFound(); //bool configFilesFound();
}; };
......
#ifndef SANDBOX_SETUP_H
#define SANDBOX_SETUP_H
#endif
...@@ -4,18 +4,14 @@ SRCS:=$(wildcard *.cpp) ...@@ -4,18 +4,14 @@ SRCS:=$(wildcard *.cpp)
OBJS:=$(SRCS:%.cpp=%.o) OBJS:=$(SRCS:%.cpp=%.o)
all: all:
$(MAKE) -C components $(MAKE) -C lib
#$(MAKE) -C tools
$(MAKE) build -C . $(MAKE) build -C .
build: $(OBJS) build: $(OBJS)
%.o: %.cpp %.o: %.cpp
g++ $(CFLAGS) -c $< -o $@ $(CCP) -c $(CFLAGS) $< -o $@
clean: clean:
-rm -f *.o -rm -f *.o
$(MAKE) clean -C components $(MAKE) clean -C lib
#$(MAKE) clean -C tools
CCP=g++ CCP=g++
CFLAGS=-std=c++11 -Wall -Wextra -g -Ilib -fPIC CFLAGS=-std=c++11 -Wall -Wextra -g -Ilib -fPIC
OPENCVFLAG=`pkg-config --libs --cflags opencv`
CAMERAFLAG=-lrealsense2
File moved
File moved
File moved
File moved
File moved
include ../common.mk
SRCS:=$(wildcard *.cpp)
OBJS:=$(SRCS:%.cpp=%.o)
all:
$(MAKE) -C components
$(MAKE) -C tools
$(MAKE) build -C .
build: $(OBJS)
%.o: %.cpp
g++ $(CFLAGS) -c $< -o $@
clean:
-rm -f *.o
$(MAKE) clean -C components
$(MAKE) clean -C tools
include ../common.mk include ../../common.mk
SRCS=$(wildcard *.cpp) SRCS=$(wildcard *.cpp)
OBJS=$(SRCS:%.cpp=%.o) OBJS=$(SRCS:%.cpp=%.o)
CAMERAFLAG=-lrealsense2
build: $(OBJS) build: $(OBJS)
......
#include "../../includes/beamer.h" #include "../../../includes/beamer.h"
using namespace cv; using namespace cv;
using namespace std; using namespace std;
......
#include "../../includes/calibrate.h" #include "../../../includes/calibrate.h"
#include "../../includes/camera.h" #include "../../../includes/camera.h"
using namespace cv; using namespace cv;
using namespace std; using namespace std;
......
#include "../../includes/camera.h" #include "../../../includes/camera.h"
using namespace cv; using namespace cv;
Camera::Camera() {} Camera::Camera() {}
......
#include "../includes/controller.h" #include "../../includes/controller.h"
#include <numeric> #include <numeric>
#include <fstream> #include <fstream>
#include <string> #include <string>
...@@ -15,7 +15,7 @@ Controller::Controller(){ ...@@ -15,7 +15,7 @@ Controller::Controller(){
// Matching cross under beamer routine // Matching cross under beamer routine
beamer.findBeamer(camera); beamer.findBeamer(camera);
}else{ }else{
sandboxBorderLoad(); //sandboxBorderLoad();
//beamer.findBeamerLoad(camera); //beamer.findBeamerLoad(camera);
} }
// Set full screen parameter for show function // Set full screen parameter for show function
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment