diff --git a/make_libs.bat b/make_libs.bat index ee5b995..88aa759 100644 --- a/make_libs.bat +++ b/make_libs.bat @@ -1 +1 @@ -cmake_mgw -DICU=1 -DUSB=1 -DCRYPT=1 && make install -j8 && for %%d in (qad_widgets qad_utils qad_graphic qad_sql_table qad_application touch_widgets qad_blockview) do cd %%d && qmake && make install -j8 && cd .. +cd ..\libs_build && cmake_mgw ..\libs -DICU=1 -DUSB=1 -DCRYPT=1 && make install -j8 && for %%d in (..\libs\qad_widgets ..\libs\qad_utils ..\libs\qad_graphic ..\libs\qad_sql_table ..\libs\qad_application ..\libs\touch_widgets ..\libs\qad_blockview) do cd %%d && qmake && make install -j8 && cd .. diff --git a/qad_application/qad_application.pro b/qad_application/qad_application.pro index 7c51e39..612bf14 100644 --- a/qad_application/qad_application.pro +++ b/qad_application/qad_application.pro @@ -8,8 +8,6 @@ SOURCES = qad_application.cpp edockwidgetplugin.cpp emainwindowplugin.cpp hi RESOURCES = qad_application.qrc TRANSLATIONS = lang/qad_application_ru.ts LIBS += -L. -lqad_utils -lqad_application -QMAKE_CXXFLAGS += -g3 -QMAKE_CFLAGS += -g3 target.path = $$[QT_INSTALL_PLUGINS]/designer INSTALLS += target diff --git a/qad_blockview/qad_blockview.pro b/qad_blockview/qad_blockview.pro index 690bba5..114d62f 100644 --- a/qad_blockview/qad_blockview.pro +++ b/qad_blockview/qad_blockview.pro @@ -8,8 +8,6 @@ SOURCES = qad_blockview.cpp blockviewplugin.cpp RESOURCES = qad_blockview.qrc TRANSLATIONS = lang/qad_blockview_ru.ts LIBS += -L. -lqad_widgets -lqad_utils -lqad_blockview -QMAKE_CXXFLAGS += -g3 -QMAKE_CFLAGS += -g3 target.path = $$[QT_INSTALL_PLUGINS]/designer INSTALLS += target diff --git a/qad_graphic/qad_graphic.pro b/qad_graphic/qad_graphic.pro index 53e8e2b..9c1f0ad 100644 --- a/qad_graphic/qad_graphic.pro +++ b/qad_graphic/qad_graphic.pro @@ -8,8 +8,6 @@ SOURCES = qad_graphic.cpp graphicplugin.cpp RESOURCES = qad_graphic.qrc TRANSLATIONS = lang/qad_graphic_ru.ts LIBS += -L. -lqad_widgets -lqad_utils -lqad_graphic -QMAKE_CXXFLAGS += -g3 -QMAKE_CFLAGS += -g3 target.path = $$[QT_INSTALL_PLUGINS]/designer INSTALLS += target diff --git a/qad_sql_table/qad_sql_table.pro b/qad_sql_table/qad_sql_table.pro index eea2a44..1190c75 100644 --- a/qad_sql_table/qad_sql_table.pro +++ b/qad_sql_table/qad_sql_table.pro @@ -9,8 +9,6 @@ SOURCES = qad_sql_table.cpp sql_table_plugin.cpp sql_record_plugin.cpp RESOURCES = qad_sql_table.qrc TRANSLATIONS = lang/qad_sql_table_ru.ts LIBS += -L. -lqad_widgets -lqad_sql_table -QMAKE_CXXFLAGS += -g3 -QMAKE_CFLAGS += -g3 target.path = $$[QT_INSTALL_PLUGINS]/designer INSTALLS += target diff --git a/qad_utils/qad_utils.pro b/qad_utils/qad_utils.pro index 30e79e1..9312698 100644 --- a/qad_utils/qad_utils.pro +++ b/qad_utils/qad_utils.pro @@ -8,8 +8,6 @@ SOURCES = qad_utils.cpp qpiconfigplugin.cpp #RESOURCES = qad_utils.qrc #TRANSLATIONS = lang/ru.ts LIBS += -L. -lqad_utils -lqad_widgets -QMAKE_CXXFLAGS += -g3 -QMAKE_CFLAGS += -g3 target.path = $$[QT_INSTALL_PLUGINS]/designer INSTALLS += target diff --git a/qad_widgets/qad_widgets.pro b/qad_widgets/qad_widgets.pro index 9855aaa..3b1ff1d 100644 --- a/qad_widgets/qad_widgets.pro +++ b/qad_widgets/qad_widgets.pro @@ -20,8 +20,6 @@ SOURCES = qad_widgets.cpp \ RESOURCES = qad_widgets.qrc TRANSLATIONS = lang/qad_widgets_ru.ts LIBS += -L. -lqad_widgets -QMAKE_CXXFLAGS += -g3 -QMAKE_CFLAGS += -g3 target.path = $$[QT_INSTALL_PLUGINS]/designer INSTALLS += target diff --git a/touch_widgets/touch_widgets.pro b/touch_widgets/touch_widgets.pro index ead9f17..2729bd6 100644 --- a/touch_widgets/touch_widgets.pro +++ b/touch_widgets/touch_widgets.pro @@ -2,16 +2,13 @@ CONFIG += designer plugin release TARGET = $$qtLibraryTarget(touch_widgets_plugin) TEMPLATE = lib -HEADERS = touchsliderplugin.h touchbuttframeplugin.h tw.h \ - touchbuttonplugin.h -SOURCES = touchsliderplugin.cpp touchbuttframeplugin.cpp tw.cpp \ - touchbuttonplugin.cpp +HEADERS = touchsliderplugin.h touchbuttframeplugin.h tw.h touchbuttonplugin.h +SOURCES = touchsliderplugin.cpp touchbuttframeplugin.cpp tw.cpp touchbuttonplugin.cpp RESOURCES = touch_widgets.qrc LIBS += -L. -ltouch_widgets target.path = $$[QT_INSTALL_PLUGINS]/designer INSTALLS += target -#include(touchslider.pri) -#include(touchbuttframe.pri) -#include(touchbutton.pri) +CONFIG -= debug_and_release debug +CONFIG += release diff --git a/touch_widgets/touchbuttframe.pri b/touch_widgets/touchbuttframe.pri deleted file mode 100644 index d4ee8df..0000000 --- a/touch_widgets/touchbuttframe.pri +++ /dev/null @@ -1,3 +0,0 @@ -HEADERS += touchbuttframe.h -SOURCES += touchbuttframe.cpp -OTHER_FILES += battery.png diff --git a/touch_widgets/touchbutton.pri b/touch_widgets/touchbutton.pri deleted file mode 100644 index fcad011..0000000 --- a/touch_widgets/touchbutton.pri +++ /dev/null @@ -1,5 +0,0 @@ -HEADERS += \ - touchbutton.h -SOURCES += \ - touchbutton.cpp -OTHER_FILES += diff --git a/touch_widgets/touchslider.pri b/touch_widgets/touchslider.pri deleted file mode 100644 index e043db9..0000000 --- a/touch_widgets/touchslider.pri +++ /dev/null @@ -1,8 +0,0 @@ -HEADERS += \ - touchslider.h \ - touch_bar.h -SOURCES += \ - touchslider.cpp - -FORMS += \ - touchslider.ui