Skip to content

Commit c156e02

Browse files
aacuevasaacuevas
committed
Fix building issues on ubuntu 18
1 parent 8632f3d commit c156e02

6 files changed

Lines changed: 27 additions & 35 deletions

File tree

‎Builds/Linux/Makefile.plugins‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ifeq ($(CONFIG),Debug)
2424
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2" -D "JUCE_APP_VERSION_HEX=0x402" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
2525
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -std=c++11 -fPIC -rdynamic
2626
CXXFLAGS += $(CFLAGS)
27-
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L/usr/local/include -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -fPIC -rdynamic
27+
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L/usr/local/include -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -fPIC -rdynamic -Wl,-rpath,'$$$$ORIGIN/..'
2828
LDDEPS :=
2929
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2" -D "JUCE_APP_VERSION_HEX=0x402" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../Source/Plugins/Headers
3030

@@ -44,7 +44,7 @@ ifeq ($(CONFIG),Release)
4444
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2" -D "JUCE_APP_VERSION_HEX=0x402" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
4545
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 -fPIC -rdynamic
4646
CXXFLAGS += $(CFLAGS)
47-
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -fPIC -rdynamic
47+
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -fPIC -rdynamic -Wl,-rpath,'$$$$ORIGIN/..'
4848
LDDEPS1 :=
4949
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2" -D "JUCE_APP_VERSION_HEX=0x402" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../Source/Plugins/Headers
5050

