Permalink
Browse files

udpated projects to build with clang, thnaks to ofxLua update; added …

…CocoaHTTPServer for prelim WebDAV file management on ios
  • Loading branch information...
1 parent a9dff57 commit b9035d2931f8d2ec6f9f96c72fe45c18708ebb2f @danomatika committed Oct 7, 2012
Showing with 24,949 additions and 46 deletions.
  1. +3 −3 Project-ios.xcconfig
  2. +6 −2 robotcowboy-macos.xcodeproj/project.pbxproj
  3. +303 −36 robotcowboy.xcodeproj/project.pbxproj
  4. +23 −0 scripts/update_httpserver.sh
  5. +4 −1 src/Global.cpp
  6. +2 −1 src/Global.h
  7. +1 −1 src/Scene.h
  8. +749 −0 src/desktop/ofAppGLFWWindow.cpp
  9. +112 −0 src/desktop/ofAppGLFWWindow.h
  10. +5 −0 src/ios/App.h
  11. +11 −2 src/ios/App.mm
  12. +14 −0 src/ios/CocoaHTTPServer/Core/Categories/DDData.h
  13. +158 −0 src/ios/CocoaHTTPServer/Core/Categories/DDData.m
  14. +12 −0 src/ios/CocoaHTTPServer/Core/Categories/DDNumber.h
  15. +88 −0 src/ios/CocoaHTTPServer/Core/Categories/DDNumber.m
  16. +56 −0 src/ios/CocoaHTTPServer/Core/Categories/DDRange.h
  17. +104 −0 src/ios/CocoaHTTPServer/Core/Categories/DDRange.m
  18. +45 −0 src/ios/CocoaHTTPServer/Core/HTTPAuthenticationRequest.h
  19. +195 −0 src/ios/CocoaHTTPServer/Core/HTTPAuthenticationRequest.m
  20. +119 −0 src/ios/CocoaHTTPServer/Core/HTTPConnection.h
  21. +2,728 −0 src/ios/CocoaHTTPServer/Core/HTTPConnection.m
  22. +136 −0 src/ios/CocoaHTTPServer/Core/HTTPLogging.h
  23. +48 −0 src/ios/CocoaHTTPServer/Core/HTTPMessage.h
  24. +113 −0 src/ios/CocoaHTTPServer/Core/HTTPMessage.m
  25. +149 −0 src/ios/CocoaHTTPServer/Core/HTTPResponse.h
  26. +201 −0 src/ios/CocoaHTTPServer/Core/HTTPServer.h
  27. +784 −0 src/ios/CocoaHTTPServer/Core/HTTPServer.m
  28. +65 −0 src/ios/CocoaHTTPServer/Core/Mime/MultipartFormDataParser.h
  29. +523 −0 src/ios/CocoaHTTPServer/Core/Mime/MultipartFormDataParser.m
  30. +33 −0 src/ios/CocoaHTTPServer/Core/Mime/MultipartMessageHeader.h
  31. +86 −0 src/ios/CocoaHTTPServer/Core/Mime/MultipartMessageHeader.m
  32. +23 −0 src/ios/CocoaHTTPServer/Core/Mime/MultipartMessageHeaderField.h
  33. +217 −0 src/ios/CocoaHTTPServer/Core/Mime/MultipartMessageHeaderField.m
  34. +75 −0 src/ios/CocoaHTTPServer/Core/Responses/HTTPAsyncFileResponse.h
  35. +431 −0 src/ios/CocoaHTTPServer/Core/Responses/HTTPAsyncFileResponse.m
  36. +13 −0 src/ios/CocoaHTTPServer/Core/Responses/HTTPDataResponse.h
  37. +79 −0 src/ios/CocoaHTTPServer/Core/Responses/HTTPDataResponse.m
  38. +52 −0 src/ios/CocoaHTTPServer/Core/Responses/HTTPDynamicFileResponse.h
  39. +292 −0 src/ios/CocoaHTTPServer/Core/Responses/HTTPDynamicFileResponse.m
  40. +25 −0 src/ios/CocoaHTTPServer/Core/Responses/HTTPFileResponse.h
  41. +237 −0 src/ios/CocoaHTTPServer/Core/Responses/HTTPFileResponse.m
  42. +12 −0 src/ios/CocoaHTTPServer/Core/Responses/HTTPRedirectResponse.h
  43. +73 −0 src/ios/CocoaHTTPServer/Core/Responses/HTTPRedirectResponse.m
  44. +97 −0 src/ios/CocoaHTTPServer/Core/WebSocket.h
  45. +811 −0 src/ios/CocoaHTTPServer/Core/WebSocket.m
  46. +7 −0 src/ios/CocoaHTTPServer/Extensions/WebDAV/DAVConnection.h
  47. +160 −0 src/ios/CocoaHTTPServer/Extensions/WebDAV/DAVConnection.m
  48. +11 −0 src/ios/CocoaHTTPServer/Extensions/WebDAV/DAVResponse.h
  49. +359 −0 src/ios/CocoaHTTPServer/Extensions/WebDAV/DAVResponse.m
  50. +7 −0 src/ios/CocoaHTTPServer/Extensions/WebDAV/DELETEResponse.h
  51. +49 −0 src/ios/CocoaHTTPServer/Extensions/WebDAV/DELETEResponse.m
  52. +8 −0 src/ios/CocoaHTTPServer/Extensions/WebDAV/PUTResponse.h
  53. +69 −0 src/ios/CocoaHTTPServer/Extensions/WebDAV/PUTResponse.m
  54. +18 −0 src/ios/CocoaHTTPServer/LICENSE.txt
  55. +4 −0 src/ios/CocoaHTTPServer/Vendor/CocoaAsyncSocket/About.txt
  56. +1,046 −0 src/ios/CocoaHTTPServer/Vendor/CocoaAsyncSocket/GCDAsyncSocket.h
  57. +7,306 −0 src/ios/CocoaHTTPServer/Vendor/CocoaAsyncSocket/GCDAsyncSocket.m
  58. +33 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/About.txt
  59. +41 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/DDASLLogger.h
  60. +99 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/DDASLLogger.m
  61. +102 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.h
  62. +654 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.m
  63. +334 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/DDFileLogger.h
  64. +1,380 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/DDFileLogger.m
  65. +584 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/DDLog.h
  66. +1,057 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/DDLog.m
  67. +167 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/DDTTYLogger.h
  68. +1,480 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/DDTTYLogger.m
  69. +65 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.h
  70. +191 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.m
  71. +119 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.h
  72. +189 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.m
  73. +7 −0 src/ios/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/README.txt
  74. +31 −0 src/ios/WebServer.h
  75. +59 −0 src/ios/WebServer.mm
