Skip to content

Commit aafa0ba

Browse files
aacuevasaacuevas
committed
Merge branch 'dllStructure' into development
2 parents 3f7c04c + df00489 commit aafa0ba

11 files changed

Lines changed: 57 additions & 44 deletions

‎Builds/Linux/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ifeq ($(CONFIG),Debug)
2323
CXXFLAGS += $(CFLAGS) -std=c++11
2424
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

26-
TARGET := open-ephys
26+
TARGET := open-ephys.so
2727
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
2828
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
2929
endif
@@ -43,7 +43,7 @@ ifeq ($(CONFIG),Release)
4343
CXXFLAGS += $(CFLAGS) -std=c++11
4444
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

46-
TARGET := open-ephys-release
46+
TARGET := open-ephys-release.so
4747
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
4848
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
4949
endif

‎Builds/VisualStudio2013/Plugins/PluginCommonLib_Debug32.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</Command>
2424
</PreBuildEvent>
2525
<PostBuildEvent>
26-
<Command>copy /Y "$(OutDir)$(TargetFileName)" "$(GUIDir)\"</Command>
26+
<Command>copy /Y "$(OutDir)$(TargetFileName)" "$(GUIDir)\shared"</Command>
2727
</PostBuildEvent>
2828
<PreLinkEvent>
2929
<Command>

‎Builds/VisualStudio2013/Plugins/PluginCommonLib_Debug64.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportGroup Label="PropertySheets" />
44
<PropertyGroup Label="UserMacros">
5-
<GUIDir>..\..\..\x64\Debug64\bin</GUIDir>
5+
<GUIDir>..\..\..\x64\Debug\bin</GUIDir>
66
<PluginDir>$(GUIDir)\plugins</PluginDir>
77
</PropertyGroup>
88
<PropertyGroup>
@@ -23,7 +23,7 @@
2323
</Command>
2424
</PreLinkEvent>
2525
<PostBuildEvent>
26-
<Command>copy /Y "$(OutDir)$(TargetFileName)" "$(GUIDir)\"</Command>
26+
<Command>copy /Y "$(OutDir)$(TargetFileName)" "$(GUIDir)\shared"</Command>
2727
</PostBuildEvent>
2828
</ItemDefinitionGroup>
2929
<ItemGroup>

‎Builds/VisualStudio2013/Plugins/PluginCommonLib_Release32.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AdditionalDependencies>open-ephys.lib;setupapi.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
2020
</Link>
2121
<PostBuildEvent>
22-
<Command>copy /Y "$(OutDir)$(TargetFileName)" "$(GUIDir)\"</Command>
22+
<Command>copy /Y "$(OutDir)$(TargetFileName)" "$(GUIDir)\shared"</Command>
2323
</PostBuildEvent>
2424
<PreLinkEvent>
2525
<Command>

‎Builds/VisualStudio2013/Plugins/PluginCommonLib_Release64.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportGroup Label="PropertySheets" />
44
<PropertyGroup Label="UserMacros">
5-
<GUIDir>..\..\..\x64\Release64\bin</GUIDir>
5+
<GUIDir>..\..\..\x64\Release\bin</GUIDir>
66
<PluginDir>$(GUIDir)\plugins</PluginDir>
77
</PropertyGroup>
88
<PropertyGroup>
@@ -23,7 +23,7 @@
2323
</Command>
2424
</PreBuildEvent>
2525
<PostBuildEvent>
26-
<Command>copy /Y "$(OutDir)$(TargetFileName)" "$(GUIDir)\"</Command>
26+
<Command>copy /Y "$(OutDir)$(TargetFileName)" "$(GUIDir)\shared"</Command>
2727
</PostBuildEvent>
2828
<PreLinkEvent>
2929
<Command>

‎Builds/VisualStudio2013/Plugins/Plugin_Debug64.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportGroup Label="PropertySheets" />
44
<PropertyGroup Label="UserMacros">
5-
<GUIDir>..\..\x64\Debug64\bin</GUIDir>
5+
<GUIDir>..\..\x64\Debug\bin</GUIDir>
66
<PluginDir>$(GUIDir)\plugins</PluginDir>
77
</PropertyGroup>
88
<PropertyGroup>

