diff options
| -rw-r--r-- | gui/README.txt | 4 | ||||
| -rw-r--r-- | gui/addons.make | 1 | ||||
| -rw-r--r-- | gui/bin/data/settings.xml | 18 | ||||
| -rw-r--r-- | gui/obj/osx/Release/.compiler_flags | 1 | ||||
| -rwxr-xr-x | gui/start | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/gui/README.txt b/gui/README.txt index 4587e76..af782f0 100644 --- a/gui/README.txt +++ b/gui/README.txt @@ -1,3 +1,5 @@ +builds against d3bc8d383e7d139f69ac412df76b4820a6b837b8 + keys ` - toggle position interface @@ -6,3 +8,5 @@ w - toggle frame q p - <> sources + + diff --git a/gui/addons.make b/gui/addons.make index c6354b4..c3fef44 100644 --- a/gui/addons.make +++ b/gui/addons.make @@ -1,4 +1,3 @@ -ofxNDI ofxGui ofxHelios ofxOpenCV diff --git a/gui/bin/data/settings.xml b/gui/bin/data/settings.xml index 1634e84..7b8d2a5 100644 --- a/gui/bin/data/settings.xml +++ b/gui/bin/data/settings.xml @@ -1,27 +1,27 @@ <?xml version="1.0" ?> <WARP> <p0> - <X>2.000000000</X> - <Y>-3.000000000</Y> + <X>0.000000000</X> + <Y>0.000000000</Y> </p0> <p1> - <X>1199.996093750</X> + <X>1200.000000000</X> <Y>0.000000000</Y> </p1> <p2> - <X>1199.996093750</X> - <Y>897.011718750</Y> + <X>1200.000000000</X> + <Y>900.000000000</Y> </p2> <p3> <X>0.000000000</X> - <Y>899.843750000</Y> + <Y>900.000000000</Y> </p3> </WARP> <POSITION> - <X>151.228576660</X> - <Y>-457.628570557</Y> + <X>0.000000000</X> + <Y>0.000000000</Y> </POSITION> -<SCALE>1.503718138</SCALE> +<SCALE>1.000000000</SCALE> <laser> <power>0</power> <intensity>30</intensity> diff --git a/gui/obj/osx/Release/.compiler_flags b/gui/obj/osx/Release/.compiler_flags deleted file mode 100644 index d07dbca..0000000 --- a/gui/obj/osx/Release/.compiler_flags +++ /dev/null @@ -1 +0,0 @@ --Os -mtune=native -DNDEBUG -stdlib=libc++ -Wall -fexceptions -fpascal-strings -mmacosx-version-min=10.9 -D__MACOSX_CORE__ -fPIC -x objective-c++ -std=c++11 -std=c++14 -I../../openFrameworks/libs/FreeImage/include -I../../openFrameworks/libs/boost/include -I../../openFrameworks/libs/boost/include/boost -I../../openFrameworks/libs/cairo/include -I../../openFrameworks/libs/cairo/include/cairo -I../../openFrameworks/libs/curl/include -I../../openFrameworks/libs/curl/include/curl -I../../openFrameworks/libs/fmodex/include -I../../openFrameworks/libs/freetype/include -I../../openFrameworks/libs/freetype/include/freetype2 -I../../openFrameworks/libs/freetype/include/freetype2/freetype -I../../openFrameworks/libs/freetype/include/freetype2/freetype/config -I../../openFrameworks/libs/freetype/include/freetype2/freetype/internal -I../../openFrameworks/libs/freetype/include/freetype2/freetype/internal/services -I../../openFrameworks/libs/glew/include -I../../openFrameworks/libs/glew/include/GL -I../../openFrameworks/libs/glfw/include -I../../openFrameworks/libs/glfw/include/GLFW -I../../openFrameworks/libs/glm/include -I../../openFrameworks/libs/glm/include/glm -I../../openFrameworks/libs/glm/include/glm/simd -I../../openFrameworks/libs/glm/include/glm/detail -I../../openFrameworks/libs/glm/include/glm/gtc -I../../openFrameworks/libs/glm/include/glm/gtx -I../../openFrameworks/libs/json/include -I../../openFrameworks/libs/kiss/include -I../../openFrameworks/libs/pugixml/include -I../../openFrameworks/libs/rtAudio/include -I../../openFrameworks/libs/tess2/include -I../../openFrameworks/libs/uriparser/include -I../../openFrameworks/libs/uriparser/include/uriparser -I../../openFrameworks/libs/utf8/include -I../../openFrameworks/libs/utf8/include/utf8 -I../../openFrameworks/libs/utf8cpp/include -I../../openFrameworks/libs/utf8cpp/include/utf8 -I../../openFrameworks/libs/openFrameworks -I../../openFrameworks/libs/openFrameworks/3d -I../../openFrameworks/libs/openFrameworks/video -I../../openFrameworks/libs/openFrameworks/types -I../../openFrameworks/libs/openFrameworks/app -I../../openFrameworks/libs/openFrameworks/utils -I../../openFrameworks/libs/openFrameworks/math -I../../openFrameworks/libs/openFrameworks/gl -I../../openFrameworks/libs/openFrameworks/communication -I../../openFrameworks/libs/openFrameworks/events -I../../openFrameworks/libs/openFrameworks/graphics -I../../openFrameworks/libs/openFrameworks/sound -I/work/workspace/raverony/gui/src -I/work/workspace/openFrameworks/addons/ofxNDI/src -I/work/workspace/openFrameworks/addons/ofxNDI/libs -I/work/workspace/openFrameworks/addons/ofxNDI/libs/linndi -I/work/workspace/openFrameworks/addons/ofxNDI/libs/linndi/include -I/work/workspace/openFrameworks/addons/ofxNDI/libs/linndi/lib -I/work/workspace/openFrameworks/addons/ofxNDI/libs/linndi/lib/osx -I/work/workspace/openFrameworks/addons/ofxGui/src -I/work/workspace/openFrameworks/addons/ofxHelios/src -I/work/workspace/openFrameworks/addons/ofxHelios/libs -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libheliosdac -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libheliosdac/includes -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libheliosdac/src -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libusb -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libusb/include -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libusb/lib -I/work/workspace/openFrameworks/addons/ofxHelios/libs/libusb/lib/osx -I/work/workspace/openFrameworks/addons/ofxOpenCv/src -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/license -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2 -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/superres -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/video -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/shape -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/flann -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/hal -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/cuda -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/core/cuda/detail -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/stitching -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/stitching/detail -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/imgproc -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/imgproc/detail -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/ml -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/imgcodecs -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/videoio -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/highgui -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/features2d -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/videostab -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/photo -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/include/opencv2/calib3d -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/lib -I/work/workspace/openFrameworks/addons/ofxOpenCv/libs/opencv/lib/osx -I/work/workspace/openFrameworks/addons/ofxSvg/src -I/work/workspace/openFrameworks/addons/ofxSvg/libs -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2 -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/license -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/include -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/include/libxml -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/lib -I/work/workspace/openFrameworks/addons/ofxSvg/libs/libxml2/lib/osx -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny/license -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny/include -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny/lib -I/work/workspace/openFrameworks/addons/ofxSvg/libs/svgtiny/lib/osx -I/work/workspace/openFrameworks/addons/ofxXmlSettings/src -I/work/workspace/openFrameworks/addons/ofxXmlSettings/libs -I/work/workspace/openFrameworks/addons/ofxClipper/src -I/work/workspace/openFrameworks/addons/ofxClipper/libs -I/work/workspace/openFrameworks/addons/ofxClipper/libs/clipper -I/work/workspace/openFrameworks/addons/ofxClipper/libs/clipper/src -I/work/workspace/openFrameworks/addons/ofxClipper/libs/clipper/src/cpp -I/work/workspace/openFrameworks/addons/ofxClipper/libs/ofxClipper -I/work/workspace/openFrameworks/addons/ofxClipper/libs/ofxClipper/include -I/work/workspace/openFrameworks/addons/ofxClipper/libs/ofxClipper/include/ofx -I/work/workspace/openFrameworks/addons/ofxClipper/libs/ofxClipper/src -I/work/workspace/openFrameworks/addons/ofxMidi/src -I/work/workspace/openFrameworks/addons/ofxMidi/src/desktop -I/work/workspace/openFrameworks/addons/ofxMidi/src/ios -I/work/workspace/openFrameworks/addons/ofxMidi/libs -I/work/workspace/openFrameworks/addons/ofxMidi/libs/rtmidi -I/work/workspace/openFrameworks/addons/ofxMidi/libs/pgmidi -I/work/workspace/openFrameworks/addons/ofxGist/src -I/work/workspace/openFrameworks/addons/ofxGist/libs -I/work/workspace/openFrameworks/addons/ofxGist/libs/Stark-Plumbley -I/work/workspace/openFrameworks/addons/ofxGist/libs/kiss_fft130 -I/work/workspace/openFrameworks/addons/ofxGist/libs/Gist -I/work/workspace/openFrameworks/addons/ofxGist/libs/Gist/src -I/work/workspace/openFrameworks/addons/ofxGist/libs/Gist/src/pitch -I/work/workspace/openFrameworks/addons/ofxGist/libs/Gist/src/mfcc -I/work/workspace/openFrameworks/addons/ofxGist/libs/Gist/src/core -I/work/workspace/openFrameworks/addons/ofxGist/libs/Gist/src/onset-detection-functions -I/work/workspace/openFrameworks/addons/ofxOpenALSoundPlayer/src -I/work/workspace/openFrameworks/addons/ofxOpenALSoundPlayer/libs -I/work/workspace/openFrameworks/addons/ofxOpenALSoundPlayer/libs/kiss -I/work/workspace/openFrameworks/addons/ofxOpenALSoundPlayer/libs/kiss/include -I/work/workspace/openFrameworks/addons/ofxOpenALSoundPlayer/libs/kiss/src -I/work/workspace/openFrameworks/addons/ofxOpenALSoundPlayer/libs/sndfile -I/work/workspace/openFrameworks/addons/ofxOpenALSoundPlayer/libs/sndfile/redist -I/work/workspace/openFrameworks/addons/ofxOpenALSoundPlayer/libs/sndfile/include -I/work/workspace/openFrameworks/addons/ofxOpenALSoundPlayer/libs/sndfile/lib -I/work/workspace/openFrameworks/addons/ofxOpenALSoundPlayer/libs/sndfile/lib/vs2010 -I/work/workspace/openFrameworks/addons/ofxOpenALSoundPlayer/libs/sndfile/lib/win_cb -I/work/workspace/openFrameworks/addons/ofxOpenALSoundPlayer/libs/sndfile/lib/osx -I/work/workspace/openFrameworks/addons/ofxHistoryPlot/src -I/work/workspace/openFrameworks/addons/ofxAChaosLib/src -I/work/workspace/openFrameworks/addons/ofxOsc/src -I/work/workspace/openFrameworks/addons/ofxOsc/libs -I/work/workspace/openFrameworks/addons/ofxOsc/libs/oscpack -I/work/workspace/openFrameworks/addons/ofxOsc/libs/oscpack/src -I/work/workspace/openFrameworks/addons/ofxOsc/libs/oscpack/src/osc -I/work/workspace/openFrameworks/addons/ofxOsc/libs/oscpack/src/ip -I/work/workspace/openFrameworks/addons/ofxOsc/libs/oscpack/src/ip/posix -I/work/workspace/openFrameworks/addons/ofxOsc/libs/oscpack/src/ip/win32 -stdlib=libc++ -mmacosx-version-min=10.9 -v -F/Library/Frameworks -framework OpenAL -framework Accelerate -framework QTKit -framework AGL -framework ApplicationServices -framework AudioToolbox -framework CoreAudio -framework CoreFoundation -framework CoreServices -framework OpenGL -framework IOKit -framework Cocoa -framework CoreVideo -framework AVFoundation -framework CoreMedia -framework QuartzCore -framework Security -framework LDAP -framework CoreMIDI -framework OpenAL @@ -1,3 +1 @@ -mkdir bin/gui.app/Contents/MacOS/@rpath -cp libs/libndi.3.dylib bin/gui.app/Contents/MacOS/@rpath/ cp libs/libHeliosDacAPI.dylib bin/gui.app/Contents/MacOS/ |