armv7 merge with develop + Makefile refactor

.gitignore

@@ -14,20 +14,29 @@ addons/**
 #xcode files
 *.pbxuser
 *.perspectivev3
+examples/*/*/*.xcodeproj
+examples/*/*/Project.xcconfig
+examples/*/*/openFrameworks-Info.plist
+examples/*/*/ofxiphone-Info.plist
+examples/*/*/iPhone_Prefix.pch
+
 
 #codeblocks files
-apps/*/*/*.layout
-apps/*/*/*.depend
-apps/*/*/bin/clickToLaunch*
-apps/*/*/bin/libs
-apps/*/*/obj
-apps/examples/*/*.cbp
-apps/examples/*/*.workspace
-apps/addonsExamples/*/*.cbp
-apps/addonsExamples/*/*.workspace
+examples/*/*/*.layout
+examples/*/*/*.depend
+examples/*/*/bin/clickToLaunch*
+examples/*/*/bin/libs
+examples/*/*/obj
+examples/*/*/*.cbp
+examples/*/*/*.workspace
+
+#vs files
+examples/*/*/*.sln
+examples/*/*/*.vcxproj
+examples/*/*/*.vcxproj.user
 
-#rule to avoid non-official apps going into git
-#see apps/.gitignore
+#rule to avoid non-official examples going into git
+#see examples/.gitignore
 apps/**
 
 #codeblocks OF lib files
@@ -37,33 +46,41 @@ libs/openFrameworksCompiled/project/*/*.layout
 #linux temporary files
 *~
 
+#vs2010 user files
+*.sdf
+*.opensdf
+*.suo
+
 #eclipse build folders
 #Mac OS X
 addons/Debug Mac OS X
 addons/Release Mac OS X
 libs/openFrameworks/Debug Mac OS X
 libs/openFrameworks/Release Mac OS X
-apps/*/*/Debug Mac OS X
-apps/*/*/Release Mac OS X
-.DS_Store
+examples/*/*/Debug Mac OS X
+examples/*/*/Release Mac OS X
 xcuserdata
 project.xcworkspace
+.DS_Store
 
 #Linux
 addons/Debug Linux
 addons/Release Linux
 libs/openFrameworks/Debug Linux
 libs/openFrameworks/Release Linux
-apps/*/*/Debug Linux
-apps/*/*/Release Linux
-apps/*/*/Debug Linux64
-apps/*/*/Release Linux64
-apps/examples/*/Makefile
-apps/examples/*/config.make
-apps/addonsExamples/*/Makefile
-apps/addonsExamples/*/config.make
+examples/*/*/Debug Linux
+examples/*/*/Release Linux
+examples/*/*/Debug Linux64
+examples/*/*/Release Linux64
+examples/*/*/Makefile
+examples/*/*/config.make
 *.pyc
 
+#eclipse
+examples/*/*/.cproject
+examples/*/*/.project
+examples/*/*/.settings
+
 #Android
 addons/Debug Android
 addons/Release Android
@@ -72,12 +89,15 @@ libs/openFrameworks/Release Android
 libs/openFrameworks/Release
 libs/openFrameworks/Debug
 libs/openFrameworks/Release_arm7
-apps/*/*/Debug Android
-apps/*/*/Release Android
-apps/*/*/Debug
-apps/*/*/Release
-apps/*/*/Release_arm7
-apps/*/*/test link
-apps/*/*/obj
-apps/*/*/bin
+examples/*/*/Debug Android
+examples/*/*/Release Android
+examples/*/*/Debug
+examples/*/*/Release
+examples/*/*/Release_arm7
+examples/*/*/test link
+examples/*/*/obj
 .csettings
+paths.make
+!examples/android/*/.cproject
+!examples/android/*/.project
+!examples/android/*/.settings

addons/.gitignore

@@ -25,5 +25,10 @@
 !ofxXmlSettings/**
 !ofxAndroid
 !ofxAndroid/**
+!ofxAssimpModelLoader
+!ofxAssimpModelLoader/**
+!ofxGui
+!ofxGui/**
+!ofxGui/*/**
 ofxAndroid/ofAndroidLib/bin
 ofxAndroid/ofAndroidLib/gen

addons/ofxAccelerometer/src/ofxAccelerometer.h

@@ -33,6 +33,7 @@
 
 #include "ofTypes.h"
 #include "ofPoint.h"
+#include "ofEvents.h"
 
 typedef void (*ofxAccelCB)(ofPoint&);			// typedef for accelerometer callback
 
@@ -116,8 +117,10 @@ class ofxAccelerometerHandler {
 		}
 
 		if(callback) callback(accelReal);
+		ofNotifyEvent(accelChanged,accelReal,this);
 	}
 
+	ofEvent<ofPoint> accelChanged;
 
 protected:
 	ofxAccelCB callback;
@@ -181,3 +184,9 @@ class ofxAccelerometerHandler {
 };
 
 extern ofxAccelerometerHandler ofxAccelerometer;
+
+template<class T>
+void ofxRegisterAccelEvents(T * listener){
+	ofAddListener(ofxAccelerometer.accelChanged,listener,&T::accelerationChanged);
+}
+

addons/ofxAndroid/libs/miniunzip/miniunz.h

@@ -16,4 +16,6 @@ int do_extract(
     int opt_overwrite,
     const char* password);
 
+int do_compress(int argc,char * argv[]);
+
 #endif /* MINIUNZ_H_ */