‎Builds/VisualStudio2013/Plugins/Plugin_Release64.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportGroup Label="PropertySheets" />
44
<PropertyGroup Label="UserMacros">
5-
<GUIDir>..\..\x64\Release64\bin</GUIDir>
5+
<GUIDir>..\..\x64\Release\bin</GUIDir>
66
<PluginDir>$(GUIDir)\plugins</PluginDir>
77
</PropertyGroup>
88
<PropertyGroup>

‎Builds/VisualStudio2013/open-ephys.sln‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
1-
Microsoft Visual Studio Solution File, Format Version 11.00
1+
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
Project("{5A05F353-1D63-394C-DFB0-981BB2309002}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
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}"
46
EndProject
57
Global
68
GlobalSection(SolutionConfigurationPlatforms) = preSolution
79
Debug|Win32 = Debug|Win32
10+
Debug|x64 = Debug|x64
811
Release|Win32 = Release|Win32
9-
Debug64|x64 = Debug64|x64
10-
Release64|x64 = Release64|x64
12+
Release|x64 = Release|x64
1113
EndGlobalSection
1214
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1315
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.ActiveCfg = Debug|Win32
1416
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.Build.0 = Debug|Win32
17+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.ActiveCfg = Debug|x64
18+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.Build.0 = Debug|x64
1519
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
1620
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
17-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
18-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
19-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.ActiveCfg = Release64|x64
20-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.Build.0 = Release64|x64
21+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|x64.ActiveCfg = Release|x64
22+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|x64.Build.0 = Release|x64
2123
EndGlobalSection
2224
GlobalSection(SolutionProperties) = preSolution
2325
HideSolutionNode = FALSE
2426
EndGlobalSection
27+
GlobalSection(Performance) = preSolution
28+
HasPerformanceSessions = true
29+
EndGlobalSection
2530
EndGlobal

