StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #622 from jin-eld/no-tox-sync-on-windows

Browse Source 
Do not build tox_sync on win32
This commit is contained in:
irungentoo 2013-10-16 09:10:57 -07:00
commit 31b371e617
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -587,6 +587,7 @@ AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
AM_CONDITIONAL(BUILD_NTOX, test "x$BUILD_NTOX" = "xyes") AM_CONDITIONAL(BUILD_NTOX, test "x$BUILD_NTOX" = "xyes")
AM_CONDITIONAL(BUILD_AV, test "x$BUILD_AV" = "xyes") AM_CONDITIONAL(BUILD_AV, test "x$BUILD_AV" = "xyes")
AM_CONDITIONAL(BUILD_TESTING, test "x$BUILD_TESTING" = "xyes") AM_CONDITIONAL(BUILD_TESTING, test "x$BUILD_TESTING" = "xyes")
AM_CONDITIONAL(WIN32, test "x$WIN32" = "xyes")
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
build/Makefile build/Makefile

17
testing/Makefile.inc
View File

@ -25,8 +25,7 @@ noinst_PROGRAMS += DHT_test \
Lossless_UDP_testclient \ Lossless_UDP_testclient \
Lossless_UDP_testserver \ Lossless_UDP_testserver \
Messenger_test \ Messenger_test \
crypto_speed_test \ crypto_speed_test
tox_sync
DHT_test_SOURCES = ../testing/DHT_test.c DHT_test_SOURCES = ../testing/DHT_test.c
@ -102,20 +101,22 @@ crypto_speed_test_LDADD = \
$(NACL_LIBS) \ $(NACL_LIBS) \
$(WINSOCK2_LIBS) $(WINSOCK2_LIBS)
tox_sync_SOURCES = \ if !WIN32
../testing/tox_sync.c
tox_sync_CFLAGS = \ noinst_PROGRAMS += tox_sync
$(LIBSODIUM_CFLAGS) \
tox_sync_SOURCES = ../testing/tox_sync.c
tox_sync_CFLAGS = $(LIBSODIUM_CFLAGS) \
$(NACL_CFLAGS) $(NACL_CFLAGS)
tox_sync_LDADD = \ tox_sync_LDADD = $(LIBSODIUM_LDFLAGS) \
$(LIBSODIUM_LDFLAGS) \
$(NACL_LDFLAGS) \ $(NACL_LDFLAGS) \
libtoxcore.la \ libtoxcore.la \
$(LIBSODIUM_LIBS) \ $(LIBSODIUM_LIBS) \
$(NACL_LIBS) \ $(NACL_LIBS) \
$(WINSOCK2_LIBS) $(WINSOCK2_LIBS)
endif
EXTRA_DIST += $(top_srcdir)/testing/misc_tools.c EXTRA_DIST += $(top_srcdir)/testing/misc_tools.c