Skip to content

Commit 6e2600d

Browse files
committed
Moving JuceHeader.h below other includes, to be sure it is always included after system libraries (for Mac Point build failure)
1 parent 13ab8b4 commit 6e2600d

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

include/AudioReaderSource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
#endif
3838

3939
#include <iomanip>
40-
#include "JuceHeader.h"
4140
#include "ReaderBase.h"
41+
#include "JuceHeader.h"
4242

4343
using namespace std;
4444

include/AudioResampler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
#define _NDEBUG
3939
#endif
4040

41-
#include "JuceHeader.h"
4241
#include "AudioBufferSource.h"
4342
#include "Exceptions.h"
43+
#include "JuceHeader.h"
4444

4545
namespace openshot {
4646

include/Clip.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <memory>
3737
#include <string>
3838
#include <QtGui/QImage>
39-
#include "JuceHeader.h"
4039
#include "AudioResampler.h"
4140
#include "ClipBase.h"
4241
#include "Color.h"
@@ -47,6 +46,7 @@
4746
#include "Fraction.h"
4847
#include "KeyFrame.h"
4948
#include "ReaderBase.h"
49+
#include "JuceHeader.h"
5050

5151
using namespace std;
5252
using namespace openshot;

include/EffectBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#include <iomanip>
3333
#include <memory>
3434
#include "ClipBase.h"
35-
#include "Frame.h"
3635
#include "Json.h"
36+
#include "Frame.h"
3737

3838
using namespace std;
3939

include/Frame.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@
5656
#ifdef USE_IMAGEMAGICK
5757
#include "Magick++.h"
5858
#endif
59-
#include "JuceHeader.h"
6059
#include "ChannelLayouts.h"
6160
#include "AudioBufferSource.h"
6261
#include "AudioResampler.h"
6362
#include "Fraction.h"
63+
#include "JuceHeader.h"
6464

6565
#pragma SWIG nowarn=362
6666
using namespace std;

include/Settings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#define OPENSHOT_SETTINGS_H
3030

3131

32-
#include "JuceHeader.h"
3332
#include <iostream>
3433
#include <iomanip>
3534
#include <fstream>
@@ -40,6 +39,7 @@
4039
#include <time.h>
4140
#include <zmq.hpp>
4241
#include <unistd.h>
42+
#include "JuceHeader.h"
4343

4444

4545
using namespace std;

0 commit comments

Comments
 (0)