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

Don't build nTox by default.

Browse Source 
Build it on Travis. It won't be built on the windows builds regardless
of having it enabled globally.

Fixes #292.
This commit is contained in:
iphydf 2016-12-05 22:00:05 +00:00
parent d66b3eabd5
commit d8ae726d0a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -483,8 +483,8 @@ if(NOT WIN32
endif()
endif()
option(BUILD_NTOX "Build nTox client" ON)
if(NOT WIN32 AND BUILD_NTOX)
option(BUILD_NTOX "Build nTox client" OFF)
if(BUILD_NTOX AND NOT WIN32)
add_c_executable(nTox testing/nTox.c)
target_link_modules(nTox toxcore ${NCURSES_LIBRARIES})
endif()

2
other/travis/env.sh
View File

@ -7,7 +7,7 @@ export LD_LIBRARY_PATH=$CACHE_DIR/lib
export PKG_CONFIG_PATH=$CACHE_DIR/lib/pkgconfig
export ASTYLE=$CACHE_DIR/astyle/build/gcc/bin/astyle
export CFLAGS="-O3 -DTRAVIS_ENV=1"
export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON"
export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON -DBUILD_NTOX=ON"
BUILD_DIR=_build