skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Build fixes for mpw_color.

Browse Source
This commit is contained in:
Maarten Billemont 2015-02-09 20:51:12 +00:00
parent afaa17948f
commit d898646097
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MasterPassword/C/build
View File

@ -204,11 +204,11 @@ mpw() {
echo echo
echo "Building target: $target..." echo "Building target: $target..."
CFLAGS=( local CFLAGS=(
# include paths # include paths
-I"lib/include" -I"lib/include"
) )
LDFLAGS=( local LDFLAGS=(
# scrypt # scrypt
"lib/scrypt/scrypt-crypto_aesctr.o" "lib/scrypt/scrypt-crypto_aesctr.o"
"lib/scrypt/scrypt-sha256.o" "lib/scrypt/scrypt-sha256.o"
@ -240,11 +240,11 @@ mpw-bench() {
echo echo
echo "Building target: $target..." echo "Building target: $target..."
CFLAGS=( local CFLAGS=(
# include paths # include paths
-I"lib/include" -I"lib/include"
) )
LDFLAGS=( local LDFLAGS=(
# scrypt # scrypt
"lib/scrypt/scrypt-crypto_aesctr.o" "lib/scrypt/scrypt-crypto_aesctr.o"
"lib/scrypt/scrypt-sha256.o" "lib/scrypt/scrypt-sha256.o"
@ -264,6 +264,9 @@ mpw-bench() {
-l"crypto" -l"crypto"
) )
cc "${CFLAGS[@]}" "$@" -c mpw-algorithm.c -o mpw-algorithm.o
cc "${CFLAGS[@]}" "$@" -c mpw-types.c -o mpw-types.o
cc "${CFLAGS[@]}" "$@" -c mpw-util.c -o mpw-util.o
cc "${CFLAGS[@]}" "$@" "mpw-algorithm.o" "mpw-types.o" "mpw-util.o" \ cc "${CFLAGS[@]}" "$@" "mpw-algorithm.o" "mpw-types.o" "mpw-util.o" \
"${LDFLAGS[@]}" "mpw-bench.c" -o "mpw-bench" "${LDFLAGS[@]}" "mpw-bench.c" -o "mpw-bench"
echo "done! Now use ./mpw-bench" echo "done! Now use ./mpw-bench"
@ -276,13 +279,13 @@ mpw-tests() {
echo echo
echo "Building target: $target..." echo "Building target: $target..."
CFLAGS=( local CFLAGS=(
# include paths # include paths
-I"lib/include" -I"lib/include"
-I"/usr/include/libxml2" -I"/usr/include/libxml2"
-I"/usr/local/include/libxml2" -I"/usr/local/include/libxml2"
) )
LDFLAGS=( local LDFLAGS=(
# scrypt # scrypt
"lib/scrypt/scrypt-crypto_aesctr.o" "lib/scrypt/scrypt-crypto_aesctr.o"
"lib/scrypt/scrypt-sha256.o" "lib/scrypt/scrypt-sha256.o"
@ -296,7 +299,10 @@ mpw-tests() {
-l"crypto" -l"xml2" -l"crypto" -l"xml2"
) )
cc "${CFLAGS[@]}" "$@" -c mpw-tests-util.c -o mpw-tests-util.o cc "${CFLAGS[@]}" "$@" -c mpw-algorithm.c -o mpw-algorithm.o
cc "${CFLAGS[@]}" "$@" -c mpw-types.c -o mpw-types.o
cc "${CFLAGS[@]}" "$@" -c mpw-util.c -o mpw-util.o
cc "${CFLAGS[@]}" "$@" -c mpw-tests-util.c -o mpw-tests-util.o
cc "${CFLAGS[@]}" "$@" "mpw-algorithm.o" "mpw-types.o" "mpw-util.o" "mpw-tests-util.o" \ cc "${CFLAGS[@]}" "$@" "mpw-algorithm.o" "mpw-types.o" "mpw-util.o" "mpw-tests-util.o" \
"${LDFLAGS[@]}" "mpw-tests.c" -o "mpw-tests" "${LDFLAGS[@]}" "mpw-tests.c" -o "mpw-tests"
echo "done! Now use ./mpw-tests" echo "done! Now use ./mpw-tests"

7
MasterPassword/C/mpw-util.c
View File

@ -8,9 +8,16 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#include <string.h> #include <string.h>
#include <locale.h> #include <locale.h>
#ifdef COLOR
#include <unistd.h>
#include <curses.h>
#include <term.h>
#endif
#include <scrypt/sha256.h> #include <scrypt/sha256.h>
#include <scrypt/crypto_scrypt.h> #include <scrypt/crypto_scrypt.h>