‎Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,7 +1998,7 @@
19981998
9069CE21141F5A4C5721BCF3,
19991999
65F4459CC1832883FFF6C166,
20002000
9069CE21141F5A4C5721BCF3, ); name = "juce_audio_devices"; sourceTree = "<group>"; };
2001-
217479BAEDCDC02C29C466EB = {isa = PBXGroup; children = (
2001+
F2491E96A608905581674F4F = {isa = PBXGroup; children = (
20022002
B47FEE41896F01CE6EB42B36,
20032003
92A6643073EB8E38F6BBD39C,
20042004
30B1B20F186FC5FBA93D4C90,
@@ -2015,15 +2015,15 @@
20152015
9493FB479E4B4FA2D5C86724,
20162016
BE15A2B0B537B5CC343EF6F9,
20172017
63E801199DEC51DCFBB61890, ); name = private; sourceTree = "<group>"; };
2018-
35E22AE46A6F6A700C3B3D94 = {isa = PBXGroup; children = (
2018+
71185590761DB26FCBCE4AB5 = {isa = PBXGroup; children = (
20192019
AC91C85D2437C7D1286AFAAB,
20202020
D1B150DF1455287F67E629B2,
20212021
FE88B876367616EBFEA00713, ); name = protected; sourceTree = "<group>"; };
2022-
17A7656AF0E66E5C7AD93D8E = {isa = PBXGroup; children = (
2023-
217479BAEDCDC02C29C466EB,
2024-
35E22AE46A6F6A700C3B3D94, ); name = include; sourceTree = "<group>"; };
2025-
2FC2E6E13664F64828C03461 = {isa = PBXGroup; children = (
2026-
17A7656AF0E66E5C7AD93D8E,
2022+
178CBDC0FAC7D537E3CC7E78 = {isa = PBXGroup; children = (
2023+
F2491E96A608905581674F4F,
2024+
71185590761DB26FCBCE4AB5, ); name = include; sourceTree = "<group>"; };
2025+
DC301071305052CAAA2F0AB6 = {isa = PBXGroup; children = (
2026+
178CBDC0FAC7D537E3CC7E78,
20272027
AD9B515651FF2143CA089351,
20282028
6C12F08C8B6CBD125DC897AF,
20292029
5F8BCA4580A738F645A05D8A,
@@ -2040,7 +2040,7 @@
20402040
D45F7C723822356F362B8262,
20412041
AF2216C76163EB0A76390FE9, ); name = libFLAC; sourceTree = "<group>"; };
20422042
1EA82693D5711953C949B39F = {isa = PBXGroup; children = (
2043-
2FC2E6E13664F64828C03461,
2043+
DC301071305052CAAA2F0AB6,
20442044
C68F078AF94886343CBF6DAD,
20452045
18ADA4B7F8ABC14FC3ABCD39,
20462046
BFD1914F80C897BF775D7C92,

‎Builds/VisualStudio2013/open-ephys.sln‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 11.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
4-
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
3+
Project("{5A05F353-1D63-394C-DFB0-981BB2309002}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
64
EndProject
75
Global
86
GlobalSection(SolutionConfigurationPlatforms) = preSolution
97
Debug|Win32 = Debug|Win32
10-
Debug|x64 = Debug|x64
11-
Debug64|Win32 = Debug64|Win32
12-
Debug64|x64 = Debug64|x64
138
Release|Win32 = Release|Win32
14-
Release|x64 = Release|x64
15-
Release64|Win32 = Release64|Win32
9+
Debug64|x64 = Debug64|x64
1610
Release64|x64 = Release64|x64
1711
EndGlobalSection
1812
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1913
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.ActiveCfg = Debug|Win32
2014
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.Build.0 = Debug|Win32
21-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.ActiveCfg = Debug|Win32
22-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|Win32.ActiveCfg = Debug64|x64
23-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
24-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
2515
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
2616
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
27-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|x64.ActiveCfg = Release|Win32
28-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|Win32.ActiveCfg = Release64|x64
17+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
18+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
2919
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.ActiveCfg = Release64|x64
3020
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.Build.0 = Release64|x64
3121
EndGlobalSection

‎Builds/VisualStudio2013/open-ephys.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<ClCompile>
8585
<Optimization>Disabled</Optimization>
8686
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
87-
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87+
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8888
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.4;JUCE_APP_VERSION_HEX=0x404;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8989
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
9090
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -130,7 +130,7 @@
130130
</Midl>
131131
<ClCompile>
132132
<Optimization>Full</Optimization>
133-
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
133+
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
134134
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.4;JUCE_APP_VERSION_HEX=0x404;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135135
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
136136
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -178,7 +178,7 @@
178178
<ClCompile>
179179
<Optimization>Disabled</Optimization>
180180
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
181-
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
181+
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
182182
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.4;JUCE_APP_VERSION_HEX=0x404;%(PreprocessorDefinitions)</PreprocessorDefinitions>
183183
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
184184
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -222,7 +222,7 @@
222222
</Midl>
223223
<ClCompile>
224224
<Optimization>Full</Optimization>
225-
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
225+
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
226226
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.4;JUCE_APP_VERSION_HEX=0x404;%(PreprocessorDefinitions)</PreprocessorDefinitions>
227227
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
228228
<RuntimeTypeInfo>true</RuntimeTypeInfo>

‎JuceLibraryCode/AppConfig.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,23 @@
9191
// juce_audio_formats flags:
9292

9393
#ifndef JUCE_USE_FLAC
94-
//#define JUCE_USE_FLAC
94+
#define JUCE_USE_FLAC 0
9595
#endif
9696

9797
#ifndef JUCE_USE_OGGVORBIS
98-
//#define JUCE_USE_OGGVORBIS
98+
#define JUCE_USE_OGGVORBIS 0
9999
#endif
100100

101101
#ifndef JUCE_USE_MP3AUDIOFORMAT
102-
//#define JUCE_USE_MP3AUDIOFORMAT
102+
#define JUCE_USE_MP3AUDIOFORMAT 0
103103
#endif
104104

105105
#ifndef JUCE_USE_LAME_AUDIO_FORMAT
106-
//#define JUCE_USE_LAME_AUDIO_FORMAT
106+
#define JUCE_USE_LAME_AUDIO_FORMAT 0
107107
#endif
108108

109109
#ifndef JUCE_USE_WINDOWS_MEDIA_FORMAT
110-
//#define JUCE_USE_WINDOWS_MEDIA_FORMAT
110+
#define JUCE_USE_WINDOWS_MEDIA_FORMAT 0
111111
#endif
112112

113113
//==============================================================================

‎open-ephys.jucer‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,9 @@
545545
<FILE id="JiA1GET" name="MainWindow.h" compile="0" resource="0" file="Source/MainWindow.h"/>
546546
</GROUP>
547547
</MAINGROUP>
548-
<JUCEOPTIONS JUCE_QUICKTIME="disabled"/>
548+
<JUCEOPTIONS JUCE_QUICKTIME="disabled" JUCE_USE_FLAC="disabled" JUCE_USE_OGGVORBIS="disabled"
549+
JUCE_USE_MP3AUDIOFORMAT="disabled" JUCE_USE_LAME_AUDIO_FORMAT="disabled"
550+
JUCE_USE_WINDOWS_MEDIA_FORMAT="disabled"/>
549551
<MODULES>
550552
<MODULE id="juce_audio_basics" showAllCode="1" useLocalCopy="1"/>
551553
<MODULE id="juce_audio_devices" showAllCode="1" useLocalCopy="1"/>

0 commit comments

Comments
 (0)