Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-28 19:57:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

test with gh workflows

Browse source
This commit is contained in:
R4SAS 2020-11-11 16:31:25 +03:00
parent 20e08b827e
commit 97ccf21030
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build-qt.yml vendored
View file

@ -17,4 +17,4 @@ jobs:
run: | run: |
cd qt/i2pd_qt cd qt/i2pd_qt
qmake qmake
make -j3 make release -j3

2
.github/workflows/build.yml vendored
View file

@ -18,4 +18,4 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install build-essential libboost1.74-dev libminiupnpc-dev libssl-dev zlib1g-dev sudo apt-get install build-essential libboost1.74-dev libminiupnpc-dev libssl-dev zlib1g-dev
- name: build application - name: build application
run: make USE_UPNP=${{ matrix.with_upnp }} -j3 run: make USE_AESNI=no USE_UPNP=${{ matrix.with_upnp }} -j3

2
Makefile.linux
View file

@ -59,6 +59,6 @@ endif
ifeq ($(USE_AESNI),yes) ifeq ($(USE_AESNI),yes)
ifeq (, $(findstring arm, $(SYS))$(findstring aarch64, $(SYS))) # no arm and aarch64 in dumpmachine ifeq (, $(findstring arm, $(SYS))$(findstring aarch64, $(SYS))) # no arm and aarch64 in dumpmachine
NEEDED_CXXFLAGS += -D__AES__ -maes NEEDED_CXXFLAGS += -D__AES__
endif endif
endif endif

4
libi2pd/CPU.cpp
View file

@ -37,11 +37,11 @@ namespace cpu
__cpuid(0x00000001, info[0], info[1], info[2], info[3]); __cpuid(0x00000001, info[0], info[1], info[2], info[3]);
#ifdef __AES__ #ifdef __AES__
if ((info[2] & bit_AES || __builtin_cpu_supports("aes")) && AesSwitch) { if ((info[2] & bit_AES || __builtin_cpu_supports("aes")) && AesSwitch) {
aesni = true; // AESNI aesni = true;
} }
#endif // __AES__ #endif // __AES__
if ((info[2] & bit_AVX || __builtin_cpu_supports("avx")) && AvxSwitch) { if ((info[2] & bit_AVX || __builtin_cpu_supports("avx")) && AvxSwitch) {
avx = true; // AVX avx = true;
} }
} }
#endif // defined(__x86_64__) || defined(__i386__) #endif // defined(__x86_64__) || defined(__i386__)

6
qt/i2pd_qt/i2pd_qt.pro
View file

@ -10,8 +10,10 @@ CONFIG += strict_c++ c++11
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
message(Debug build) message(Debug build)
DEFINES += DEBUG_WITH_DEFAULT_LOGGING DEFINES += DEBUG_WITH_DEFAULT_LOGGING
I2PDMAKE += DEBUG=yes
} else { } else {
message(Release build) message(Release build)
I2PDMAKE += DEBUG=no
} }
SOURCES += DaemonQT.cpp mainwindow.cpp \ SOURCES += DaemonQT.cpp mainwindow.cpp \
@ -73,11 +75,11 @@ FORMS += mainwindow.ui \
LIBS += $$PWD/../../libi2pd.a $$PWD/../../libi2pdclient.a -lz LIBS += $$PWD/../../libi2pd.a $$PWD/../../libi2pdclient.a -lz
libi2pd.commands = cd $$PWD/../../ && mkdir -p obj/libi2pd && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes DEBUG=no api libi2pd.commands = cd $$PWD/../../ && mkdir -p obj/libi2pd && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes $$I2PDMAKE api
libi2pd.target = $$PWD/../../libi2pd.a libi2pd.target = $$PWD/../../libi2pd.a
libi2pd.depends = FORCE libi2pd.depends = FORCE
libi2pdclient.commands = cd $$PWD/../../ && mkdir -p obj/libi2pd_client && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes DEBUG=no api_client libi2pdclient.commands = cd $$PWD/../../ && mkdir -p obj/libi2pd_client && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes $$I2PDMAKE api_client
libi2pdclient.target = $$PWD/../../libi2pdclient.a libi2pdclient.target = $$PWD/../../libi2pdclient.a
libi2pdclient.depends = FORCE libi2pdclient.depends = FORCE