Skip to content

Commit 3f7c04c

Browse files
aacuevasaacuevas
committed
Move common libs and libraries to shared folder on Linux
1 parent 93db46b commit 3f7c04c

7 files changed

Lines changed: 13 additions & 16 deletions

File tree

‎Builds/Linux/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ifeq ($(CONFIG),Debug)
2121
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.4.1" -D "JUCE_APP_VERSION_HEX=0x40401" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/VST3\ SDK -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I JuceLibraryCode/
2222
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -rdynamic -fvisibility=hidden
2323
CXXFLAGS += $(CFLAGS) -std=c++11
24-
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L/usr/local/include -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN'
24+
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L/usr/local/include -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN/shared'
2525

2626
TARGET := open-ephys
2727
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
@@ -41,7 +41,7 @@ ifeq ($(CONFIG),Release)
4141
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.4.1" -D "JUCE_APP_VERSION_HEX=0x40401" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/VST3\ SDK -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I JuceLibraryCode/
4242
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -rdynamic -fvisibility=hidden
4343
CXXFLAGS += $(CFLAGS) -std=c++11
44-
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN'
44+
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN/shared'
4545

4646
TARGET := open-ephys-release
4747
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)

‎Builds/Linux/Makefile.plugins‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ifeq ($(CONFIG),Debug)
1616
LIBDIR := $(CURDIR)/build/intermediate/Debug
1717
OBJDIR := $(CURDIR)/build/intermediate/plugins/Debug
1818
OUTDIR := $(CURDIR)/build/plugins
19+
SHAREDDIR := $(CURDIR)/build/shared
1920

2021
ifeq ($(TARGET_ARCH),)
2122
TARGET_ARCH := -march=native
@@ -24,7 +25,7 @@ ifeq ($(CONFIG),Debug)
2425
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
2526
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -std=c++11 -fPIC -rdynamic
2627
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 -Wl,-rpath,'$$$$ORIGIN/..'
28+
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L$(SHAREDDIR) -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/..'
2829
LDDEPS :=
2930
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
3031

@@ -36,6 +37,7 @@ ifeq ($(CONFIG),Release)
3637
LIBDIR := $(CURDIR)/build/intermediate/Release
3738
OBJDIR := $(CURDIR)/build/intermediate/plugins/Release
3839
OUTDIR := $(CURDIR)/build/plugins
40+
SHAREDDIR := $(CURDIR)/build/shared
3941

4042
ifeq ($(TARGET_ARCH),)
4143
TARGET_ARCH := -march=native
@@ -44,7 +46,7 @@ ifeq ($(CONFIG),Release)
4446
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
4547
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 -fPIC -rdynamic
4648
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 -Wl,-rpath,'$$$$ORIGIN/..'
49+
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L$(SHAREDDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -fPIC -rdynamic -Wl,-rpath,'$$$$ORIGIN/../shared'
4850
LDDEPS1 :=
4951
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
5052

@@ -71,7 +73,7 @@ PLUGINNAME=$(shell echo $@ | rev | cut -d'/' -f-1 | rev)
7173

7274
# if there are a .jucer file in the plugin folder - try to find Makefile in the Source/ folder
7375
$(SUBDIRS): CXXFLAGS += -D "OEPLUGIN" -I $(CURDIR)/../../Source/Plugins/CommonLibs
74-
$(COMMONDIRS): OUTDIR := $(BINDIR)
76+
$(COMMONDIRS): OUTDIR := $(BINDIR)/shared
7577
$(COMMONDIRS): LIB_PREFIX := lib
7678
$(SUBDIRS) $(COMMONDIRS):
7779
@if [ -f $@/*.jucer ] && ([ -f $@/Source/Makefile ]); then \

Builds/Linux/build/libokFrontPanel.so renamed to Builds/Linux/build/shared/libokFrontPanel.so

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 46;
77
objects = {
88

99
B885991DB63A31B3C19909AB = {isa = PBXBuildFile; fileRef = 3FCB780144DB07872E4A9E7A; };

‎Builds/VisualStudio2013/open-ephys.sln‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
22
# Visual Studio 2013
33
Project("{5A05F353-1D63-394C-DFB0-981BB2309002}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
44
EndProject
5-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DE917D74-FAF2-41E9-BE61-CD40C62EB7D0}"
6-
ProjectSection(SolutionItems) = preProject
7-
Performance1.psess = Performance1.psess
8-
EndProjectSection
9-
EndProject
105
Global
116
GlobalSection(SolutionConfigurationPlatforms) = preSolution
127
Debug|Win32 = Debug|Win32

‎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.1;JUCE_APP_VERSION_HEX=0x40401;%(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.1;JUCE_APP_VERSION_HEX=0x40401;%(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.1;JUCE_APP_VERSION_HEX=0x40401;%(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.1;JUCE_APP_VERSION_HEX=0x40401;%(PreprocessorDefinitions)</PreprocessorDefinitions>
227227
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
228228
<RuntimeTypeInfo>true</RuntimeTypeInfo>

‎open-ephys.jucer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
companyName="Open Ephys" userNotes="The Open Ephys GUI was designed to provide a fast and flexible interface for acquiring, processing, and visualizing data from extracellular electrodes. See open-ephys.org for more information."
1212
includeBinaryInAppConfig="1">
1313
<EXPORTFORMATS>
14-
<LINUX_MAKE targetFolder="Builds/Linux" vstFolder="" extraLinkerFlags="-ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN'"
14+
<LINUX_MAKE targetFolder="Builds/Linux" vstFolder="" extraLinkerFlags="-ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN/shared'"
1515
extraCompilerFlags="-rdynamic -fvisibility=hidden" extraDefs="JUCE_DISABLE_NATIVE_FILECHOOSERS=1"
1616
smallIcon="nFMauU" bigIcon="nFMauU" cppLanguageStandard="-std=c++11">
1717
<CONFIGURATIONS>

0 commit comments

Comments
 (0)