1
0
mirror of https://github.com/PurpleI2P/i2pd-qt.git synced 2025-01-31 08:44:17 +00:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hypenosis 2021-04-03 01:12:28 +08:00
commit 3ea5c3f571
4 changed files with 16 additions and 8 deletions

View File

@ -1,3 +1,9 @@
# Build Requirements
# i2pd-qt — A GUI for i2pd
## Downloads
<a href='https://flathub.org/apps/details/website.i2pd.i2pd'><img width='240' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-en.png'/></a>
## Build Requirements
* Qt 5 is necessary (because Qt4 lacks QtWidgets/ folder)

View File

@ -35,6 +35,7 @@
<translation type="qt" />
<releases>
<release version="2.37.0" date="2021-03-15" />
<release version="2.36.0" date="2021-02-15" />
<release version="2.35.0" date="2020-11-30" />
<release version="2.34.0" date="2020-10-27" />

View File

@ -92,19 +92,20 @@ FORMS += \
LIBS += $$PWD/src/i2pd/libi2pd.a $$PWD/src/i2pd/libi2pdclient.a -lz
libi2pd.commands = @echo Building i2pd libraries
libi2pd.target = $$PWD/src/i2pd/libi2pd.a
libi2pd.depends = i2pd FORCE
# doing that way due to race condition made by make
i2pd_client.commands = cd $$PWD/src/i2pd/ && mkdir -p obj/libi2pd obj/libi2pd_client && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes $$I2PDMAKE mk_obj_dir api_client
i2pd_client.target = $$PWD/src/i2pd/libi2pdclient.a
i2pd_client.depends = i2pd FORCE
i2pd.commands = cd $$PWD/src/i2pd/ && mkdir -p obj/libi2pd obj/libi2pd_client && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes $$I2PDMAKE mk_obj_dir api_client
i2pd.target += $$PWD/src/i2pd/libi2pdclient.a
i2pd.commands = cd $$PWD/src/i2pd/ && mkdir -p obj/libi2pd obj/libi2pd_client && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes $$I2PDMAKE mk_obj_dir api
i2pd.target += $$PWD/src/i2pd/libi2pd.a
i2pd.depends = FORCE
cleani2pd.commands = cd $$PWD/src/i2pd/ && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) clean
#cleani2pd.depends = clean
PRE_TARGETDEPS += $$PWD/src/i2pd/libi2pd.a $$PWD/src/i2pd/libi2pdclient.a
QMAKE_EXTRA_TARGETS += cleani2pd i2pd libi2pd
QMAKE_EXTRA_TARGETS += cleani2pd i2pd i2pd_client
CLEAN_DEPS += cleani2pd
BuildDateTimeQtTarget.target = $$PWD/src/BuildDateTimeQt.h

@ -1 +1 @@
Subproject commit 74aa07eba896d35bae8e69a1bb654f4eaa43efba
Subproject commit 436a3e7f54d1b0a70fe93dda4ac06829d2111759