Skip to content

Feature defines for linux #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emmanuelgeoffray wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature defines for linux #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28f3207
add define in config.make for video
Apr 8, 2016
e8310aa
add defines for audiodecoder, for win and osx, fixes ofxTimeline not …
Apr 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example-videoRenderer/config.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ OF_ROOT = ../../..
# for example search paths like:
# USER_CFLAGS = -I src/objects

USER_CFLAGS =
USER_CFLAGS = -DTIMELINE_VIDEO_INCLUDED


# USER_LDFLAGS allows to pass custom flags to the linker
Expand Down
4 changes: 3 additions & 1 deletion libs/ofOpenALSoundPlayer_TimelineAdditions/src/ofOpenALSoundPlayer_TimelineAdditions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

#if defined (TARGET_WIN32) || defined (TARGET_OSX)
#include "ofOpenALSoundPlayer_TimelineAdditions.h"

//#ifdef OF_SOUND_PLAYER_OPENAL
Expand Down Expand Up @@ -1094,4 +1096,4 @@ void ofOpenALSoundPlayer_TimelineAdditions::runWindow(vector<float> & signal){
signal[i] *= window[i];
}

//#endif
#endif
2 changes: 2 additions & 0 deletions libs/ofOpenALSoundPlayer_TimelineAdditions/src/ofOpenALSoundPlayer_TimelineAdditions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#pragma once
#if defined (TARGET_WIN32) || defined (TARGET_OSX)

#include "ofConstants.h"

Expand Down Expand Up @@ -204,3 +205,4 @@ class ofOpenALSoundPlayer_TimelineAdditions : public ofBaseSoundPlayer, public o
float justSetTime;
};

#endif