From dacd05957d686e84c1dbdb23a5065109a17966ee Mon Sep 17 00:00:00 2001 From: polos Date: Wed, 26 Apr 2017 11:19:00 +0200 Subject: [PATCH] some modifications to easier build on OSX --- src/eql.cpp | 2 +- src/eql_exe.pro | 4 ++-- src/eql_lib.pro | 5 +++-- src/link-wrappers.lisp | 3 +++ src/link.lisp | 3 +++ src/make-eql-lib-wrappers.lisp | 3 +++ src/make-eql-lib.lisp | 3 +++ src/module_help.pro | 17 +++++++++-------- src/module_multimedia.pro | 17 +++++++++-------- src/module_network.pro | 17 +++++++++-------- src/module_quick.pro | 17 +++++++++-------- src/module_sql.pro | 17 +++++++++-------- src/module_svg.pro | 17 +++++++++-------- src/module_webengine.pro | 17 +++++++++-------- src/module_webkit.pro | 17 +++++++++-------- 15 files changed, 90 insertions(+), 69 deletions(-) diff --git a/src/eql.cpp b/src/eql.cpp index 716e195..da5bcf7 100644 --- a/src/eql.cpp +++ b/src/eql.cpp @@ -7,7 +7,7 @@ #include #include -const char EQL::version[] = "17.4.1"; // Apr 2017 +const char EQL::version[] = "17.4.2"; // Apr 2017 extern "C" void ini_EQL(cl_object); diff --git a/src/eql_exe.pro b/src/eql_exe.pro index 8f41768..5182534 100644 --- a/src/eql_exe.pro +++ b/src/eql_exe.pro @@ -1,8 +1,8 @@ QT += widgets printsupport uitools TEMPLATE = app CONFIG += no_keywords release -INCLUDEPATH += ../src -LIBS = -lecl -L.. -leql5 +INCLUDEPATH += ../src /usr/local/include +LIBS += -lecl -leql5 -L.. -L/usr/local/lib TARGET = eql5 DESTDIR = ../ OBJECTS_DIR = ./tmp/ diff --git a/src/eql_lib.pro b/src/eql_lib.pro index 0500ae5..861ff1e 100644 --- a/src/eql_lib.pro +++ b/src/eql_lib.pro @@ -2,7 +2,8 @@ QT += widgets printsupport uitools TEMPLATE = lib CONFIG += dll no_keywords release DEFINES += EQL_LIBRARY -LIBS += -lecl -L. -lini +INCLUDEPATH += /usr/local/include +LIBS += -lecl -lini -L. -L/usr/local/lib TARGET = eql5 DESTDIR = ../ OBJECTS_DIR = ./tmp/ @@ -35,7 +36,7 @@ SOURCES += gen/_lobjects.cpp \ eql.cpp gcc { - QMAKE_CXXFLAGS_WARN_ON += -Wno-clobbered + QMAKE_CXXFLAGS_WARN_ON += -Wno-clobbered -Wno-unknown-warning-option } clang { diff --git a/src/link-wrappers.lisp b/src/link-wrappers.lisp index 3ccd37a..fa0084b 100644 --- a/src/link-wrappers.lisp +++ b/src/link-wrappers.lisp @@ -18,3 +18,6 @@ (format nil "lisp/~A.~A" file #+msvc "obj" #-msvc "o")) *lisp-files*) :init-name "ini_EQL") + +#+darwin +(rename-file "libini.a" "libini.dylib") diff --git a/src/link.lisp b/src/link.lisp index d7beca5..17b05b8 100644 --- a/src/link.lisp +++ b/src/link.lisp @@ -14,3 +14,6 @@ (format nil "lisp/~A.~A" file #+msvc "obj" #-msvc "o")) *lisp-files*) :init-name "ini_EQL") + +#+darwin +(rename-file "libini.a" "libini.dylib") diff --git a/src/make-eql-lib-wrappers.lisp b/src/make-eql-lib-wrappers.lisp index 5f8c892..6d64c32 100644 --- a/src/make-eql-lib-wrappers.lisp +++ b/src/make-eql-lib-wrappers.lisp @@ -25,5 +25,8 @@ *lisp-files*) :init-name "ini_EQL") +#+darwin +(rename-file "libini.a" "libini.dylib") + (eql:qq) diff --git a/src/make-eql-lib.lisp b/src/make-eql-lib.lisp index 440720d..9bf2b99 100644 --- a/src/make-eql-lib.lisp +++ b/src/make-eql-lib.lisp @@ -23,3 +23,6 @@ (format nil "lisp/~A.~A" file #+msvc "obj" #-msvc "o")) *lisp-files*) :init-name "ini_EQL") + +#+darwin +(rename-file "libini.a" "libini.dylib") diff --git a/src/module_help.pro b/src/module_help.pro index f75b2fc..2b8aa22 100644 --- a/src/module_help.pro +++ b/src/module_help.pro @@ -1,11 +1,12 @@ -QT += help printsupport uitools -TEMPLATE = lib -CONFIG += dll no_keywords release -LIBS += -L.. -lecl -leql5 -TARGET = eql5_help -DESTDIR = ../ -OBJECTS_DIR = ./tmp/help/ -MOC_DIR = ./tmp/help/ +QT += help printsupport uitools +TEMPLATE = lib +CONFIG += dll no_keywords release +INCLUDEPATH += ../src /usr/local/include +LIBS += -lecl -leql5 -L.. -L/usr/local/lib +TARGET = eql5_help +DESTDIR = ../ +OBJECTS_DIR = ./tmp/help/ +MOC_DIR = ./tmp/help/ win32 { include(windows.pri) diff --git a/src/module_multimedia.pro b/src/module_multimedia.pro index bf65ac8..f4d10ee 100644 --- a/src/module_multimedia.pro +++ b/src/module_multimedia.pro @@ -1,11 +1,12 @@ -QT += multimedia multimediawidgets printsupport uitools -TEMPLATE = lib -CONFIG += dll no_keywords release -LIBS += -L.. -lecl -leql5 -TARGET = eql5_multimedia -DESTDIR = ../ -OBJECTS_DIR = ./tmp/multimedia/ -MOC_DIR = ./tmp/multimedia/ +QT += multimedia multimediawidgets printsupport uitools +TEMPLATE = lib +CONFIG += dll no_keywords release +INCLUDEPATH += ../src /usr/local/include +LIBS += -lecl -leql5 -L.. -L/usr/local/lib +TARGET = eql5_multimedia +DESTDIR = ../ +OBJECTS_DIR = ./tmp/multimedia/ +MOC_DIR = ./tmp/multimedia/ win32 { include(windows.pri) diff --git a/src/module_network.pro b/src/module_network.pro index 64a836a..038bf90 100644 --- a/src/module_network.pro +++ b/src/module_network.pro @@ -1,11 +1,12 @@ -QT += network printsupport uitools -TEMPLATE = lib -CONFIG += dll no_keywords release -LIBS += -L.. -lecl -leql5 -TARGET = eql5_network -DESTDIR = ../ -OBJECTS_DIR = ./tmp/network/ -MOC_DIR = ./tmp/network/ +QT += network printsupport uitools +TEMPLATE = lib +CONFIG += dll no_keywords release +INCLUDEPATH += ../src /usr/local/include +LIBS += -lecl -leql5 -L.. -L/usr/local/lib +TARGET = eql5_network +DESTDIR = ../ +OBJECTS_DIR = ./tmp/network/ +MOC_DIR = ./tmp/network/ win32 { include(windows.pri) diff --git a/src/module_quick.pro b/src/module_quick.pro index c6cc249..195a143 100644 --- a/src/module_quick.pro +++ b/src/module_quick.pro @@ -1,11 +1,12 @@ -QT += quick quickwidgets qml printsupport uitools -TEMPLATE = lib -CONFIG += dll no_keywords release -LIBS += -L.. -lecl -leql5 -TARGET = eql5_quick -DESTDIR = ../ -OBJECTS_DIR = ./tmp/quick/ -MOC_DIR = ./tmp/quick/ +QT += quick quickwidgets qml printsupport uitools +TEMPLATE = lib +CONFIG += dll no_keywords release +INCLUDEPATH += ../src /usr/local/include +LIBS += -lecl -leql5 -L.. -L/usr/local/lib +TARGET = eql5_quick +DESTDIR = ../ +OBJECTS_DIR = ./tmp/quick/ +MOC_DIR = ./tmp/quick/ win32 { include(windows.pri) diff --git a/src/module_sql.pro b/src/module_sql.pro index 1524771..11e449e 100644 --- a/src/module_sql.pro +++ b/src/module_sql.pro @@ -1,11 +1,12 @@ -QT += sql printsupport uitools -TEMPLATE = lib -CONFIG += dll no_keywords release -LIBS += -L.. -lecl -leql5 -TARGET = eql5_sql -DESTDIR = ../ -OBJECTS_DIR = ./tmp/sql/ -MOC_DIR = ./tmp/sql/ +QT += sql printsupport uitools +TEMPLATE = lib +CONFIG += dll no_keywords release +INCLUDEPATH += ../src /usr/local/include +LIBS += -lecl -leql5 -L.. -L/usr/local/lib +TARGET = eql5_sql +DESTDIR = ../ +OBJECTS_DIR = ./tmp/sql/ +MOC_DIR = ./tmp/sql/ win32 { include(windows.pri) diff --git a/src/module_svg.pro b/src/module_svg.pro index 1730a96..cbbab5f 100644 --- a/src/module_svg.pro +++ b/src/module_svg.pro @@ -1,11 +1,12 @@ -QT += svg printsupport uitools -TEMPLATE = lib -CONFIG += dll no_keywords release -LIBS += -L.. -lecl -leql5 -TARGET = eql5_svg -DESTDIR = ../ -OBJECTS_DIR = ./tmp/svg/ -MOC_DIR = ./tmp/svg/ +QT += svg printsupport uitools +TEMPLATE = lib +CONFIG += dll no_keywords release +INCLUDEPATH += ../src /usr/local/include +LIBS += -lecl -leql5 -L.. -L/usr/local/lib +TARGET = eql5_svg +DESTDIR = ../ +OBJECTS_DIR = ./tmp/svg/ +MOC_DIR = ./tmp/svg/ win32 { include(windows.pri) diff --git a/src/module_webengine.pro b/src/module_webengine.pro index 33c880d..073398c 100644 --- a/src/module_webengine.pro +++ b/src/module_webengine.pro @@ -1,11 +1,12 @@ -QT += webenginewidgets printsupport uitools -TEMPLATE = lib -CONFIG += dll no_keywords release -LIBS += -L.. -lecl -leql5 -TARGET = eql5_webengine -DESTDIR = ../ -OBJECTS_DIR = ./tmp/webengine/ -MOC_DIR = ./tmp/webengine/ +QT += webenginewidgets printsupport uitools +TEMPLATE = lib +CONFIG += dll no_keywords release +INCLUDEPATH += ../src /usr/local/include +LIBS += -lecl -leql5 -L.. -L/usr/local/lib +TARGET = eql5_webengine +DESTDIR = ../ +OBJECTS_DIR = ./tmp/webengine/ +MOC_DIR = ./tmp/webengine/ macx:QT += network diff --git a/src/module_webkit.pro b/src/module_webkit.pro index 15f3ec9..b9fadf8 100644 --- a/src/module_webkit.pro +++ b/src/module_webkit.pro @@ -1,11 +1,12 @@ -QT += webkitwidgets printsupport uitools -TEMPLATE = lib -CONFIG += dll no_keywords release -LIBS += -L.. -lecl -leql5 -TARGET = eql5_webkit -DESTDIR = ../ -OBJECTS_DIR = ./tmp/webkit/ -MOC_DIR = ./tmp/webkit/ +QT += webkitwidgets printsupport uitools +TEMPLATE = lib +CONFIG += dll no_keywords release +INCLUDEPATH += ../src /usr/local/include +LIBS += -lecl -leql5 -L.. -L/usr/local/lib +TARGET = eql5_webkit +DESTDIR = ../ +OBJECTS_DIR = ./tmp/webkit/ +MOC_DIR = ./tmp/webkit/ macx:QT += network