resolving merge conflict

1 files changed, 29 insertions, 0 deletions

diff --git a/ofxMaxim/openFrameworksExamples/iOS/maximFeatureExtractor0.8.4/src/main.mm b/ofxMaxim/openFrameworksExamples/iOS/maximFeatureExtractor0.8.4/src/main.mm
new file mode 100755
index 0000000..a02b813
--- /dev/null
+++ b/ofxMaxim/openFrameworksExamples/iOS/maximFeatureExtractor0.8.4/src/main.mm
@@ -0,0 +1,29 @@
+#include "ofMain.h"
+#include "ofApp.h"
+
+
+// use the below code to allow deployment on the iOS simulator because OF 0.8.4 is broken
+extern "C"{
+    size_t fwrite$UNIX2003( const void *a, size_t b, size_t c, FILE *d )
+    {
+        return fwrite(a, b, c, d);
+    }
+    char* strerror$UNIX2003( int errnum )
+    {
+        return strerror(errnum);
+    }
+    time_t mktime$UNIX2003(struct tm * a)
+    {
+        return mktime(a);
+    }
+    double strtod$UNIX2003(const char * a, char ** b) {
+        return strtod(a, b);
+    }
+}
+
+
+int main(){
+	ofSetupOpenGL(1024,768, OF_FULLSCREEN);			// <-------- setup the GL context
+
+	ofRunApp(new ofApp);
+}