‎Builds/VisualStudio2013/open-ephys.vcxproj‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<Configuration>Release</Configuration>
1111
<Platform>Win32</Platform>
1212
</ProjectConfiguration>
13-
<ProjectConfiguration Include="Debug64|x64">
14-
<Configuration>Debug64</Configuration>
13+
<ProjectConfiguration Include="Debug|x64">
14+
<Configuration>Debug</Configuration>
1515
<Platform>x64</Platform>
1616
</ProjectConfiguration>
17-
<ProjectConfiguration Include="Release64|x64">
18-
<Configuration>Release64</Configuration>
17+
<ProjectConfiguration Include="Release|x64">
18+
<Configuration>Release</Configuration>
1919
<Platform>x64</Platform>
2020
</ProjectConfiguration>
2121
</ItemGroup>
@@ -35,13 +35,13 @@
3535
<WholeProgramOptimization>true</WholeProgramOptimization>
3636
<PlatformToolset>v120</PlatformToolset>
3737
</PropertyGroup>
38-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'" Label="Configuration">
38+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3939
<ConfigurationType>Application</ConfigurationType>
4040
<UseOfMfc>false</UseOfMfc>
4141
<PlatformToolset>v120</PlatformToolset>
4242
<PlatformToolset>v120</PlatformToolset>
4343
</PropertyGroup>
44-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'" Label="Configuration">
44+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4545
<ConfigurationType>Application</ConfigurationType>
4646
<UseOfMfc>false</UseOfMfc>
4747
<WholeProgramOptimization>true</WholeProgramOptimization>
@@ -65,12 +65,12 @@
6565
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\bin\</OutDir>
6666
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">open-ephys</TargetName>
6767
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
68-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">.\x64\Debug64\bin\</OutDir>
69-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">open-ephys</TargetName>
70-
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">true</GenerateManifest>
71-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">.\x64\Release64\bin\</OutDir>
72-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">open-ephys</TargetName>
73-
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">true</GenerateManifest>
68+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\Debug\bin\</OutDir>
69+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">open-ephys</TargetName>
70+
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
71+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\Release\bin\</OutDir>
72+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">open-ephys</TargetName>
73+
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
7474
<PlatformToolset>v120</PlatformToolset>
7575
</PropertyGroup>
7676
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -117,7 +117,8 @@
117117
<OutputFile>$(IntDir)\open-ephys.bsc</OutputFile>
118118
</Bscmake>
119119
<PostBuildEvent>
120-
<Command>copy /Y &quot;..\..\Resources\DLLs\VS2013\*.dll&quot; &quot;$(OutDir)&quot;</Command>
120+
<Command>if not exist &quot;$(OutDir)\shared&quot; mkdir &quot;$(OutDir)\shared&quot;
121+
copy /Y &quot;..\..\Resources\DLLs\VS2013\*.dll&quot; &quot;$(OutDir)\shared&quot;</Command>
121122
</PostBuildEvent>
122123
</ItemDefinitionGroup>
123124
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -164,10 +165,11 @@
164165
<OutputFile>$(IntDir)\open-ephys.bsc</OutputFile>
165166
</Bscmake>
166167
<PostBuildEvent>
167-
<Command>copy /Y &quot;..\..\Resources\DLLs\VS2013\*.dll&quot; &quot;$(OutDir)&quot;</Command>
168+
<Command>if not exist &quot;$(OutDir)\shared&quot; mkdir &quot;$(OutDir)\shared&quot;
169+
copy /Y &quot;..\..\Resources\DLLs\VS2013\*.dll&quot; &quot;$(OutDir)\shared&quot;</Command>
168170
</PostBuildEvent>
169171
</ItemDefinitionGroup>
170-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug64|x64'">
172+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
171173
<Midl>
172174
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
173175
<MkTypLibCompatible>true</MkTypLibCompatible>
@@ -209,10 +211,11 @@
209211
<OutputFile>$(IntDir)\open-ephys.bsc</OutputFile>
210212
</Bscmake>
211213
<PostBuildEvent>
212-
<Command>copy /Y &quot;..\..\Resources\DLLs\VS2013-x64\*.dll&quot; &quot;$(OutDir)&quot;</Command>
214+
<Command>if not exist &quot;$(OutDir)\shared&quot; mkdir &quot;$(OutDir)\shared&quot;
215+
copy /Y &quot;..\..\Resources\DLLs\VS2013-x64\*.dll&quot; &quot;$(OutDir)\shared&quot;</Command>
213216
</PostBuildEvent>
214217
</ItemDefinitionGroup>
215-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release64|x64'">
218+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
216219
<Midl>
217220
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
218221
<MkTypLibCompatible>true</MkTypLibCompatible>
@@ -255,7 +258,8 @@
255258
<OutputFile>$(IntDir)\open-ephys.bsc</OutputFile>
256259
</Bscmake>
257260
<PostBuildEvent>
258-
<Command>copy /Y &quot;..\..\Resources\DLLs\VS2013-x64\*.dll&quot; &quot;$(OutDir)&quot;</Command>
261+
<Command>if not exist &quot;$(OutDir)\shared&quot; mkdir &quot;$(OutDir)\shared&quot;
262+
copy /Y &quot;..\..\Resources\DLLs\VS2013-x64\*.dll&quot; &quot;$(OutDir)\shared&quot;</Command>
259263
</PostBuildEvent>
260264
</ItemDefinitionGroup>
261265
<ItemGroup>

‎Source/Processors/PluginManager/PluginManager.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ static void errorMsg(const char *file, int line, const char *msg) {
7272

7373
PluginManager::PluginManager()
7474
{
75+
#ifdef WIN32
76+
File sharedPath = File::getSpecialLocation(File::currentApplicationFile).getParentDirectory().getChildFile("shared");
77+
SetDllDirectory(sharedPath.getFullPathName().toUTF8());
78+
#endif
7579
}
7680

7781
PluginManager::~PluginManager()

0 commit comments

Comments
 (0)