View
@@ -12,7 +12,7 @@ OF_PATH = ../../..
ADDONS_PATH = $(OF_PATH)/addons
// ofxPd
-OFX_PD_HEADERS = "$(ADDONS_PATH)/ofxPd/src/pd/pure-data/src"
+OFX_PD_HEADERS = "$(ADDONS_PATH)/ofxPd/src/pd/pure-data/src/"
OFX_PD_CFLAGS = -DHAVE_UNISTD_H -DUSEAPI_DUMMY -DPD -DUNIX
OFX_PD_LIBS = -lm
@@ -23,7 +23,7 @@ OFX_LUA_HEADERS = "$(ADDONS_PATH)/ofxLua/src/" "$(ADDONS_PATH)/ofxLua/src/lua/"
OFX_APP_UTILS_DEFINES = OFX_APP_UTILS_NO_CONTROL_PANEL OFX_APP_UTILS_NO_XML
// ofxOsc
-OFX_OSC_HEADERS = "$(ADDONS_PATH)/ofxOsc/libs/oscpack/src"
+OFX_OSC_HEADERS = "$(ADDONS_PATH)/ofxOsc/libs/oscpack/src/"
// ofxUI
OFX_UI_DEFINES = OFX_UI_NO_XML
@@ -37,7 +37,7 @@ OF_ADDON_LIBS = $(OFX_PD_LIBS)
// MAIN
GCC_PREPROCESSOR_DEFINITIONS = $(OF_ADDON_DEFINES)
-OTHER_CFLAGS = $(OFX_PD_CFLAGS)
+OTHER_CFLAGS = $(OFX_PD_CFLAGS) -I/usr/include/libxml2/
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(OF_ADDON_HEADERS)
OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_ADDON_LIBS)
@@ -18,6 +18,7 @@
3062515C161D0129003D5BA9 /* getdir.c in Sources */ = {isa = PBXBuildFile; fileRef = 30625159161D0129003D5BA9 /* getdir.c */; };
3062515D161D0129003D5BA9 /* moog~.c in Sources */ = {isa = PBXBuildFile; fileRef = 3062515A161D0129003D5BA9 /* moog~.c */; };
3062515E161D0129003D5BA9 /* stripdir.c in Sources */ = {isa = PBXBuildFile; fileRef = 3062515B161D0129003D5BA9 /* stripdir.c */; };
+ 30625784161FFB22003D5BA9 /* pipelist.c in Sources */ = {isa = PBXBuildFile; fileRef = 30625783161FFB22003D5BA9 /* pipelist.c */; };
308637BA15D37B8D00BAD4C5 /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 308637B915D37B8D00BAD4C5 /* CoreMIDI.framework */; };
308C1BB6146B39350067923E /* PdBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 308C1BB0146B39350067923E /* PdBase.cpp */; };
308C1BB7146B39350067923E /* PdTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 308C1BB4146B39350067923E /* PdTypes.cpp */; };
@@ -304,6 +305,7 @@
30625159161D0129003D5BA9 /* getdir.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = getdir.c; sourceTree = "<group>"; };
3062515A161D0129003D5BA9 /* moog~.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "moog~.c"; sourceTree = "<group>"; };
3062515B161D0129003D5BA9 /* stripdir.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stripdir.c; sourceTree = "<group>"; };
+ 30625783161FFB22003D5BA9 /* pipelist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pipelist.c; sourceTree = "<group>"; };
308637B915D37B8D00BAD4C5 /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = /System/Library/Frameworks/CoreMIDI.framework; sourceTree = "<absolute>"; };
308C1BB0146B39350067923E /* PdBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PdBase.cpp; sourceTree = "<group>"; };
308C1BB4146B39350067923E /* PdTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PdTypes.cpp; sourceTree = "<group>"; };
@@ -1392,6 +1394,7 @@
30EA88FB14D338F4000A1AB9 /* mrpeach */ = {
isa = PBXGroup;
children = (
+ 30625783161FFB22003D5BA9 /* pipelist.c */,
30EA88FC14D338F4000A1AB9 /* midifile.c */,
30EA88FD14D338F4000A1AB9 /* packOSC.c */,
30EA88FF14D338F4000A1AB9 /* routeOSC.c */,
@@ -1896,6 +1899,7 @@
3062515C161D0129003D5BA9 /* getdir.c in Sources */,
3062515D161D0129003D5BA9 /* moog~.c in Sources */,
3062515E161D0129003D5BA9 /* stripdir.c in Sources */,
+ 30625784161FFB22003D5BA9 /* pipelist.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1924,7 +1928,7 @@
GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
GCC_MODEL_TUNING = G5;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = "";
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
@@ -1954,7 +1958,7 @@
GCC_OPTIMIZATION_LEVEL = 3;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_UNROLL_LOOPS = YES;
- GCC_VERSION = com.apple.compilers.llvmgcc42;
+ GCC_VERSION = "";
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = NO;
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,23 @@
+#! /bin/bash
+
+WD=$(dirname $0)
+
+###
+
+cd $WD
+
+# get latest source
+git clone git://github.com/robbiehanson/CocoaHTTPServer.git
+
+# make folder
+mkdir -p ../src/ios/CocoaHTTPServer
+
+# copy rj sources
+cp -Rv CocoaHTTPServer/Core ../src/ios/CocoaHTTPServer
+cp -Rv CocoaHTTPServer/Extensions ../src/ios/CocoaHTTPServer
+cp -Rv CocoaHTTPServer/Vendor ../src/ios/CocoaHTTPServer
+cp -Rv CocoaHTTPServer/LICENSE.txt ../src/ios/CocoaHTTPServer
+
+# cleanup
+rm -rfv CocoaHTTPServer
+
View
@@ -20,6 +20,9 @@ Global& Global::instance() {
void Global::setup(const int numOutChannels, const int numInChannels,
const int sampleRate, const int ticksPerBuffer) {
+ // get data path
+ dataPath = ofToDataPath("", true);
+
loadSettings("ka");
audioEngine.setup(numOutChannels, numInChannels,
@@ -106,6 +109,6 @@ void Global::resetGraphics() {
// PRIVATE
//--------------------------------------------------------------
-Global::Global() : scenePath("scenes") {
+Global::Global() : dataPath("data"), scenePath("scenes") {
logLevel = ofGetLogLevel();
}
View
@@ -45,7 +45,8 @@ class Global {
/// \section Variables
- string scenePath; ///< absolute path to scene root
+ string dataPath; ///< absolute path to data folder
+ string scenePath; ///< absolute path to scene folder
ofLogLevel logLevel; ///< log level for console
/// \section Functions
View
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Dan Wilcox <danomatika@gmail.com>
+ * Copyright (c) 2012 Dan Wilcox <danomatika@gmail.com>
*
* BSD Simplified License.
* For information on usage and redistribution, and for a DISCLAIMER OF ALL
Oops, something went wrong.

0 comments on commit b9035d2

Please sign in to comment.