Skip to content

Commit f52815b

Browse files
brannondorseybrannondorsey
committed
Merge branch 'develop' of github.com:olab-io/ofSketch into develop
2 parents 8a39be8 + 80692c3 commit f52815b

File tree

14 files changed

+1236
-129
lines changed

14 files changed

+1236
-129
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
+ Fix bug that prevents new client connections when a project is compiling ([#82](https://github.com/olab-io/ofSketch/issues/82)).
44
+ Fix bug that hid resources bar on desktop sized screens ([#104](https://github.com/olab-io/ofSketch/issues/104)).
55
+ Disable autocomplete in inline comments: "//" ([#108](https://github.com/olab-io/ofSketch/issues/108)).
6+
+ Xcode 6 / 10.9 compatible.
67

78
- 0.3.2 (08-31-2014)
89
+ Basic file upload support ([#16](https://github.com/olab-io/ofSketch/issues/16)).

‎ofSketchApp/ofSketchApp.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
4B9AF9399F7DA7A1CA3D2C58 /* Deserializer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4565A7CA296E5B8090806DB /* Deserializer.cpp */; };
4444
5BB82711925A3764235C2CEB /* FileExtensionFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BD291FB03292C6D352C26FE /* FileExtensionFilter.cpp */; };
4545
5DF1C13343DD10285CBEC8E1 /* WebSocketConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99624C097E7F1940FDA80F0 /* WebSocketConnection.cpp */; };
46-
5F3744A26D0041D0C0FC246A /* App.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33A937A4598FE853C51EB326 /* App.cpp */; };
46+
5F3744A26D0041D0C0FC246A /* ofApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33A937A4598FE853C51EB326 /* ofApp.cpp */; };
4747
62509F39EA6197BEA0194276 /* ByteBufferReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 021CAF811F031FFBDFB18797 /* ByteBufferReader.cpp */; };
4848
630A54B4C43A1DDEA17E6D4F /* ClientProgressStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A59147EE28AAD568806BD170 /* ClientProgressStream.cpp */; };
4949
66A80FD312926DEB8C9FE7F6 /* ByteBufferUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE5B3B19544657B6F9CCCA03 /* ByteBufferUtils.cpp */; };
@@ -242,7 +242,7 @@
242242
2FC8E2266FE2F5545775A16D /* Compression.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Compression.cpp; path = ../../../addons/ofxIO/libs/ofxIO/src/Compression.cpp; sourceTree = SOURCE_ROOT; };
243243
31371376A138BCB2EBC2FCB3 /* MethodRegistry.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = MethodRegistry.h; path = ../../../addons/ofxJSONRPC/libs/ofxJSONRPC/include/ofx/JSONRPC/MethodRegistry.h; sourceTree = SOURCE_ROOT; };
244244
32ACC8388B45FC2366BEC374 /* WebSocketFrame.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = WebSocketFrame.cpp; path = ../../../addons/ofxHTTP/libs/ofxHTTP/src/WebSocketFrame.cpp; sourceTree = SOURCE_ROOT; };
245-
33A937A4598FE853C51EB326 /* App.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = App.cpp; path = src/App.cpp; sourceTree = SOURCE_ROOT; };
245+
33A937A4598FE853C51EB326 /* ofApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ofApp.cpp; path = src/ofApp.cpp; sourceTree = SOURCE_ROOT; };
246246
342D481B54AD38916A274FC1 /* UploadRouter.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = UploadRouter.h; path = src/UploadRouter.h; sourceTree = SOURCE_ROOT; };
247247
34A444536EEE748A3E48527F /* ofxTaskQueue.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofxTaskQueue.h; path = ../../../addons/ofxTaskQueue/src/ofxTaskQueue.h; sourceTree = SOURCE_ROOT; };
248248
34AF1CD2314601812B70A05E /* IPVideoRoute.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = IPVideoRoute.cpp; path = ../../../addons/ofxHTTP/libs/ofxHTTP/src/IPVideoRoute.cpp; sourceTree = SOURCE_ROOT; };
@@ -368,7 +368,7 @@
368368
A546CE4DC722993EE6D6267B /* StreamUtils.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = StreamUtils.h; path = ../../../addons/ofxHTTP/libs/ofxHTTP/include/ofx/HTTP/StreamUtils.h; sourceTree = SOURCE_ROOT; };
369369
A59147EE28AAD568806BD170 /* ClientProgressStream.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = ClientProgressStream.cpp; path = ../../../addons/ofxHTTP/libs/ofxHTTP/src/ClientProgressStream.cpp; sourceTree = SOURCE_ROOT; };
370370
A6C2769742EF6E2D624770BC /* Request.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = Request.h; path = ../../../addons/ofxJSONRPC/libs/ofxJSONRPC/include/ofx/JSONRPC/Request.h; sourceTree = SOURCE_ROOT; };
371-
A72A9CCF86C5B616747F4214 /* App.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = App.h; path = src/App.h; sourceTree = SOURCE_ROOT; };
371+
A72A9CCF86C5B616747F4214 /* ofApp.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ofApp.h; path = src/ofApp.h; sourceTree = SOURCE_ROOT; };
372372
A72BA00649A33D94720E46B0 /* Error.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = Error.h; path = ../../../addons/ofxJSONRPC/libs/ofxJSONRPC/include/ofx/JSONRPC/Error.h; sourceTree = SOURCE_ROOT; };
373373
A842FAA158FB434DF69D04F8 /* SketchUtils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = SketchUtils.cpp; path = src/SketchUtils.cpp; sourceTree = SOURCE_ROOT; };
374374
A9ABBF4A56F7A5AAB5A5DC5D /* snappy-sinksource.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = "snappy-sinksource.h"; path = "../../../addons/ofxIO/libs/snappy/src/snappy-sinksource.h"; sourceTree = SOURCE_ROOT; };
@@ -1243,8 +1243,8 @@
12431243
0A7B769C45381FBF374DC71B /* Addon.h */,
12441244
211CC999BA5BE068E22D2D61 /* AddonManager.cpp */,
12451245
4AFDEBB7DE39F350B20F5E5B /* AddonManager.h */,
1246-
33A937A4598FE853C51EB326 /* App.cpp */,
1247-
A72A9CCF86C5B616747F4214 /* App.h */,
1246+
33A937A4598FE853C51EB326 /* ofApp.cpp */,
1247+
A72A9CCF86C5B616747F4214 /* ofApp.h */,
12481248
805432FD02D669F8AB87523A /* BaseProcessTask.cpp */,
12491249
16BF8CD7F23D5D051DE9B8AC /* BaseProcessTask.h */,
12501250
BA556D3D36C8D01C120B7F53 /* Compiler.cpp */,
@@ -1408,7 +1408,7 @@
14081408
E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */,
14091409
3D2BFE7FC7B8D160CA004132 /* Addon.cpp in Sources */,
14101410
06A8B8112D2257097B9ECBBF /* AddonManager.cpp in Sources */,
1411-
5F3744A26D0041D0C0FC246A /* App.cpp in Sources */,
1411+
5F3744A26D0041D0C0FC246A /* ofApp.cpp in Sources */,
14121412
217F728022E0ABAADF26E8F0 /* BaseProcessTask.cpp in Sources */,
14131413
82A4AA658687D7DB5BCA0B0D /* Compiler.cpp in Sources */,
14141414
AC301114E6ADFB873BBEBB11 /* EditorSettings.cpp in Sources */,

