wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

don't depend on or define UNICODE and _UNICODE on windows

This commit is contained in:
arvidn 2017-07-02 09:13:01 -04:00 committed by Arvid Norberg
parent 5c37eb174f
commit fab8af6be2
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -173,7 +173,6 @@ option(static_runtime "build libtorrent with static runtime" OFF)
option(pool-allocators "Uses a pool allocator for disk and piece buffers" ON) option(pool-allocators "Uses a pool allocator for disk and piece buffers" ON)
option(encryption "link against openssl and enable encryption" ON) option(encryption "link against openssl and enable encryption" ON)
option(dht "enable support for Mainline DHT" ON) option(dht "enable support for Mainline DHT" ON)
option(unicode "enable unicode support" ON)
option(deprecated-functions "enable deprecated functions for backwards compatibility" ON) option(deprecated-functions "enable deprecated functions for backwards compatibility" ON)
option(disk-stats "enable disk activity logging feature" OFF) option(disk-stats "enable disk activity logging feature" OFF)
option(exceptions "build with exception support" ON) option(exceptions "build with exception support" ON)
@ -321,10 +320,6 @@ if (NOT pool-allocators)
add_definitions(-DTORRENT_DISABLE_POOL_ALLOCATOR) add_definitions(-DTORRENT_DISABLE_POOL_ALLOCATOR)
endif() endif()
if (unicode)
add_definitions(-DUNICODE -D_UNICODE)
endif()
if (NOT deprecated-functions) if (NOT deprecated-functions)
add_definitions(-DTORRENT_NO_DEPRECATE) add_definitions(-DTORRENT_NO_DEPRECATE)
endif() endif()

2
Jamfile
View File

@ -748,8 +748,6 @@ lib torrent
<link>shared:<define>TORRENT_BUILDING_SHARED <link>shared:<define>TORRENT_BUILDING_SHARED
<define>BOOST_NO_DEPRECATED <define>BOOST_NO_DEPRECATED
<link>shared:<define>BOOST_SYSTEM_SOURCE <link>shared:<define>BOOST_SYSTEM_SOURCE
<target-os>windows:<define>UNICODE
<target-os>windows:<define>_UNICODE
<dht>on:<source>src/kademlia/$(KADEMLIA_SOURCES).cpp <dht>on:<source>src/kademlia/$(KADEMLIA_SOURCES).cpp
<dht>on:<source>ed25519/src/$(ED25519_SOURCES).cpp <dht>on:<source>ed25519/src/$(ED25519_SOURCES).cpp

2
examples/cmake/FindLibtorrentRasterbar.cmake
View File

@ -36,7 +36,7 @@ else()
-DTORRENT_USE_OPENSSL -DTORRENT_USE_OPENSSL
-DTORRENT_DISABLE_GEO_IP -DTORRENT_DISABLE_GEO_IP
-DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_ENABLE_CANCELIO
-DUNICODE -D_UNICODE -D_FILE_OFFSET_BITS=64) -D_FILE_OFFSET_BITS=64)
endif() endif()
if(NOT LibtorrentRasterbar_USE_STATIC_LIBS) if(NOT LibtorrentRasterbar_USE_STATIC_LIBS)