sfos/eql5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'master'

Browse source 
Fix compile errors due to conflicting libraries

See merge request eql/EQL5!6
This commit is contained in:
P. Ruetz 2021-03-29 08:53:09 +00:00
commit ecbef474db
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/eql_lib.pro
View file

@ -57,15 +57,14 @@ static {
CONFIG += create_prl CONFIG += create_prl
DEFINES += STATIC_MODULES DEFINES += STATIC_MODULES
QT += qml multimedia network quick sql QT += qml multimedia network quick sql
DESTDIR = ./ LIBS -= -lecl -L. -lini_eql5 -L/usr/local/lib
OBJECTS_DIR = ./tmp/static/ OBJECTS_DIR = ./tmp/static/
MOC_DIR = ./tmp/static/ MOC_DIR = ./tmp/static/
combinedlib.files = libeql5.a libeql5.prl
combinedlib.extra = ecl -shell make-static.lisp combinedlib.extra = ecl -shell make-static.lisp
combinedlib.path = $$[QT_INSTALL_LIBS] combinedlib.path = $$[QT_INSTALL_LIBS]
INSTALLS = combinedlib INSTALLS = combinedlib target
} }
HEADERS += gen/_lobjects.h \ HEADERS += gen/_lobjects.h \

4
src/make-static.lisp
View file

@ -1,3 +1,3 @@
(let* ((static-libs (mapcar #'file-namestring (directory "libeql5_*.a"))) (let* ((static-libs (mapcar #'file-namestring (directory "libeql5_*.a")))
(mri (format nil "create libeql5static.a~%addlib libini_eql5.a~%addlib libeql5.a~%~{addlib ~a~%~}save~%end~%" static-libs))) (mri (format nil "create libeql5static.a~%addlib libini_eql5.a~%addlib ../libeql5.a~%~{addlib ~a~%~}save~%end~%" static-libs)))
(ext:system (format nil "sh -c 'echo ~s | ar -M && mv libeql5static.a libeql5.a'" mri))) (ext:system (format nil "sh -c 'echo ~s | ar -M && mv libeql5static.a ../libeql5.a'" mri)))