Skip to content

Commit

Permalink
commit
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathanminard committed Dec 15, 2013
1 parent 3fa3ec1 commit 457271d
Show file tree
Hide file tree
Showing 182 changed files with 23,551 additions and 3,783 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,5 @@ CloudsMovieDirectory_remote.txt
/CloudsLibrary/src/VisualSystems/Histogram/bin/data/sounds/BloodFlow.aif

/VSOpenP5NoiseSphere/bin/data/CamSettings_ROT-Y.xml

/CloudsLibrary/src/VisualSystems/Histogram/vs_src/CloudsVisualSystemHistogram.cpp
815 changes: 434 additions & 381 deletions CLOUDS/CLOUDS.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

21 changes: 19 additions & 2 deletions CLOUDS/Project.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,23 @@ OF_PATH = ../../..

//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
OFX_LWS_PATH = "$(OF_PATH)/addons/ofxLibwebsockets"

OTHER_LDFLAGS = $(OF_CORE_LIBS)
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
LIB_SSL = "$(OFX_LWS_PATH)/libs/openssl/lib/osx/libssl.a"
LIB_CRYPTO = "$(OFX_LWS_PATH)/libs/openssl/lib/osx/libcrypto.a"
LIB_LIBWEBSOCKETS = "$(OFX_LWS_PATH)/libs/libwebsockets/lib/osx/libwebsockets.a"
SSL_INC = "$(OFX_LWS_PATH)/libs/openssl/"
LWS_INC = "$(OFX_LWS_PATH)/libs/libwebsockets/include"
OFX_LWS_INC = "$(OFX_LWS_PATH)/libs/ofxLibwebsockets/include" "$(OFX_LWS_PATH)/libs/ofxLibwebsockets/src"

OFX_LWS_LIBS = $(LIB_CRYPTO) $(LIB_SSL) $(LIB_LIBWEBSOCKETS)
OFX_LWS_INCLUDES= $(SSL_INC) $(LWS_INC) $(OFX_LWS_INC)
OFX_LWS_SEARCH = "$(OFX_LWS_PATH)/libs/libwebsockets/lib/osx" "$(OFX_LWS_PATH)/libs/libwebsockets/lib/osx"


OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OFX_LWS_LIBS)
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(OFX_LWS_INCLUDES)
LIBRARY_SEARCH_PATHS = $(inherited) $(OFX_LWS_SEARCH)

//OTHER_LDFLAGS = $(OF_CORE_LIBS)
//HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS)
7 changes: 7 additions & 0 deletions CloudsData/HUD/01_MAIN_Outer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions CloudsData/HUD/01_MAIN_inner.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions CloudsData/HUD/01_MAIN_innermost.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5,538 changes: 5,538 additions & 0 deletions CloudsData/HUD/CLOUDS_UI_v34_SVG-09.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions CloudsData/HUD/CLOUDS_UI_v42_xfr-01.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CloudsData/HUD/overlayTest.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 457271d

Please sign in to comment.