Skip to content

Fix issue #6 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
klemens79 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix issue #6 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7c9c29
update patches
Apr 23, 2017
113004e
Remove unused pca9685
May 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions patchs/devLib_Makefile.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
--- Makefile_org 2014-07-04 09:48:18.000000000 +0200
+++ Makefile 2014-07-04 10:12:15.000000000 +0200
@@ -26,6 +26,7 @@
@@ -26,6 +26,7 @@ DYN_VERS_MIN=0
VERSION=$(DYN_VERS_MAJ).$(DYN_VERS_MIN)
DESTDIR=/usr
PREFIX=/local
PREFIX?=/local
+PWD=`pwd`

STATIC=libwiringPiDev.a
DYNAMIC=libwiringPiDev.so.$(VERSION)
@@ -33,7 +34,7 @@
@@ -33,7 +34,7 @@ DYNAMIC=libwiringPiDev.so.$(VERSION)
#DEBUG = -g -O0
DEBUG = -O2
CC = gcc
CC ?= gcc
-INCLUDE = -I.
+INCLUDE = -I. -I$(PWD)/../wiringPi
DEFS = -D_GNU_SOURCE
CFLAGS = $(DEBUG) -Wformat=2 -Wall $(INCLUDE) -Winline -pipe -fPIC
CFLAGS += $(DEBUG) -Wformat=2 -Wall $(INCLUDE) -Winline -pipe -fPIC

LIBS =
8 changes: 4 additions & 4 deletions patchs/gpio_Makefile.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
--- Makefile_org 2014-07-04 09:58:05.000000000 +0200
+++ Makefile 2014-07-04 10:13:01.000000000 +0200
+++ Makefile 2014
@@ -25,14 +25,15 @@

DESTDIR=/usr
PREFIX=/local
PREFIX?=/local
+PWD=`pwd`

#DEBUG = -g -O0
DEBUG = -O2
CC = gcc
CC ?= gcc
-INCLUDE = -I$(DESTDIR)$(PREFIX)/include
+INCLUDE = -I$(PWD)/../wiringPi -I$(PWD)/../devLib
CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
CFLAGS += $(DEBUG) -Wall $(INCLUDE) -Winline -pipe

-LDFLAGS = -L$(DESTDIR)$(PREFIX)/lib
+LDFLAGS = -L$(PWD)/../wiringPi -L$(PWD)/../devLib
Expand Down
30 changes: 0 additions & 30 deletions src/extensions/pca9685.cc
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions src/extensions/pca9685.h
View file
Open in desktop

This file was deleted.