Skip to content

Commit

Permalink
Merge pull request openframeworks#3604 from AmnonOwed/fix-build-cb
Browse files Browse the repository at this point in the history
Fix openframeworks#3603 Solves OF:master build errors in CB
  • Loading branch information
arturoc committed Jan 31, 2015
2 parents 4799844 + ae97c47 commit 8571ae7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
Binary file added libs/glew/lib/win_cb/glew32s.lib
Binary file not shown.
1 change: 1 addition & 0 deletions libs/openFrameworks/sound/ofSoundStream.h
Expand Up @@ -5,6 +5,7 @@
#include "ofBaseApp.h"
#include "ofTypes.h"
#include "ofBaseSoundStream.h"
#include <climits>

#ifdef OF_SOUNDSTREAM_RTAUDIO
#include "ofRtAudioSoundStream.h"
Expand Down
12 changes: 12 additions & 0 deletions libs/openFrameworksCompiled/project/win_cb/openFrameworksLib.cbp
Expand Up @@ -122,6 +122,12 @@
<Unit filename="../../../openFrameworks/app/ofBaseApp.h">
<Option virtualFolder="openframeworks/app/" />
</Unit>
<Unit filename="../../../openFrameworks/app/ofMainLoop.cpp">
<Option virtualFolder="openframeworks/app/" />
</Unit>
<Unit filename="../../../openFrameworks/app/ofMainLoop.h">
<Option virtualFolder="openframeworks/app/" />
</Unit>
<Unit filename="../../../openFrameworks/communication/ofArduino.cpp">
<Option virtualFolder="openframeworks/communication/" />
</Unit>
Expand Down Expand Up @@ -341,6 +347,12 @@
<Unit filename="../../../openFrameworks/sound/ofRtAudioSoundStream.h">
<Option virtualFolder="openframeworks/sound/" />
</Unit>
<Unit filename="../../../openFrameworks/sound/ofSoundBuffer.cpp">
<Option virtualFolder="openframeworks/sound/" />
</Unit>
<Unit filename="../../../openFrameworks/sound/ofSoundBuffer.h">
<Option virtualFolder="openframeworks/sound/" />
</Unit>
<Unit filename="../../../openFrameworks/sound/ofSoundPlayer.cpp">
<Option virtualFolder="openframeworks/sound/" />
</Unit>
Expand Down

0 comments on commit 8571ae7

Please sign in to comment.