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 branch 'master' of https://github.com/nurupo/InsertProjectNameHere into nurupo-master

Browse Source 
Conflicts:
	testing/CMakeLists.txt
This commit is contained in:
irungentoo 2013-07-30 07:31:51 -04:00
commit b1726f55ed
14 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/network.c
View File

@ -169,7 +169,7 @@ void shutdown_networking()
address should represent IPv4, IPv6 or a hostname
on success returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i
on failure returns -1 */
int resolve_addr(char *address)
int resolve_addr(const char *address)
{
struct addrinfo hints;
memset(&hints, 0, sizeof(hints));

2
core/network.h
View File

@ -125,7 +125,7 @@ void shutdown_networking();
address should represent IPv4, IPv6 or a hostname
on success returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i
on failure returns -1 */
int resolve_addr(char *address);
int resolve_addr(const char *address);
#ifdef __cplusplus
}

4
other/bootstrap_serverdaemon/CMakeLists.txt
View File

@ -6,5 +6,7 @@ set(exe_name DHT_bootstrap_daemon)
add_executable(${exe_name}
DHT_bootstrap_daemon.c)
target_link_libraries(${exe_name} config)
target_link_libraries(${exe_name}
config)
linkCoreLibraries(${exe_name})

3
other/cmake/DHT_bootstrap.cmake
View File

@ -4,6 +4,7 @@ project(DHT_bootstrap C)
set(exe_name DHT_bootstrap)
add_executable(${exe_name}
DHT_bootstrap.c ../testing/misc_tools.c)
DHT_bootstrap.c
../testing/misc_tools.c)
linkCoreLibraries(${exe_name})

5
testing/CMakeLists.txt
View File

@ -11,8 +11,9 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
if(WIN32)
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/toxic.cmake)
add_subdirectory(other)
endif()

3
testing/cmake/DHT_cryptosendfiletest.cmake
View File

@ -4,6 +4,7 @@ project(DHT_cryptosendfiletest C)
set(exe_name DHT_cryptosendfiletest)
add_executable(${exe_name}
DHT_cryptosendfiletest.c misc_tools.c)
DHT_cryptosendfiletest.c
misc_tools.c)
linkCoreLibraries(${exe_name})

3
testing/cmake/DHT_test.cmake
View File

@ -4,6 +4,7 @@ project(DHT_test C)
set(exe_name DHT_test)
add_executable(${exe_name}
DHT_test.c misc_tools.c)
DHT_test.c
misc_tools.c)
linkCoreLibraries(${exe_name})

3
testing/cmake/nTox.cmake
View File

@ -6,6 +6,7 @@ set(exe_name nTox)
add_executable(${exe_name}
nTox.c misc_tools.c)
target_link_libraries(${exe_name} ncurses)
target_link_libraries(${exe_name}
ncurses)
linkCoreLibraries(${exe_name})

13
testing/toxic/CMakeLists.txt Normal file
View File

@ -0,0 +1,13 @@
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})