Commit adbdc1b6 authored by Jonathan Wilkes's avatar Jonathan Wilkes

Merge branch 'aggraef/purr-data-release_2.16.0'

parents d275d005 4a8c78af
Pipeline #3486 failed with stage
in 0 seconds
......@@ -59,7 +59,7 @@ AC_DEFUN([AC_CHECK_FRAMEWORK],
temp_check_ldflags_org="${LDFLAGS}"
LDFLAGS="-framework [$1] ${LDFLAGS}"
AC_LINK_IFELSE(AC_LANG_PROGRAM(,), [temp_check_ldflags_success="yes"],[temp_check_ldflags_success="no"])
AC_LINK_IFELSE([AC_LANG_PROGRAM(,)], [temp_check_ldflags_success="yes"],[temp_check_ldflags_success="no"])
if test "x$temp_check_ldflags_success" = "xyes"; then
AC_MSG_RESULT([yes])
......@@ -81,7 +81,7 @@ AC_DEFUN([AC_CHECK_LDFLAGS],
temp_check_ldflags_org="${LDFLAGS}"
LDFLAGS="$1 ${LDFLAGS}"
AC_LINK_IFELSE(AC_LANG_PROGRAM(,), [temp_check_ldflags_success="yes"],[temp_check_ldflags_success="no"])
AC_LINK_IFELSE([AC_LANG_PROGRAM(,)], [temp_check_ldflags_success="yes"],[temp_check_ldflags_success="no"])
if test "x$temp_check_ldflags_success" = "xyes"; then
AC_MSG_RESULT([yes])
......
This diff is collapsed.
This diff is collapsed.
......@@ -115,7 +115,7 @@ ifneq ($(LIGHT),yes)
install -p $(bin_src)/libreadline8.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libtermcap-0.dll $(DESTDIR)$(bindir)/
# For other external libs
install -p $(bin_src)/lua53.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/lua*.dll $(DESTDIR)$(bindir)/
#install -p $(bin_src)/pthreadGC2.dll $(DESTDIR)$(bindir)/
#install -p $(bin_src)/libdl.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libportaudio-2.dll $(DESTDIR)$(bindir)/
......
......@@ -115,9 +115,9 @@ ifneq ($(LIGHT),yes)
install -p $(bin_src)/libreadline8.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libtermcap-0.dll $(DESTDIR)$(bindir)/
# For other external libs
install -p $(bin_src)/lua53.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/lua*.dll $(DESTDIR)$(bindir)/
#install -p $(bin_src)/pthreadGC2.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libdl.dll $(DESTDIR)$(bindir)/
#install -p $(bin_src)/libdl.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libportaudio-2.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libFLAC-8.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libspeex-1.dll $(DESTDIR)$(bindir)/
......
......@@ -14,7 +14,7 @@ extern "C" {
#define PD_MINOR_VERSION 48
#define PD_BUGFIX_VERSION 0
#define PD_TEST_VERSION ""
#define PD_L2ORK_VERSION "2.15.2"
#define PD_L2ORK_VERSION "2.16.0"
#define PDL2ORK
extern int pd_compatibilitylevel; /* e.g., 43 for pd 0.43 compatibility */
......
......@@ -1574,7 +1574,7 @@ int sys_startgui(const char *guidir)
portbuf,
"localhost",
(sys_k12_mode ? "pd-l2ork-k12" : "pd-l2ork"),
scriptbuf, pd_this_string, 0);
scriptbuf, pd_this_string, NULL);
if (spawnret < 0)
{
perror("spawnl");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment