aboutsummaryrefslogtreecommitdiffstats
path: root/Lua
diff options
context:
space:
mode:
Diffstat (limited to 'Lua')
-rwxr-xr-xLua/configure4
-rw-r--r--Lua/configure.ac4
-rw-r--r--Lua/src/Makefile.in2
-rw-r--r--Lua/src/screens/UScreenSong.pas4
4 files changed, 11 insertions, 3 deletions
diff --git a/Lua/configure b/Lua/configure
index a3dc7cac..e7a36683 100755
--- a/Lua/configure
+++ b/Lua/configure
@@ -6250,7 +6250,9 @@ See the pkg-config man page for more details.
# determine linker-flags
-LDFLAGS="-undefined dynamic_lookup"
+if test x$FPC_PLATFORM = xdarwin; then
+ LDFLAGS="-macosx_version_min 10.4 -undefined dynamic_lookup"
+fi
#LIBS=
diff --git a/Lua/configure.ac b/Lua/configure.ac
index 69e358fc..b7055ae6 100644
--- a/Lua/configure.ac
+++ b/Lua/configure.ac
@@ -224,7 +224,9 @@ PKG_HAVE([portmixer], [portmixer], no)
AC_SUBST_DEFINE(HAVE_PORTMIXER, $portmixer_HAVE)
# determine linker-flags
-LDFLAGS="-undefined dynamic_lookup"
+if test x$FPC_PLATFORM = xdarwin; then
+ LDFLAGS="-macosx_version_min 10.4 -undefined dynamic_lookup"
+fi
#LIBS=
AC_SUBST(LDFLAGS)
AC_SUBST(LIBS)
diff --git a/Lua/src/Makefile.in b/Lua/src/Makefile.in
index 06e62c43..6e221af9 100644
--- a/Lua/src/Makefile.in
+++ b/Lua/src/Makefile.in
@@ -122,7 +122,7 @@ endif
LIBS ?= @LIBS@
LDFLAGS ?= @LDFLAGS@
-linkflags := -L/usr/lib $(sort $(LDFLAGS) $(LIBS))
+linkflags := -L/usr/lib $(LDFLAGS) $(sort $(LIBS))
ifneq ($(linkflags),)
PLINKFLAGS := -k"$(linkflags)"
endif
diff --git a/Lua/src/screens/UScreenSong.pas b/Lua/src/screens/UScreenSong.pas
index 3f94b6a4..716f4053 100644
--- a/Lua/src/screens/UScreenSong.pas
+++ b/Lua/src/screens/UScreenSong.pas
@@ -1715,6 +1715,10 @@ begin
if not assigned(Song) then
Exit;
+ //fix: if main cat than there is nothing to play
+ if Song.main then
+ Exit;
+
if AudioPlayback.Open(Song.Path.Append(Song.Mp3)) then
begin
PreviewOpened := Interaction;