‎ofSketchApp/src/BaseProcessTask.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,9 @@ void BaseProcessTask::runTask()
6262
Poco::Pipe _outAndErrPipe;
6363
Poco::PipeInputStream istr(_outAndErrPipe);
6464

65-
// std::string toolChainPath = ofToDataPath("Toolchains/ofMinGW", true);
66-
// std::string pathVar = toolChainPath + "\MinGW\msys\1.0\bin;" + toolChainPath + "\MinGW\bin;%PATH%";
67-
// _env["Path"] = "%PATH%";
68-
// _env["PATH"] = "C:\\WINDOWS\\system32";
69-
// _env["Path"] = "C:\\Users\\bakercp\\Desktop\\openFrameworks\\apps\\ofSketch\\ofSketchApp\\bin\\data\\Toolchains\\ofMinGW\\MinGW\\bin;C:\\Users\\bakercp\\Desktop\\openFrameworks\\apps\\ofSketch\\ofSketchApp\\bin\\data\\Toolchains\\ofMinGW\\MinGW\\msys\\1.0\\bin";
70-
7165
try
7266
{
67+
7368
Poco::ProcessHandle ph = Poco::Process::launch(_command,
7469
_args,
7570
_initialDirectory.toString(),

‎ofSketchApp/src/Compiler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Poco::UUID Compiler::compile(const Project& project)
5353
{
5454
MakeTask::Settings settings;
5555
settings.ofRoot = ofToDataPath(_openFrameworksDir, true);
56-
return _taskQueue.start(new MakeTask(settings, project, "Release"));
56+
return _taskQueue.start(new MakeTask(settings, project, "ReleaseProject"));
5757
}
5858

5959

‎ofSketchApp/src/RunTask.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include "RunTask.h"
2727
#include "Poco/TaskNotification.h"
28-
#include "App.h"
28+
//#include "ofApp.h"
2929

3030

3131
namespace of {

‎ofSketchApp/src/WebSocketLoggerChannel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include "WebSocketLoggerChannel.h"
2727
#include "Poco/Buffer.h"
28-
#include "App.h"
28+
#include "ofApp.h"
2929

3030

3131
namespace of {

‎ofSketchApp/src/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
// =============================================================================
2424

2525

26-
#include "App.h"
26+
#include "ofApp.h"
2727

2828

2929
int main()
3030
{
3131
ofSetupOpenGL(200, 40, OF_WINDOW);
32-
ofRunApp(new of::Sketch::App());
32+
ofRunApp(new of::Sketch::ofApp());
3333
}

0 commit comments

Comments
 (0)