Skip to content

build system: allow paths with spaces #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgeier merged 3 commits into from
Oct 29, 2022
Merged

build system: allow paths with spaces #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08ba023
Use Automake to specify submodule include paths
mgeier Sep 22, 2022
c0c9f47
Yarn: escape paths
mgeier Sep 22, 2022
e5e0b37
Escape SSR_DATA_DIR
mgeier Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions browser-gui/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ export PATH := $(PATH):$(abs_builddir)/node_modules/.bin
export NODE_PATH := $(abs_builddir)/node_modules

YARN_OPTIONS = --no-progress --non-interactive \
--cwd $(abs_srcdir) \
--modules-folder $(NODE_PATH)
--cwd "$(abs_srcdir)" \
--modules-folder "$(NODE_PATH)"

WEBPACK_PATH = $(abs_builddir)/../data/websocket_resources
INSTALL_PATH = $(DESTDIR)$(pkgdatadir)/websocket_resources
WEBPACK_PATH = "$(abs_builddir)/../data/websocket_resources"
INSTALL_PATH = "$(DESTDIR)$(pkgdatadir)/websocket_resources"

all-local: $(WEBPACK_PATH)/index.html

Expand Down
10 changes: 6 additions & 4 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,14 +261,14 @@ dnl NOTE: -pthread works on GCC, other compilers may need differnt flags!
AS_IF([test x$GCC = xyes],
[CXXFLAGS="$CXXFLAGS -pthread"])

abs_srcdir=`(cd $srcdir && pwd)`

dnl https://github.com/ilmola/gml
CPPFLAGS="$CPPFLAGS -I$abs_srcdir/gml/include"
CPPFLAGS_backup="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$srcdir/gml/include"
AC_CHECK_HEADER([gml/vec.hpp], , [AC_MSG_ERROR([GML library cannot be found. Update your Git submodules with:

git submodule update --init
])])
CPPFLAGS="$CPPFLAGS_backup"

ENABLE_AUTO([optimization], [code optimization],
[
Expand Down Expand Up @@ -543,8 +543,10 @@ ENABLE_FORCED([websocket-interface], [WebSocket interface (needs WebSocket++ and
CPPFLAGS="$CPPFLAGS -DASIO_STANDALONE"
AC_CHECK_HEADER([asio.hpp], , [have_websocket_interface=no])
AC_CHECK_HEADER([websocketpp/server.hpp], , [have_websocket_interface=no])
CPPFLAGS="$CPPFLAGS -I$abs_srcdir/rapidjson/include"
CPPFLAGS_backup="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$srcdir/rapidjson/include"
AC_CHECK_HEADER([rapidjson/document.h], , [have_websocket_interface=no])
CPPFLAGS="$CPPFLAGS_backup"
])

ENABLE_AUTO([fudi-interface], [FUDI interface (needs Asio and {fmt})],
Expand Down
6 changes: 4 additions & 2 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ EXTRA_PROGRAMS = ssr-binaural ssr-wfs ssr-generic ssr-brs ssr-dca ssr-vbap ssr-a

AM_CPPFLAGS =

## Add Audio Processing Framework (APF) path
## Add include paths for Git submodules
AM_CPPFLAGS += -I$(srcdir)/../apf
AM_CPPFLAGS += -I$(srcdir)/../gml/include
AM_CPPFLAGS += -I$(srcdir)/../rapidjson/include

if ENABLE_APP_BUNDLE
AM_CPPFLAGS += -DSSR_DATA_DIR=\"SoundScapeRenderer.app/Contents/Resources\"
else
AM_CPPFLAGS += -DSSR_DATA_DIR=\"$(pkgdatadir)\"
AM_CPPFLAGS += -DSSR_DATA_DIR="\"$(pkgdatadir)\""
endif

## this is somehow needed for Solaris (or not?)
Expand Down