resolving merge conflict

3 files changed, 98 insertions, 0 deletions

diff --git a/ofxMaxim/openFrameworksExamples/OSX/emptyExample/src/main.cpp b/ofxMaxim/openFrameworksExamples/OSX/emptyExample/src/main.cpp
new file mode 100644
index 0000000..8bce185
--- /dev/null
+++ b/ofxMaxim/openFrameworksExamples/OSX/emptyExample/src/main.cpp
@@ -0,0 +1,14 @@
+#include "ofMain.h"
+#include "ofApp.h"
+
+//========================================================================
+int main( ){
+
+	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
+
+	// this kicks off the running of my app
+	// can be OF_WINDOW or OF_FULLSCREEN
+	// pass in width and height too:
+	ofRunApp( new ofApp());
+
+}
diff --git a/ofxMaxim/openFrameworksExamples/OSX/emptyExample/src/ofApp.cpp b/ofxMaxim/openFrameworksExamples/OSX/emptyExample/src/ofApp.cpp
new file mode 100644
index 0000000..3e7b517
--- /dev/null
+++ b/ofxMaxim/openFrameworksExamples/OSX/emptyExample/src/ofApp.cpp
@@ -0,0 +1,61 @@
+#include "ofApp.h"
+
+//--------------------------------------------------------------
+void ofApp::setup(){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::update(){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::draw(){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::keyPressed(int key){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::keyReleased(int key){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::mouseMoved(int x, int y){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::mouseDragged(int x, int y, int button){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::mousePressed(int x, int y, int button){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::mouseReleased(int x, int y, int button){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::windowResized(int w, int h){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::gotMessage(ofMessage msg){
+
+}
+
+//--------------------------------------------------------------
+void ofApp::dragEvent(ofDragInfo dragInfo){ 
+
+}
\ No newline at end of file
diff --git a/ofxMaxim/openFrameworksExamples/OSX/emptyExample/src/ofApp.h b/ofxMaxim/openFrameworksExamples/OSX/emptyExample/src/ofApp.h
new file mode 100644
index 0000000..6d640be
--- /dev/null
+++ b/ofxMaxim/openFrameworksExamples/OSX/emptyExample/src/ofApp.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "ofMain.h"
+#include "ofxMaxim.h"
+
+class ofApp : public ofBaseApp{
+	public:
+		void setup();
+		void update();
+		void draw();
+		
+		void keyPressed(int key);
+		void keyReleased(int key);
+		void mouseMoved(int x, int y);
+		void mouseDragged(int x, int y, int button);
+		void mousePressed(int x, int y, int button);
+		void mouseReleased(int x, int y, int button);
+		void windowResized(int w, int h);
+		void dragEvent(ofDragInfo dragInfo);
+		void gotMessage(ofMessage msg);
+    
+    ofxMaxiSample sample;
+};