Merge pull request #165 from nurupo/master

Fixed cmake
This commit is contained in:
irungentoo 2013-07-30 09:26:48 -07:00
commit e5db760f7c
3 changed files with 5 additions and 16 deletions

View File

@ -9,10 +9,10 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
if(WIN32)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
endif()
if(NOT WIN32)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toxic.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
add_subdirectory(toxic)
endif()

View File

@ -1,11 +0,0 @@
cmake_minimum_required(VERSION 2.6.0)
project(toxic C)
set(exe_name toxic)
add_executable(${exe_name}
toxic/main.c toxic/prompt.c)
target_link_libraries(${exe_name} curses)
linkCoreLibraries(${exe_name})

View File

@ -4,8 +4,8 @@ project(toxic C)
set(exe_name toxic)
add_executable(${exe_name}
toxic/main.c
toxic/prompt.c)
main.c
prompt.c)
target_link_libraries(${exe_name}
curses)