diff options
| author |  Subv | 2014-12-08 23:52:27 -0500 |
|---|---|---|
| committer | Subv | 2014-12-31 10:51:44 -0500 |
| commit | 97a7381d29b69dbe760598e70669c16573304ad4 (patch) | |
| tree | f4e336af1e5cf5d72c2665470a96a9db73711ae7 /src/citra | |
| parent | Merge pull request #375 from lioncash/uops (diff) | |
| download | yuzu-97a7381d29b69dbe760598e70669c16573304ad4.tar.gz yuzu-97a7381d29b69dbe760598e70669c16573304ad4.tar.xz yuzu-97a7381d29b69dbe760598e70669c16573304ad4.zip | |
SOC_U: Preliminary implementation of sockets.
Stubbed CreateMemoryBlock
Using Berkeley sockets, and Winsock2.2 on Windows.
So far ftpony creates the socket and accepts incoming connections
SOC_U: Renamed functions to maintain consistency
Also prevents possible scope errors / conflicts with the actual Berkeley socket functions
SOCU: Close all the opened sockets when cleaning up SOCU
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 94f8d13c7..bbb3374f2 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt | |||
| @@ -24,10 +24,10 @@ endif() | |||
| 24 | if (APPLE) | 24 | if (APPLE) |
| 25 | target_link_libraries(citra iconv ${COREFOUNDATION_LIBRARY}) | 25 | target_link_libraries(citra iconv ${COREFOUNDATION_LIBRARY}) |
| 26 | elseif (WIN32) | 26 | elseif (WIN32) |
| 27 | target_link_libraries(citra winmm) | 27 | target_link_libraries(citra winmm wsock32 ws2_32) |
| 28 | if (MINGW) # GCC does not support codecvt, so use iconv instead | 28 | if (MINGW) # GCC does not support codecvt, so use iconv instead |
| 29 | target_link_libraries(citra iconv) | 29 | target_link_libraries(citra iconv) |
| 30 | endif() | 30 | endif() |
| 31 | else() # Unix | 31 | else() # Unix |
| 32 | target_link_libraries(citra rt) | 32 | target_link_libraries(citra rt) |
| 33 | endif() | 33 | endif() |