diff --git a/patchs/devLib_Makefile.patch b/patchs/devLib_Makefile.patch index cb9fc41..81a65ec 100644 --- a/patchs/devLib_Makefile.patch +++ b/patchs/devLib_Makefile.patch @@ -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 = diff --git a/patchs/gpio_Makefile.patch b/patchs/gpio_Makefile.patch index e50bfe0..03e007a 100644 --- a/patchs/gpio_Makefile.patch +++ b/patchs/gpio_Makefile.patch @@ -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 diff --git a/src/extensions/pca9685.cc b/src/extensions/pca9685.cc deleted file mode 100644 index 309347c..0000000 --- a/src/extensions/pca9685.cc +++ /dev/null @@ -1,30 +0,0 @@ -#include "pca9685.h" -#include - -DECLARE(pca9685Setup); - -IMPLEMENT(pca9685Setup) { - SCOPE_OPEN(); - - SET_ARGUMENT_NAME(0, pinBase); - SET_ARGUMENT_NAME(1, i2cAddress); - SET_ARGUMENT_NAME(2, frequency); - - CHECK_ARGUMENTS_LENGTH_EQUAL(3); - - CHECK_ARGUMENT_TYPE_INT32(0); - CHECK_ARGUMENT_TYPE_INT32(1); - CHECK_ARGUMENT_TYPE_INT32(2); - - int pinBase = GET_ARGUMENT_AS_INT32(0); - int i2cAddress = GET_ARGUMENT_AS_INT32(1); - int freq = GET_ARGUMENT_AS_INT32(2); - - int res = ::pca9685Setup(pinBase, i2cAddress, freq); - - SCOPE_CLOSE(INT32(res)); -} - -IMPLEMENT_EXPORT_INIT(pca9685) { - EXPORT_FUNCTION(pca9685Setup); -} \ No newline at end of file diff --git a/src/extensions/pca9685.h b/src/extensions/pca9685.h deleted file mode 100644 index bbf4dc3..0000000 --- a/src/extensions/pca9685.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _WPI_PCA9685_H_ -#define _WPI_PCA9685_H_ - - #include "../addon.h" - - DECLARE_EXPORT_INIT(pca9685); - -#endif \ No newline at end of file