diff --git a/general.pri b/general.pri index 9f790b4..81b63cd 100644 --- a/general.pri +++ b/general.pri @@ -13,21 +13,14 @@ unix { } # prefix targetprefix = $$(TARGET_PREFIX) -equals(targetprefix, "") { - win32 { - targetprefix = ../../.. - } else { - targetprefix = ../.. - } -} message("Using target prefix \"$${targetprefix}\".") # print install root message("Using install root \"$$(INSTALL_ROOT)\".") # target CONFIG(debug, debug|release) { - TARGET = $$targetprefix/$${projectname}d + TARGET = $${targetprefix}$${projectname}d } else { - TARGET = $$targetprefix/$$projectname + TARGET = $${targetprefix}$${projectname} } # variables to check target architecture win32-g++:QMAKE_TARGET.arch = $$QMAKE_HOST.arch @@ -79,3 +72,14 @@ guiqtwidgets { DEFINES += GUI_QTWIDGETS DEFINES += MODEL_UNDO_SUPPORT } +# configuration for cross compliation with mingw-w64 +mingw-w64-manualstrip-dll { + QMAKE_POST_LINK=$${CROSS_COMPILE}strip --strip-unneeded ./release/$(TARGET); \ + $${CROSS_COMPILE}strip --strip-unneeded ./release/lib$(TARGET).a +} +mingw-w64-manualstrip-exe { + QMAKE_POST_LINK=$${CROSS_COMPILE}strip --strip-unneeded ./release/$(TARGET) +} +mingw-w64-noversion { + VERSION = "" +} diff --git a/videodownloader.pro b/videodownloader.pro index a7212b6..9faa9d0 100644 --- a/videodownloader.pro +++ b/videodownloader.pro @@ -109,12 +109,12 @@ FORMS += gui/adddownloaddialog.ui \ RESOURCES += resources/icons.qrc \ resources/json.qrc +win32:include(windowsicon.pri) + OTHER_FILES += \ README.md \ LICENSE -#win32:RC_FILE += windowsicon.rc - CONFIG(debug, debug|release) { LIBS += -L../../ -lc++utilitiesd !no-gui { @@ -132,15 +132,14 @@ INCLUDEPATH += ../ # installs target.path = $$(INSTALL_ROOT)/bin INSTALLS += target -icon.path = $$(INSTALL_ROOT)/share/icons/hicolor/scalable/apps/ -icon.files = $${PWD}/resources/icons/hicolor/scalable/apps/$${projectname}.svg -INSTALLS += icon -menu.path = $$(INSTALL_ROOT)/share/applications/ -menu.files = $${PWD}/resources/desktop/applications/$${projectname}.desktop -INSTALLS += menu -translations.path = $$(INSTALL_ROOT)/share/$${projectname}/translations/ -translations.files = $${PWD}/translations/*.qm -INSTALLS += translations +!mingw-w64-install { + icon.path = $$(INSTALL_ROOT)/share/icons/hicolor/scalable/apps/ + icon.files = $${PWD}/resources/icons/hicolor/scalable/apps/$${projectname}.svg + INSTALLS += icon + menu.path = $$(INSTALL_ROOT)/share/applications/ + menu.files = $${PWD}/resources/desktop/applications/$${projectname}.desktop + INSTALLS += menu +} json.path = $$(INSTALL_ROOT)/share/$${projectname}/json/ json.files = $${PWD}/resources/json/groovesharkauthenticationinfo.json INSTALLS += json