diff --git a/Qt_EQL/cpp/eql_cpp.pro b/Qt_EQL/cpp/eql_cpp.pro index 172d93f..a9198bc 100644 --- a/Qt_EQL/cpp/eql_cpp.pro +++ b/Qt_EQL/cpp/eql_cpp.pro @@ -6,7 +6,9 @@ TARGET = eql_cpp OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../../src/windows.pri) +win32 { + include(../../src/windows.pri) +} HEADERS += lib.h SOURCES += lib.cpp diff --git a/Qt_EQL/cpp_calling_lisp/eql_cpp.pro b/Qt_EQL/cpp_calling_lisp/eql_cpp.pro index 9e1ff96..a450a99 100644 --- a/Qt_EQL/cpp_calling_lisp/eql_cpp.pro +++ b/Qt_EQL/cpp_calling_lisp/eql_cpp.pro @@ -7,7 +7,9 @@ TARGET = eql_fun_cpp OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../../src/windows.pri) +win32 { + include(../../src/windows.pri) +} HEADERS += lib.h SOURCES += lib.cpp diff --git a/Qt_EQL/trafficlight/trafficlight.pro b/Qt_EQL/trafficlight/trafficlight.pro index 2e18422..80a45ba 100644 --- a/Qt_EQL/trafficlight/trafficlight.pro +++ b/Qt_EQL/trafficlight/trafficlight.pro @@ -6,7 +6,9 @@ TARGET = trafficlight OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../../src/windows.pri) +win32 { + include(../../src/windows.pri) +} HEADERS += lib.h \ trafficlight.h diff --git a/Qt_EQL_plugin/qt_plugin.pro b/Qt_EQL_plugin/qt_plugin.pro index ec822c6..e397c6c 100644 --- a/Qt_EQL_plugin/qt_plugin.pro +++ b/Qt_EQL_plugin/qt_plugin.pro @@ -1,13 +1,15 @@ -TEMPLATE = lib -CONFIG += dll no_keywords release -INCLUDEPATH += ../src -LIBS += -L.. -leql5 -TARGET = qt_plugin -DESTDIR = ./ -OBJECTS_DIR = ./tmp/ -MOC_DIR = ./tmp/ - -include(../src/windows.pri) - -HEADERS = qt_plugin.h -SOURCES = qt_plugin.cpp +TEMPLATE = lib +CONFIG += dll no_keywords release +INCLUDEPATH += ../src +LIBS += -L.. -leql5 +TARGET = qt_plugin +DESTDIR = ./ +OBJECTS_DIR = ./tmp/ +MOC_DIR = ./tmp/ + +win32 { + include(../src/windows.pri) +} + +HEADERS = qt_plugin.h +SOURCES = qt_plugin.cpp diff --git a/examples/9-simple-lisp-editor/exe/local_server.pro b/examples/9-simple-lisp-editor/exe/local_server.pro index 42365c3..eae3739 100644 --- a/examples/9-simple-lisp-editor/exe/local_server.pro +++ b/examples/9-simple-lisp-editor/exe/local_server.pro @@ -1,14 +1,16 @@ -QT += widgets -TEMPLATE = app -CONFIG += no_keywords release -CONFIG += console -INCLUDEPATH += ../../../src -LIBS += -lecl -L. -leql-local-server -L../../.. -leql5 -TARGET = eql_local_server -DESTDIR = ./ -OBJECTS_DIR = ./tmp/ -MOC_DIR = ./tmp/ - -include(../../../src/windows.pri) - -SOURCES += main.cpp +QT += widgets +TEMPLATE = app +CONFIG += no_keywords release +CONFIG += console +INCLUDEPATH += ../../../src +LIBS += -lecl -L. -leql-local-server -L../../.. -leql5 +TARGET = eql_local_server +DESTDIR = ./ +OBJECTS_DIR = ./tmp/ +MOC_DIR = ./tmp/ + +win32 { + include(../../../src/windows.pri) +} + +SOURCES += main.cpp diff --git a/examples/9-simple-lisp-editor/exe/main.cpp b/examples/9-simple-lisp-editor/exe/main.cpp index 8320536..b15b104 100644 --- a/examples/9-simple-lisp-editor/exe/main.cpp +++ b/examples/9-simple-lisp-editor/exe/main.cpp @@ -1,29 +1,29 @@ -#undef SLOT - -#include -#include -#include -#include "eql.h" - -extern "C" void ini_app(cl_object); - -int catch_all_qexec() { - int ret = 0; - CL_CATCH_ALL_BEGIN(ecl_process_env()) { - ret = QCoreApplication::exec(); } - CL_CATCH_ALL_END; - return ret; } - -int main(int argc, char** argv) { - - EQL::ini(argv); - - QApplication qapp(argc, argv); - - QTextCodec* utf8 = QTextCodec::codecForName("UTF-8"); - QTextCodec::setCodecForLocale(utf8); - - EQL eql; - eql.exec(ini_app); - - return catch_all_qexec(); } +#undef SLOT + +#include +#include +#include +#include "eql.h" + +extern "C" void ini_app(cl_object); + +int catch_all_qexec() { + int ret = 0; + CL_CATCH_ALL_BEGIN(ecl_process_env()) { + ret = QCoreApplication::exec(); } + CL_CATCH_ALL_END; + return ret; } + +int main(int argc, char** argv) { + + EQL::ini(argv); + + QApplication qapp(argc, argv); + + QTextCodec* utf8 = QTextCodec::codecForName("UTF-8"); + QTextCodec::setCodecForLocale(utf8); + + EQL eql; + eql.exec(ini_app); + + return catch_all_qexec(); } diff --git a/examples/M-modules/quick/Tic-Tac-Toe/lib/qml_lisp.pro b/examples/M-modules/quick/Tic-Tac-Toe/lib/qml_lisp.pro index 76b0999..6e8dd06 100644 --- a/examples/M-modules/quick/Tic-Tac-Toe/lib/qml_lisp.pro +++ b/examples/M-modules/quick/Tic-Tac-Toe/lib/qml_lisp.pro @@ -8,7 +8,9 @@ TARGET = qml_lisp OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../../../../../src/windows.pri) +win32 { + include(../../../../../src/windows.pri) +} HEADERS += qml_lisp.h SOURCES += qml_lisp.cpp diff --git a/examples/M-modules/quick/item-model/lib/qml_lisp.pro b/examples/M-modules/quick/item-model/lib/qml_lisp.pro index 76b0999..6e8dd06 100644 --- a/examples/M-modules/quick/item-model/lib/qml_lisp.pro +++ b/examples/M-modules/quick/item-model/lib/qml_lisp.pro @@ -8,7 +8,9 @@ TARGET = qml_lisp OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../../../../../src/windows.pri) +win32 { + include(../../../../../src/windows.pri) +} HEADERS += qml_lisp.h SOURCES += qml_lisp.cpp diff --git a/examples/M-modules/quick/painted-item/lib/qml_lisp.pro b/examples/M-modules/quick/painted-item/lib/qml_lisp.pro index 76b0999..6e8dd06 100644 --- a/examples/M-modules/quick/painted-item/lib/qml_lisp.pro +++ b/examples/M-modules/quick/painted-item/lib/qml_lisp.pro @@ -8,7 +8,9 @@ TARGET = qml_lisp OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../../../../../src/windows.pri) +win32 { + include(../../../../../src/windows.pri) +} HEADERS += qml_lisp.h SOURCES += qml_lisp.cpp diff --git a/examples/M-modules/quick/palindrome-2/lib/qml_lisp.pro b/examples/M-modules/quick/palindrome-2/lib/qml_lisp.pro index 76b0999..6e8dd06 100644 --- a/examples/M-modules/quick/palindrome-2/lib/qml_lisp.pro +++ b/examples/M-modules/quick/palindrome-2/lib/qml_lisp.pro @@ -8,7 +8,9 @@ TARGET = qml_lisp OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../../../../../src/windows.pri) +win32 { + include(../../../../../src/windows.pri) +} HEADERS += qml_lisp.h SOURCES += qml_lisp.cpp diff --git a/examples/M-modules/quick/qml-lisp/lib/qml_lisp.pro b/examples/M-modules/quick/qml-lisp/lib/qml_lisp.pro index 76b0999..6e8dd06 100644 --- a/examples/M-modules/quick/qml-lisp/lib/qml_lisp.pro +++ b/examples/M-modules/quick/qml-lisp/lib/qml_lisp.pro @@ -8,7 +8,9 @@ TARGET = qml_lisp OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../../../../../src/windows.pri) +win32 { + include(../../../../../src/windows.pri) +} HEADERS += qml_lisp.h SOURCES += qml_lisp.cpp diff --git a/examples/M-modules/quick/sokoban/lib/qml_lisp.pro b/examples/M-modules/quick/sokoban/lib/qml_lisp.pro index 76b0999..6e8dd06 100644 --- a/examples/M-modules/quick/sokoban/lib/qml_lisp.pro +++ b/examples/M-modules/quick/sokoban/lib/qml_lisp.pro @@ -8,7 +8,9 @@ TARGET = qml_lisp OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../../../../../src/windows.pri) +win32 { + include(../../../../../src/windows.pri) +} HEADERS += qml_lisp.h SOURCES += qml_lisp.cpp diff --git a/examples/M-modules/webkit/Examples-Browser/lib/webkit_bridge.pro b/examples/M-modules/webkit/Examples-Browser/lib/webkit_bridge.pro index 4a32327..9159be8 100644 --- a/examples/M-modules/webkit/Examples-Browser/lib/webkit_bridge.pro +++ b/examples/M-modules/webkit/Examples-Browser/lib/webkit_bridge.pro @@ -10,7 +10,9 @@ MOC_DIR = ./tmp/ macx:QT += network -include(../../../../../src/windows.pri) +win32 { + include(../../../../../src/windows.pri) +} HEADERS += _invokables.h \ webkit_bridge.h diff --git a/examples/M-modules/webkit/Tic-Tac-Toe/lib/webkit_bridge.pro b/examples/M-modules/webkit/Tic-Tac-Toe/lib/webkit_bridge.pro index 4a32327..9159be8 100644 --- a/examples/M-modules/webkit/Tic-Tac-Toe/lib/webkit_bridge.pro +++ b/examples/M-modules/webkit/Tic-Tac-Toe/lib/webkit_bridge.pro @@ -10,7 +10,9 @@ MOC_DIR = ./tmp/ macx:QT += network -include(../../../../../src/windows.pri) +win32 { + include(../../../../../src/windows.pri) +} HEADERS += _invokables.h \ webkit_bridge.h diff --git a/examples/M-modules/webkit/lib/webkit_bridge.pro b/examples/M-modules/webkit/lib/webkit_bridge.pro index 629991f..bd4b574 100644 --- a/examples/M-modules/webkit/lib/webkit_bridge.pro +++ b/examples/M-modules/webkit/lib/webkit_bridge.pro @@ -10,7 +10,9 @@ MOC_DIR = ./tmp/ macx:QT += network -include(../../../../src/windows.pri) +win32 { + include(../../../../src/windows.pri) +} HEADERS += _invokables.h \ webkit_bridge.h diff --git a/examples/X-extras/move-blocks/cpp/lib.pro b/examples/X-extras/move-blocks/cpp/lib.pro index 8a1c958..4d75d85 100644 --- a/examples/X-extras/move-blocks/cpp/lib.pro +++ b/examples/X-extras/move-blocks/cpp/lib.pro @@ -7,7 +7,9 @@ TARGET = easing_curve OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../../../../src/windows.pri) +win32 { + include(../../../../src/windows.pri) +} HEADERS += lib.h SOURCES += lib.cpp diff --git a/examples/X-extras/palindrome/exe/main.pro b/examples/X-extras/palindrome/exe/main.pro index 82ff705..90b4cd7 100644 --- a/examples/X-extras/palindrome/exe/main.pro +++ b/examples/X-extras/palindrome/exe/main.pro @@ -8,7 +8,9 @@ DESTDIR = ./ OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../../../../src/windows.pri) +win32 { + include(../../../../src/windows.pri) +} HEADERS += main.h SOURCES += main.cpp diff --git a/examples/X-extras/qimage/cpp/lib.pro b/examples/X-extras/qimage/cpp/lib.pro index 6a97ff5..27abbfe 100644 --- a/examples/X-extras/qimage/cpp/lib.pro +++ b/examples/X-extras/qimage/cpp/lib.pro @@ -7,7 +7,9 @@ TARGET = qimage OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../../../../src/windows.pri) +win32 { + include(../../../../src/windows.pri) +} HEADERS += lib.h SOURCES += lib.cpp diff --git a/my_app/my_app.pro b/my_app/my_app.pro index 216e4d8..0a531d8 100644 --- a/my_app/my_app.pro +++ b/my_app/my_app.pro @@ -8,6 +8,8 @@ DESTDIR = ./ OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(../src/windows.pri) +win32 { + include(../src/windows.pri) +} SOURCES += main.cpp diff --git a/src/eql_exe.pro b/src/eql_exe.pro index bc390a6..8f41768 100644 --- a/src/eql_exe.pro +++ b/src/eql_exe.pro @@ -8,7 +8,9 @@ DESTDIR = ../ OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(windows.pri) +win32 { + include(windows.pri) +} win32 { CONFIG += console diff --git a/src/eql_lib.pro b/src/eql_lib.pro index 928a468..7498bf4 100644 --- a/src/eql_lib.pro +++ b/src/eql_lib.pro @@ -8,7 +8,9 @@ DESTDIR = ../ OBJECTS_DIR = ./tmp/ MOC_DIR = ./tmp/ -include(windows.pri) +win32 { + include(windows.pri) +} HEADERS += gen/_lobjects.h \ gen/_main_q_classes.h \ diff --git a/src/module_help.pro b/src/module_help.pro index 701522e..f75b2fc 100644 --- a/src/module_help.pro +++ b/src/module_help.pro @@ -7,7 +7,9 @@ DESTDIR = ../ OBJECTS_DIR = ./tmp/help/ MOC_DIR = ./tmp/help/ -include(windows.pri) +win32 { + include(windows.pri) +} HEADERS += gen/help/_ini.h \ gen/help/_ini2.h \ diff --git a/src/module_multimedia.pro b/src/module_multimedia.pro index dcd7a1a..bf65ac8 100644 --- a/src/module_multimedia.pro +++ b/src/module_multimedia.pro @@ -7,7 +7,9 @@ DESTDIR = ../ OBJECTS_DIR = ./tmp/multimedia/ MOC_DIR = ./tmp/multimedia/ -include(windows.pri) +win32 { + include(windows.pri) +} HEADERS += gen/multimedia/_ini.h \ gen/multimedia/_ini2.h \ diff --git a/src/module_network.pro b/src/module_network.pro index 2b29d42..64a836a 100644 --- a/src/module_network.pro +++ b/src/module_network.pro @@ -7,7 +7,9 @@ DESTDIR = ../ OBJECTS_DIR = ./tmp/network/ MOC_DIR = ./tmp/network/ -include(windows.pri) +win32 { + include(windows.pri) +} HEADERS += gen/network/_ini.h \ gen/network/_ini2.h \ diff --git a/src/module_quick.pro b/src/module_quick.pro index f53a1d2..c6cc249 100644 --- a/src/module_quick.pro +++ b/src/module_quick.pro @@ -7,7 +7,9 @@ DESTDIR = ../ OBJECTS_DIR = ./tmp/quick/ MOC_DIR = ./tmp/quick/ -include(windows.pri) +win32 { + include(windows.pri) +} HEADERS += gen/quick/_ini.h \ gen/quick/_ini2.h \ diff --git a/src/module_sql.pro b/src/module_sql.pro index 7c7cd9d..1524771 100644 --- a/src/module_sql.pro +++ b/src/module_sql.pro @@ -7,7 +7,9 @@ DESTDIR = ../ OBJECTS_DIR = ./tmp/sql/ MOC_DIR = ./tmp/sql/ -include(windows.pri) +win32 { + include(windows.pri) +} HEADERS += gen/sql/_ini.h \ gen/sql/_ini2.h \ diff --git a/src/module_svg.pro b/src/module_svg.pro index 31b20ba..1730a96 100644 --- a/src/module_svg.pro +++ b/src/module_svg.pro @@ -7,7 +7,9 @@ DESTDIR = ../ OBJECTS_DIR = ./tmp/svg/ MOC_DIR = ./tmp/svg/ -include(windows.pri) +win32 { + include(windows.pri) +} HEADERS += gen/svg/_ini.h \ gen/svg/_ini2.h \ diff --git a/src/module_webkit.pro b/src/module_webkit.pro index 3eeeb65..15f3ec9 100644 --- a/src/module_webkit.pro +++ b/src/module_webkit.pro @@ -9,7 +9,9 @@ MOC_DIR = ./tmp/webkit/ macx:QT += network -include(windows.pri) +win32 { + include(windows.pri) +} HEADERS += gen/webkit/_ini.h \ gen/webkit/_ini2.h \