Merge pull request #4 from bweir/master

Add qmake project files; update README; fix enumcom.c permissions

README.md

@@ -0,0 +1,42 @@
+# p1load
+
+p1load is a tiny, nimble cross-platform loader library for the Propeller microcontroller.
+
+## Building
+
+`p1load` can be built in multiple ways.
+
+### GNU Make
+
+Building using plain old `make` is straight-forward. To build for the various platforms,
+specify the target operating system using the `OS` variable.
+
+```
+OS=macosx make
+```
+
+Possible options:
+
+* Mac OS X: `OS=macosx`
+* Linux: `OS=linux`
+* Raspberry Pi: `OS=raspberrypi`
+* Windows MinGW: `OS=msys`
+
+If no platform is specified, the default `macosx` is used.
+
+### qmake
+
+`qmake` project files can be found in the `qmake/` directory.
+
+```
+cd qmake
+qmake
+make
+```
+
+`qmake` will automatically build in platform-specific features except
+for Raspberry Pi. Pass `CPU=armhf` to `qmake` to enable GPIO support for Raspberry Pi.
+
+```
+qmake CPU=armhf
+```

qmake/.gitignore

@@ -0,0 +1,4 @@
+Makefile
+eeprom/eeprom
+p1load/p1load
+ploader/ploader

qmake/eeprom/eeprom.pro

@@ -0,0 +1,9 @@
+include(../p1load.pri)
+
+TEMPLATE = app
+TARGET = eeprom
+
+LIBS += -L$${OUT_PWD}/../ploader/ -lploader
+
+SOURCES += \
+    ../../eeprom.c \

qmake/p1load.pri

@@ -0,0 +1,11 @@
+!greaterThan(QT_MAJOR_VERSION, 4): {
+    error("PropellerIDE requires Qt5.2 or greater")
+}
+!greaterThan(QT_MINOR_VERSION, 1): {
+    error("PropellerIDE requires Qt5.2 or greater")
+}
+
+CONFIG -= qt debug_and_release app_bundle
+CONFIG += console
+
+INCLUDEPATH += ../..

qmake/p1load.pro

@@ -0,0 +1,9 @@
+TEMPLATE  = subdirs
+
+SUBDIRS = \
+    ploader \
+    eeprom \
+    p1load \
+
+eeprom.depends = ploader
+p1load.depends = ploader

qmake/p1load/p1load.pro

@@ -0,0 +1,9 @@
+include(../p1load.pri)
+
+TEMPLATE = app
+TARGET = p1load
+
+LIBS += -L$${OUT_PWD}/../ploader/ -lploader
+
+SOURCES += \
+    ../../p1load.c \

qmake/ploader/ploader.pro

@@ -0,0 +1,37 @@
+include(../p1load.pri)
+
+TEMPLATE = lib
+TARGET = ploader 
+CONFIG += staticlib
+
+SOURCES += \
+    ../../ploader.c \
+    ../../packet.c \
+    ../../port.c \
+
+HEADERS += \
+    ../../ploader.h
+
+unix:!macx {
+    DEFINES += LINUX
+    SOURCES += \
+        ../../osint_linux.c
+
+    equals(CPU, armhf) {
+        DEFINES += RASPBERRY_PI
+        SOURCES += \
+            ../../gpio_sysfs.c
+    }
+}
+macx {
+    DEFINES += MACOSX
+    SOURCES += \
+        ../../osint_linux.c
+}
+win32 {
+    DEFINES += MINGW
+    LIBS    += -lsetupapi
+    SOURCES += \
+        ../../osint_mingw.c \
+        ../../enumcom.c
+}

readme.txt

@@ -1,17 +0,0 @@
-To build for the various platforms:
-
-For Macintosh OS X:
-
-	OS=macosx make
-
-For Linux:
-
-	OS=linux make
-
-For the RaspberryPi:
-
-	OS=raspberrypi make
-
-For Windows under MinGW:
-
-	OS=msys make