|
 |
9c92b99 |
From 7f7af82d3331d8fafd68d30e4224a9ca16ff0be6 Mon Sep 17 00:00:00 2001
|
|
|
9c92b99 |
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
|
|
|
9c92b99 |
Date: Sat, 18 Sep 2021 17:35:08 +0100
|
|
|
9c92b99 |
Subject: [PATCH 1/3] Build projectM_qt shared lib instead static lib
|
|
|
9c92b99 |
|
|
|
9c92b99 |
i.e. build libprojectM_qt.la instead libprojectM_qt.a
|
|
|
9c92b99 |
---
|
|
|
9c92b99 |
src/projectM-jack/Makefile.am | 2 +-
|
|
|
9c92b99 |
src/projectM-pulseaudio/Makefile.am | 2 +-
|
|
|
9c92b99 |
src/projectM-qt/Makefile.am | 12 ++++++++----
|
|
|
9c92b99 |
3 files changed, 10 insertions(+), 6 deletions(-)
|
|
|
9c92b99 |
|
|
|
9c92b99 |
diff --git a/src/projectM-jack/Makefile.am b/src/projectM-jack/Makefile.am
|
|
|
9c92b99 |
index bceef621..9fa35f8c 100644
|
|
|
9c92b99 |
--- a/src/projectM-jack/Makefile.am
|
|
|
9c92b99 |
+++ b/src/projectM-jack/Makefile.am
|
|
|
9c92b99 |
@@ -25,7 +25,7 @@ ${QT_CXXFLAGS} \
|
|
|
9c92b99 |
bin_PROGRAMS = projectM-jack
|
|
|
9c92b99 |
projectM_jack_SOURCES = qprojectM-jack.cpp ConfigFile.cpp ${EXTRA_SRCS}
|
|
|
9c92b99 |
projectM_jack_LDADD = \
|
|
|
9c92b99 |
- ../projectM-qt/libprojectM_qt.a \
|
|
|
9c92b99 |
+ ../projectM-qt/libprojectM_qt.la \
|
|
|
9c92b99 |
${jack_LIBS} \
|
|
|
9c92b99 |
${QT_LIBS} \
|
|
|
9c92b99 |
../libprojectM/libprojectM.la
|
|
|
9c92b99 |
diff --git a/src/projectM-pulseaudio/Makefile.am b/src/projectM-pulseaudio/Makefile.am
|
|
|
9c92b99 |
index abddad8e..bb6b9493 100644
|
|
|
9c92b99 |
--- a/src/projectM-pulseaudio/Makefile.am
|
|
|
9c92b99 |
+++ b/src/projectM-pulseaudio/Makefile.am
|
|
|
9c92b99 |
@@ -48,7 +48,7 @@ nodist_projectM_pulseaudio_SOURCES = \
|
|
|
9c92b99 |
|
|
|
9c92b99 |
projectM_pulseaudio_LDADD = \
|
|
|
9c92b99 |
${libpulse_LIBS} \
|
|
|
9c92b99 |
- ../projectM-qt/libprojectM_qt.a \
|
|
|
9c92b99 |
+ ../projectM-qt/libprojectM_qt.la \
|
|
|
9c92b99 |
../libprojectM/libprojectM.la \
|
|
|
9c92b99 |
${QT_LIBS}
|
|
|
9c92b99 |
|
|
|
9c92b99 |
diff --git a/src/projectM-qt/Makefile.am b/src/projectM-qt/Makefile.am
|
|
|
9c92b99 |
index 757ebde5..3ae83258 100644
|
|
|
9c92b99 |
--- a/src/projectM-qt/Makefile.am
|
|
|
9c92b99 |
+++ b/src/projectM-qt/Makefile.am
|
|
|
9c92b99 |
@@ -41,9 +41,7 @@ BUILT_SOURCES = \
|
|
|
9c92b99 |
ui_qpreseteditordialog.h \
|
|
|
9c92b99 |
ui_qprojectmconfigdialog.h
|
|
|
9c92b99 |
|
|
|
9c92b99 |
-noinst_LIBRARIES = libprojectM_qt.a
|
|
|
9c92b99 |
-
|
|
|
9c92b99 |
-libprojectM_qt_a_SOURCES = \
|
|
|
9c92b99 |
+libprojectM_qt_la_SOURCES = \
|
|
|
9c92b99 |
qprojectm_mainwindow.cpp \
|
|
|
9c92b99 |
configfile.hpp configfile.cpp \
|
|
|
9c92b99 |
qplaylistfiledialog.cpp \
|
|
|
9c92b99 |
@@ -60,7 +60,7 @@ libprojectM_qt_a_SOURCES = \
|
|
|
9c92b99 |
application.qrc \
|
|
|
9c92b99 |
images/*
|
|
|
9c92b99 |
|
|
|
9c92b99 |
-nodist_libprojectM_qt_a_SOURCES = \
|
|
|
9c92b99 |
+nodist_libprojectM_qt_la_SOURCES = \
|
|
|
9c92b99 |
application_qrc.cpp \
|
|
|
9c92b99 |
$(nodist_projectM_qt_moc_sources)
|
|
|
9c92b99 |
|
|
|
9c92b99 |
@@ -77,6 +75,12 @@ AM_CFLAGS = ${my_CFLAGS} \
|
|
|
9c92b99 |
-ffunction-sections \
|
|
|
9c92b99 |
-fdata-sections
|
|
|
9c92b99 |
|
|
|
9c92b99 |
+lib_LTLIBRARIES = libprojectM_qt.la
|
|
|
9c92b99 |
+
|
|
|
9c92b99 |
+# link flags
|
|
|
9c92b99 |
+libprojectM_qt_la_LDFLAGS = $(CG_LDFLAGS) -no-undefined -version-info 4:1:1
|
|
|
9c92b99 |
+
|
|
|
9c92b99 |
+
|
|
|
9c92b99 |
CLEANFILES = \
|
|
|
9c92b99 |
application_qrc.cpp \
|
|
|
9c92b99 |
${BUILT_SOURCES} \
|
|
|
9c92b99 |
--
|
|
|
9c92b99 |
2.31.1
|
|
|
9c92b99 |
--- src/projectM-qt/Makefile.am.orig 2021-02-20 19:40:39.000000000 +0000
|
|
|
9c92b99 |
+++ src/projectM-qt/Makefile.am 2021-09-18 22:50:21.479573506 +0100
|