yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-29 20:04:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge issue

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-01-29 13:15:48 +00:00
parent b8a923db2b
commit 226d37ac6f
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/Makefile
View File

@ -227,15 +227,11 @@ test/ssl_test: test/ssl_test.c ../library/libmbedtls.a
echo " CC test/ssl_test.c" echo " CC test/ssl_test.c"
$(CC) $(CFLAGS) $(OFLAGS) test/ssl_test.c $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $(OFLAGS) test/ssl_test.c $(LDFLAGS) -o $@
<<<<<<< HEAD test/udp_proxy: test/udp_proxy.c ../library/libmbedtls.a
test/udp_proxy: test/udp_proxy.c ../library/libpolarssl.a
echo " CC test/udp_proxy.c" echo " CC test/udp_proxy.c"
$(CC) $(CFLAGS) $(OFLAGS) test/udp_proxy.c $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $(OFLAGS) test/udp_proxy.c $(LDFLAGS) -o $@
test/o_p_test: test/o_p_test.c ../library/libpolarssl.a
=======
test/o_p_test: test/o_p_test.c ../library/libmbedtls.a test/o_p_test: test/o_p_test.c ../library/libmbedtls.a
>>>>>>> development
echo " CC test/o_p_test.c" echo " CC test/o_p_test.c"
$(CC) $(CFLAGS) $(OFLAGS) test/o_p_test.c $(LDFLAGS) -o $@ -lssl -lcrypto $(CC) $(CFLAGS) $(OFLAGS) test/o_p_test.c $(LDFLAGS) -o $@ -lssl -lcrypto