refactored project structure
continuous-integration/drone/push Build encountered an error Details

opengl
Yorick GEOFFRE 3 years ago
parent 727e080a1b
commit 696fc1dd46

@ -1,7 +0,0 @@
build :
@mkdir -p $(CONFIG)
make -f makeprj.lnx CONFIG=$(CONFIG)
clean :
make clean -f makeprj.lnx CONFIG=debug
make clean -f makeprj.lnx CONFIG=release

@ -1,34 +0,0 @@
CC = /usr/bin/g++
CFLAGS = -c -Wall -ansi
EXE = helloLibrary_Tests
SUFFIX = d
ifeq (debug,$(CONFIG))
CFLAGS += -O2 -DNDEBUG
SUFFIX = d
else
CFLAGS += -g -D_DEBUG
SUFFIX =
endif
INCPATH = -I../../../../include
SRCDIR = ../../../../Applications/Tests/helloLibrary
BINDIR = ../../../../bin
INC := $(wildcard *.h) $(wildcard *.inl)
INC := $(notdir $(INC))
SRC := $(wildcard $(SRCDIR)/*.cpp)
SRC := $(notdir $(SRC))
OBJDIR := $(CONFIG)
OBJ := $(SRC:%.cpp=$(OBJDIR)/%.o)
all : $(EXE)
$(OBJDIR)/%.o : $(SRCDIR)/%.cpp
$(CC) -o $@ $(INCPATH) $(CFLAGS) $<
clean :
rm -f $(OBJDIR)/*.o
$(EXE) : $(OBJ)
$(CC) $(OBJ) -L$(BINDIR) -lhelloLibrary$(SUFFIX) -o $(BINDIR)/$(EXE)$(SUFFIX)

@ -1,7 +0,0 @@
build:
@mkdir -p $(CONFIG)
make -f makeprj.lnx CONFIG=$(CONFIG)
clean:
make clean -f makeprj.lnx CONFIG=debug
make clean -f makeprj.lnx CONFIG=release

@ -1,34 +0,0 @@
CC = /usr/bin/g++
CFLAGS = -c -Wall -ansi
DLL = libhelloLibrary
SUFFIX = d
ifeq (debug,$(CONFIG))
CFLAGS += -O2 -DNDEBUG
SUFFIX = d
else
CFLAGS += -g -D_DEBUG
SUFFIX =
endif
INCPATH = -I../../include
SRCDIR = ../../src/helloLibrary
BINDIR = ../../bin
INC := $(wildcard *.h) $(wildcard *.inl)
INC := $(notdir $(INC))
SRC := $(wildcard $(SRCDIR)/*.cpp)
SRC := $(notdir $(SRC))
OBJDIR := $(CONFIG)
OBJ := $(SRC:%.cpp=$(OBJDIR)/%.o)
all : $(DLL)
$(OBJDIR)/%.o : $(SRCDIR)/%.cpp
$(CC) -o $@ $(INCPATH) $(CFLAGS) $<
clean :
rm -f $(OBJDIR)/*.o
$(DLL) : $(OBJ)
$(CC) -fdiagnostics-show-option -o $(BINDIR)/$(DLL)$(SUFFIX).so -shared $(OBJDIR)/*.o 2> $(BINDIR)/build.log
# ld -o $(BINDIR)/$(DLL)$(SUFFIX).so -shared $(OBJDIR)/*.o

@ -1,12 +0,0 @@
debug :
cd helloLibrary && make -f makefile.lnx CONFIG=debug
cd Applications/Tests/helloLibrary && make -f makefile.lnx CONFIG=debug
release :
cd helloLibrary && make -f makefile.lnx CONFIG=release
cd Applications/Tests/helloLibrary && make -f makefile.lnx CONFIG=release
# cd Documentation && make -f makefile
clean :
cd helloLibraryh && make clean -f makefile.lnx
cd Applications/Tests/helloLibrary && make clean -f makefile.lnx

@ -9,7 +9,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "-Ofast")
project(visnode)
#set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/../bin)
set(CMAKE_BINARY_DIR /home/kanken/code/AHRS_core/Sources/src/Visnode)
#set(CMAKE_BINARY_DIR /home/kanken/code/AHRS_core/Sources/src/Visnode)
find_package(OpenCV REQUIRED)
find_package(TBB REQUIRED)

Before

Width:  |  Height:  |  Size: 572 KiB

After

Width:  |  Height:  |  Size: 572 KiB

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB

Before

Width:  |  Height:  |  Size: 218 KiB

After

Width:  |  Height:  |  Size: 218 KiB

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save