Skip to content

Commit 09d8161

Browse files
aacuevasaacuevas
committed
Build files cleanup
1 parent aafa0ba commit 09d8161

3 files changed

Lines changed: 11 additions & 16 deletions

File tree

‎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.so
26+
TARGET := open-ephys
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.so
46+
TARGET := open-ephys-release
4747
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
4848
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
4949
endif

‎Builds/VisualStudio2013/open-ephys.sln‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
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
118
Release|Win32 = Release|Win32
9+
Debug|x64 = Debug|x64
1210
Release|x64 = Release|x64
1311
EndGlobalSection
1412
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1513
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.ActiveCfg = Debug|Win32
1614
{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
1915
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
2016
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
17+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.ActiveCfg = Debug|x64
18+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.Build.0 = Debug|x64
2119
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|x64.ActiveCfg = Release|x64
2220
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|x64.Build.0 = Release|x64
2321
EndGlobalSection
2422
GlobalSection(SolutionProperties) = preSolution
2523
HideSolutionNode = FALSE
2624
EndGlobalSection
27-
GlobalSection(Performance) = preSolution
28-
HasPerformanceSessions = true
29-
EndGlobalSection
3025
EndGlobal

‎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>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87+
<AdditionalIncludeDirectories>~\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>
@@ -131,7 +131,7 @@ copy /Y &quot;..\..\Resources\DLLs\VS2013\*.dll&quot; &quot;$(OutDir)\shared&quo
131131
</Midl>
132132
<ClCompile>
133133
<Optimization>Full</Optimization>
134-
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
134+
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
135135
<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>
136136
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
137137
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -180,7 +180,7 @@ copy /Y &quot;..\..\Resources\DLLs\VS2013\*.dll&quot; &quot;$(OutDir)\shared&quo
180180
<ClCompile>
181181
<Optimization>Disabled</Optimization>
182182
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
183-
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
183+
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
184184
<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>
185185
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
186186
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -225,7 +225,7 @@ copy /Y &quot;..\..\Resources\DLLs\VS2013-x64\*.dll&quot; &quot;$(OutDir)\shared
225225
</Midl>
226226
<ClCompile>
227227
<Optimization>Full</Optimization>
228-
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
228+
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
229229
<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>
230230
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
231231
<RuntimeTypeInfo>true</RuntimeTypeInfo>

0 commit comments

Comments
 (0)