arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-17 01:52:02 +00:00
Code Issues Releases Wiki Activity

add changes to cmake/qmake builds

Browse Source
This commit is contained in:
Pavol Rusnak 2017-03-28 23:18:55 +02:00
parent fdf1b6dc6d
commit df2524e35b
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -6,7 +6,6 @@ add_library(TrezorCrypto STATIC ${SOURCES})
target_include_directories(TrezorCrypto PUBLIC .) target_include_directories(TrezorCrypto PUBLIC .)
target_include_directories(TrezorCrypto PUBLIC ed25519-donna) target_include_directories(TrezorCrypto PUBLIC ed25519-donna)
target_include_directories(TrezorCrypto PUBLIC curve25519-donna)
# disable sequence point warnings where they are expected # disable sequence point warnings where they are expected
set_source_files_properties(aeskey.c PROPERTIES set_source_files_properties(aeskey.c PROPERTIES

3
gui/.gitignore vendored
View File

@ -1 +1,4 @@
gui.pro.user gui.pro.user
moc_mainwindow.cpp
ui_mainwindow.h
Makefile

6
gui/gui.pro
View File

@ -4,6 +4,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = gui TARGET = gui
TEMPLATE = app TEMPLATE = app
SOURCES += ../address.c
SOURCES += ../bip32.c SOURCES += ../bip32.c
SOURCES += ../bip39.c SOURCES += ../bip39.c
SOURCES += ../sha2.c SOURCES += ../sha2.c
@ -17,7 +18,6 @@ SOURCES += ../base58.c
SOURCES += ../secp256k1.c SOURCES += ../secp256k1.c
SOURCES += ../nist256p1.c SOURCES += ../nist256p1.c
SOURCES += ../curves.c SOURCES += ../curves.c
SOURCES += ../curve25519-donna/curve25519-donna.c
SOURCES += ../ed25519-donna/ed25519.c SOURCES += ../ed25519-donna/ed25519.c
SOURCES += mainwindow.cpp SOURCES += mainwindow.cpp
SOURCES += main.cpp SOURCES += main.cpp
@ -29,8 +29,4 @@ HEADERS += ../bip39.h
FORMS += mainwindow.ui FORMS += mainwindow.ui
INCLUDEPATH += .. INCLUDEPATH += ..
INCLUDEPATH += ../curve25519-donna
INCLUDEPATH += ../ed25519-donna INCLUDEPATH += ../ed25519-donna
DEFINES += ED25519_CUSTOMRANDOM=1
DEFINES += ED25519_CUSTOMHASH=1