diff options
| author | irungentoo <irungentoo@gmail.com> | 2013-07-30 07:31:51 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2013-07-30 07:31:51 -0400 |
| commit | b1726f55ed9864e36d11cbdaf616153da4c9ddb5 (patch) | |
| tree | 9ad86830035c926f6536b4ba4a429dfcbe27ac13 /core/CMakeLists.txt | |
| parent | e9dd83b5435aa9c84888f80e5b79c65477c9c0a1 (diff) | |
| parent | 261f365e55d4711372f7053667aa368788eabea1 (diff) | |
Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere into nurupo-master
Conflicts:
testing/CMakeLists.txt
Diffstat (limited to 'core/CMakeLists.txt')
| -rw-r--r-- | core/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 6ddd5b9b..420308d8 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt | |||
| @@ -6,12 +6,12 @@ if(WIN32) | |||
| 6 | endif() | 6 | endif() |
| 7 | 7 | ||
| 8 | set(core_sources | 8 | set(core_sources |
| 9 | DHT.c | 9 | DHT.c |
| 10 | network.c | 10 | network.c |
| 11 | Lossless_UDP.c | 11 | Lossless_UDP.c |
| 12 | net_crypto.c | 12 | net_crypto.c |
| 13 | friend_requests.c | 13 | friend_requests.c |
| 14 | LAN_discovery.c | 14 | LAN_discovery.c |
| 15 | Messenger.c) | 15 | Messenger.c) |
| 16 | 16 | ||
| 17 | add_library(core ${core_sources}) | 17 | add_library(core ${core_sources}) |