From 5b4c5fed172ab113905300a95af95a29eeb3816a Mon Sep 17 00:00:00 2001
From: Josh Siegle <jsiegle@mit.edu>
Date: Tue, 19 Nov 2013 21:40:56 -0500
Subject: [PATCH] Add HDF5 linker to Linux build
---
Builds/Linux/Makefile | 4 ++--
Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj | 4 ----
open-ephys.jucer | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Builds/Linux/Makefile b/Builds/Linux/Makefile
index 664ae36a5..9d66cc48d 100644
--- a/Builds/Linux/Makefile
+++ b/Builds/Linux/Makefile
@@ -20,7 +20,7 @@ ifeq ($(CONFIG),Debug)
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3
CXXFLAGS += $(CFLAGS) -export-dynamic -g -pg
- LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext
+ LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lhdf5
LDDEPS :=
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode
TARGET := open-ephys
@@ -35,7 +35,7 @@ ifeq ($(CONFIG),Release)
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3
CXXFLAGS += $(CFLAGS) -export-dynamic -g -pg
- LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext
+ LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lhdf5
LDDEPS :=
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode
TARGET := open-ephys-release
diff --git a/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj b/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
index dc75cee34..cbb7d2b59 100644
--- a/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
+++ b/Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
@@ -3645,11 +3645,9 @@
HEADER_SEARCH_PATHS = (
../../JuceLibraryCode,
"$(inherited)",
- /opt/local/include,
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
- LIBRARY_SEARCH_PATHS = /opt/local/lib;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
OTHER_LDFLAGS = "-lhdf5";
SDKROOT_ppc = macosx10.5;
@@ -3676,11 +3674,9 @@
HEADER_SEARCH_PATHS = (
../../JuceLibraryCode,
"$(inherited)",
- /opt/local/include,
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
- LIBRARY_SEARCH_PATHS = /opt/local/lib;
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-lhdf5";
diff --git a/open-ephys.jucer b/open-ephys.jucer
index d6269aa87..2f5d42729 100644
--- a/open-ephys.jucer
+++ b/open-ephys.jucer
@@ -20,7 +20,7 @@
</CONFIGURATIONS>
</XCODE_MAC>
<LINUX_MAKE targetFolder="Builds/Linux" vstFolder="~/SDKs/vstsdk2.4" juceFolder="JuceLibraryCode"
- extraLinkerFlags="-pg -ldl -lXext" extraCompilerFlags="-export-dynamic -g -pg">
+ extraLinkerFlags="-pg -ldl -lXext -lhdf5" extraCompilerFlags="-export-dynamic -g -pg">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="3" targetName="open-ephys"
libraryPath="/usr/X11R6/lib/"/>
--
GitLab