Skip to content

Commit

Permalink
Don't build nTox by default.
Browse files Browse the repository at this point in the history
Build it on Travis. It won't be built on the windows builds regardless
of having it enabled globally.

Fixes TokTok#292.
  • Loading branch information
iphydf committed Dec 5, 2016
1 parent d66b3ea commit d8ae726
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion other/travis/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit d8ae726

Please sign in to comment.