pointless modifications to order of files in setup.py, readme updated
diff --git a/README.md b/README.md
index 47630a1..274bd2a 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,12 @@
You must have python-dev and python-setuptools installed
If you manually rebuild the bindings with swig -python wiringpi.i
+YOU MUST FIRST INSTALL WIRINGPI2!!
+
+git clone git://git.drogon.net/wiringPi
+cd wiringPi
+sudo ./build
+
**Get/setup repo:**
git clone https://github.com/Gadgetoid/WiringPi2-Python.git
cd WiringPi2-Python
diff --git a/setup.py b/setup.py
index fd20293..17db3f1 100644
--- a/setup.py
+++ b/setup.py
@@ -5,13 +5,8 @@
_wiringpi2 = Extension(
'_wiringpi2',
sources=[
- 'WiringPi/devLib/ds1302.c',
- 'WiringPi/devLib/lcd128x64.c',
- 'WiringPi/devLib/maxdetect.c',
- 'WiringPi/devLib/gertboard.c',
- 'WiringPi/devLib/lcd.c',
- 'WiringPi/devLib/piFace.c',
- 'WiringPi/devLib/piNes.c',
+ 'WiringPi/wiringPi/wiringPi.c',
+ 'WiringPi/wiringPi/wiringPiSPI.c',
'WiringPi/wiringPi/drc.c',
'WiringPi/wiringPi/mcp23s17.c',
'WiringPi/wiringPi/pcf8591.c',
@@ -25,7 +20,6 @@
'WiringPi/wiringPi/mcp23016.c',
'WiringPi/wiringPi/mcp3422.c',
'WiringPi/wiringPi/piThread.c',
- 'WiringPi/wiringPi/wiringPi.c',
'WiringPi/wiringPi/mcp23017.c',
'WiringPi/wiringPi/mcp4802.c',
'WiringPi/wiringPi/softPwm.c',
@@ -33,7 +27,13 @@
'WiringPi/wiringPi/mcp23s08.c',
'WiringPi/wiringPi/pcf8574.c',
'WiringPi/wiringPi/softServo.c',
- 'WiringPi/wiringPi/wiringPiSPI.c',
+ 'WiringPi/devLib/ds1302.c',
+ 'WiringPi/devLib/lcd128x64.c',
+ 'WiringPi/devLib/maxdetect.c',
+ 'WiringPi/devLib/gertboard.c',
+ 'WiringPi/devLib/lcd.c',
+ 'WiringPi/devLib/piFace.c',
+ 'WiringPi/devLib/piNes.c',
'wiringpi_wrap.c'
],
)
@@ -52,14 +52,8 @@
py_modules = ["wiringpi2"],
install_requires=[],
headers=[
- 'WiringPi/devLib/ds1302.h',
- 'WiringPi/devLib/gertboard.h',
- 'WiringPi/devLib/lcd.h',
- 'WiringPi/devLib/piFace.h',
- 'WiringPi/devLib/font.h',
- 'WiringPi/devLib/lcd128x64.h',
- 'WiringPi/devLib/maxdetect.h',
- 'WiringPi/devLib/piNes.h',
+ 'WiringPi/wiringPi/wiringPi.h',
+ 'WiringPi/wiringPi/wiringPiI2C.h',
'WiringPi/wiringPi/drc.h',
'WiringPi/wiringPi/mcp23s08.h',
'WiringPi/wiringPi/mcp3422.h',
@@ -78,10 +72,16 @@
'WiringPi/wiringPi/mcp23016reg.h',
'WiringPi/wiringPi/mcp23x08.h',
'WiringPi/wiringPi/pcf8591.h',
- 'WiringPi/wiringPi/wiringPi.h',
'WiringPi/wiringPi/mcp23017.h',
'WiringPi/wiringPi/mcp3002.h',
'WiringPi/wiringPi/softPwm.h',
- 'WiringPi/wiringPi/wiringPiI2C.h'
+ 'WiringPi/devLib/ds1302.h',
+ 'WiringPi/devLib/gertboard.h',
+ 'WiringPi/devLib/lcd.h',
+ 'WiringPi/devLib/piFace.h',
+ 'WiringPi/devLib/font.h',
+ 'WiringPi/devLib/lcd128x64.h',
+ 'WiringPi/devLib/maxdetect.h',
+ 'WiringPi/devLib/piNes.h'
]
)