diff options
-rw-r--r-- | INSTALL.md | 2 | ||||
-rw-r--r-- | appveyor.yml | 3 | ||||
-rw-r--r-- | cmake/Dependencies.cmake | 16 | ||||
-rw-r--r-- | third_party/README.md | 2 |
4 files changed, 11 insertions, 12 deletions
@@ -144,7 +144,7 @@ In addition to meeting the [requirements](#requirements), you need a version of | |||
144 | 144 | ||
145 | You must also ensure that the msvc versions of dependencies you're using are placed in the correct folders. | 145 | You must also ensure that the msvc versions of dependencies you're using are placed in the correct folders. |
146 | 146 | ||
147 | For libsodium that is `c-toxcore/libsodium`, and for pthreads-w32, it's `c-toxcore/pthreads-win32` | 147 | For libsodium that is `c-toxcore/third_party/libsodium`, and for pthreads-w32, it's `c-toxcore/third_party/pthreads-win32` |
148 | 148 | ||
149 | Once all of this is done, from the **Developer Command Prompt for VS**, simply run | 149 | Once all of this is done, from the **Developer Command Prompt for VS**, simply run |
150 | 150 | ||
diff --git a/appveyor.yml b/appveyor.yml index 925122fe..91f727f7 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
@@ -7,6 +7,7 @@ install: | |||
7 | - choco install curl | 7 | - choco install curl |
8 | - refreshenv | 8 | - refreshenv |
9 | - if not exist %APPDATA%\downloads mkdir %APPDATA%\downloads | 9 | - if not exist %APPDATA%\downloads mkdir %APPDATA%\downloads |
10 | - cd third_party | ||
10 | # libsodium | 11 | # libsodium |
11 | - mkdir libsodium && cd libsodium | 12 | - mkdir libsodium && cd libsodium |
12 | - if not exist %APPDATA%\downloads\libsodium.zip curl -L https://download.libsodium.org/libsodium/releases/libsodium-1.0.12-msvc.zip -o %APPDATA%\downloads\libsodium.zip | 13 | - if not exist %APPDATA%\downloads\libsodium.zip curl -L https://download.libsodium.org/libsodium/releases/libsodium-1.0.12-msvc.zip -o %APPDATA%\downloads\libsodium.zip |
@@ -16,7 +17,7 @@ install: | |||
16 | - mkdir pthreads-win32 && cd pthreads-win32 | 17 | - mkdir pthreads-win32 && cd pthreads-win32 |
17 | - if not exist %APPDATA%\downloads\pthreads.zip curl -L ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip -o %APPDATA%\downloads\pthreads.zip | 18 | - if not exist %APPDATA%\downloads\pthreads.zip curl -L ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip -o %APPDATA%\downloads\pthreads.zip |
18 | - unzip %APPDATA%\downloads\pthreads.zip | 19 | - unzip %APPDATA%\downloads\pthreads.zip |
19 | - cd .. | 20 | - cd ../.. |
20 | 21 | ||
21 | before_build: | 22 | before_build: |
22 | - cmake . -DBOOTSTRAP_DAEMON=OFF -DENABLE_SHARED=OFF -DBUILD_TOXAV=OFF | 23 | - cmake . -DBOOTSTRAP_DAEMON=OFF -DENABLE_SHARED=OFF -DBUILD_TOXAV=OFF |
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 72c43b40..b3e57e50 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake | |||
@@ -33,8 +33,8 @@ pkg_use_module(SNDFILE sndfile ) | |||
33 | # :: For MSVC Windows builds. | 33 | # :: For MSVC Windows builds. |
34 | # | 34 | # |
35 | # These require specific installation paths of dependencies: | 35 | # These require specific installation paths of dependencies: |
36 | # - libsodium in libsodium/Win32/Release/v140/dynamic | 36 | # - libsodium in third-party/libsodium/Win32/Release/v140/dynamic |
37 | # - pthreads in pthreads-win32/Pre-built.2 | 37 | # - pthreads in third-party/pthreads-win32/Pre-built.2 |
38 | # | 38 | # |
39 | ############################################################################### | 39 | ############################################################################### |
40 | 40 | ||
@@ -44,11 +44,11 @@ if(MSVC) | |||
44 | find_library(LIBSODIUM_LIBRARIES | 44 | find_library(LIBSODIUM_LIBRARIES |
45 | NAMES sodium libsodium | 45 | NAMES sodium libsodium |
46 | PATHS | 46 | PATHS |
47 | "libsodium/Win32/Release/v140/dynamic" | 47 | "third_party/libsodium/Win32/Release/v140/dynamic" |
48 | "libsodium/x64/Release/v140/dynamic" | 48 | "third_party/libsodium/x64/Release/v140/dynamic" |
49 | ) | 49 | ) |
50 | if(LIBSODIUM_LIBRARIES) | 50 | if(LIBSODIUM_LIBRARIES) |
51 | include_directories("libsodium/include") | 51 | include_directories("third_party/libsodium/include") |
52 | set(LIBSODIUM_FOUND TRUE) | 52 | set(LIBSODIUM_FOUND TRUE) |
53 | message("libsodium: ${LIBSODIUM_LIBRARIES}") | 53 | message("libsodium: ${LIBSODIUM_LIBRARIES}") |
54 | else() | 54 | else() |
@@ -61,11 +61,11 @@ if(MSVC) | |||
61 | find_library(CMAKE_THREAD_LIBS_INIT | 61 | find_library(CMAKE_THREAD_LIBS_INIT |
62 | NAMES pthreadVC2 | 62 | NAMES pthreadVC2 |
63 | PATHS | 63 | PATHS |
64 | "pthreads-win32/Pre-built.2/lib/x86" | 64 | "third_party/pthreads-win32/Pre-built.2/lib/x86" |
65 | "pthreads-win32/Pre-built.2/lib/x64" | 65 | "third_party/pthreads-win32/Pre-built.2/lib/x64" |
66 | ) | 66 | ) |
67 | if(CMAKE_THREAD_LIBS_INIT) | 67 | if(CMAKE_THREAD_LIBS_INIT) |
68 | include_directories("pthreads-win32/Pre-built.2/include") | 68 | include_directories("third_party/pthreads-win32/Pre-built.2/include") |
69 | add_definitions(-DHAVE_STRUCT_TIMESPEC) | 69 | add_definitions(-DHAVE_STRUCT_TIMESPEC) |
70 | message("libpthreads: ${CMAKE_THREAD_LIBS_INIT}") | 70 | message("libpthreads: ${CMAKE_THREAD_LIBS_INIT}") |
71 | else() | 71 | else() |
diff --git a/third_party/README.md b/third_party/README.md index 11546589..e9197bc9 100644 --- a/third_party/README.md +++ b/third_party/README.md | |||
@@ -2,5 +2,3 @@ | |||
2 | 2 | ||
3 | All toxcore dependencies you want to build yourself should end up here, not in | 3 | All toxcore dependencies you want to build yourself should end up here, not in |
4 | the source root. This directory is exempt from code style checks. | 4 | the source root. This directory is exempt from code style checks. |
5 | |||
6 | TODO(iphydf): Change appveyor.yml to unpack dependencies here. | ||