Merge pull request Lensley#2 from obviousjim/master

007 update
dailyTLJ · Nov 14, 2011 · d4906c2 · d4906c2
2 parents 38d0bf1 + 3503ba5
commit d4906c2
Show file tree

Hide file tree

Showing 12 changed files with 644 additions and 887 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,24 @@
+#standard gitignore for Flightphase addons
+
+#xcode files
+*.mode*
+*.perspectivev3
+*.pbxuser
+*.xcworkspace
+xcuserdata/
+
+#builds
+build/
+obj/
+*.o
+*.app
+
+#codeblocks files
+apps/*/*/*.layout
+apps/*/*/*.depend
+apps/*/*/bin/clickToLaunch*
+apps/*/*/bin/libs
+apps/*/*/obj
+
+#mac files
+.DS_Store
diff --git a/README b/README
@@ -2,20 +2,25 @@
 REQUIREMENTS
 ==================
 
-ofxMSAInteractiveObject
-
-http://code.google.com/p/ofxmsaof/wiki/ofxMSAInteractiveObject
+ofxMSAInteractiveObject is hosted on github here
 
+https://github.com/Flightphase/ofxMSAInteractiveObject
 
 EXAMPLE
 ==================
 
-Move example/softKeyboardExample to apps/addonsExamples
-
+Just shows keyboard
 
 TO DO
 ==============
 - Padding doesn't work for top/bottom stuff.  only right and left.
 - ofxSoftKey::onPress should use ofNotifyEvent so that all registered listeners will get events
 - key click action (click color, etc) SOUND?
-- SHIFT key
+- SHIFT key
+
+HISTORY
+==============
+
+originally by Jeff Crouse for Lensley. 
+
+Updated to 007 by James George 
diff --git a/example/.DS_Store b/example/.DS_Store
diff --git a/example/Project.xcconfig b/example/Project.xcconfig
@@ -0,0 +1,9 @@
+//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT.
+//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED
+OF_PATH = ../../..
+
+//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
+#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
+
+OTHER_LDFLAGS = $(OF_CORE_LIBS) 
+HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
diff --git a/example/softKeyboardExample/bin/data/vag.ttf → example/bin/data/vag.ttf b/example/softKeyboardExample/bin/data/vag.ttf → example/bin/data/vag.ttf
diff --git a/...KeyboardExample/openFrameworks-Info.plist → example/openFrameworks-Info.plist b/...KeyboardExample/openFrameworks-Info.plist → example/openFrameworks-Info.plist
diff --git a/example/softKeyboardExample.xcodeproj/project.pbxproj b/example/softKeyboardExample.xcodeproj/project.pbxproj
diff --git a/example/softKeyboardExample/softKeyboardExample.xcodeproj/.gitignore b/example/softKeyboardExample/softKeyboardExample.xcodeproj/.gitignore
diff --git a/example/softKeyboardExample/softKeyboardExample.xcodeproj/project.pbxproj b/example/softKeyboardExample/softKeyboardExample.xcodeproj/project.pbxproj
diff --git a/example/softKeyboardExample/src/main.cpp → example/src/main.cpp b/example/softKeyboardExample/src/main.cpp → example/src/main.cpp
diff --git a/example/softKeyboardExample/src/testApp.cpp → example/src/testApp.cpp b/example/softKeyboardExample/src/testApp.cpp → example/src/testApp.cpp
diff --git a/example/softKeyboardExample/src/testApp.h → example/src/testApp.h b/example/softKeyboardExample/src/testApp.h → example/src/testApp.h