diff options
Diffstat (limited to '3rdparty/asio/src/Makefile.msc')
-rw-r--r-- | 3rdparty/asio/src/Makefile.msc | 131 |
1 files changed, 109 insertions, 22 deletions
diff --git a/3rdparty/asio/src/Makefile.msc b/3rdparty/asio/src/Makefile.msc index 7cb1c56d7f2..f8de17ad40d 100644 --- a/3rdparty/asio/src/Makefile.msc +++ b/3rdparty/asio/src/Makefile.msc @@ -4,6 +4,10 @@ BOOSTDIR = ../../boost_1_34_1 COMMON_CXXFLAGS = -nologo -EHac -GR -I. -I../include +!ifdef CXXLATEST +STD_CXXFLAGS = -std:c++latest -permissive- +!endif + !ifdef WARNINGS WARNINGS_CXXFLAGS = -W4 -wd4512 -wd4447 !endif @@ -34,7 +38,7 @@ TRACKING_CXXFLAGS = -DASIO_ENABLE_HANDLER_TRACKING ! ifdef STORE _WIN32_WINNT=0x0603 ! else -_WIN32_WINNT=0x0501 +_WIN32_WINNT=0x0601 ! endif !endif @@ -42,22 +46,26 @@ _WIN32_WINNT=0x0501 DEFINES = \ -DASIO_DISABLE_IOCP \ -D_WIN32_WINNT=$(_WIN32_WINNT) \ - -DBOOST_ALL_NO_LIB + -DBOOST_ALL_NO_LIB \ + -DBOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING !else ! ifdef STORE DEFINES = \ -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP \ -DBOOST_ALL_NO_LIB -D_WIN32_WINNT=$(_WIN32_WINNT) \ - -DUNICODE -D_UNICODE + -DUNICODE -D_UNICODE \ + -DBOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING ! else ! ifdef WINRT DEFINES = \ -ZW -FI SDKDDKVer.h -FI winapifamily.h -DWINAPI_FAMILY=WINAPI_PARTITION_APP \ - -DBOOST_ALL_NO_LIB + -DBOOST_ALL_NO_LIB \ + -DBOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING ! else DEFINES = \ -D_WIN32_WINNT=$(_WIN32_WINNT) \ - -DBOOST_ALL_NO_LIB + -DBOOST_ALL_NO_LIB \ + -DBOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING ! endif ! endif !endif @@ -72,11 +80,12 @@ SEPARATE_COMPILATION_CXXFLAGS = \ !ifdef STANDALONE STANDALONE_CXXFLAGS = -DASIO_STANDALONE !else -STANDALONE_CXXFLAGS = -I$(BOOSTDIR) +STANDALONE_CXXFLAGS = -I$(BOOSTDIR) -DASIO_ENABLE_BOOST !endif CXXFLAGS = \ $(COMMON_CXXFLAGS) \ + $(STD_CXXFLAGS) \ $(WARNINGS_CXXFLAGS) \ $(DEBUG_CXXFLAGS) \ $(UNICODE_CXXFLAGS) \ @@ -106,28 +115,70 @@ PERFORMANCE_TEST_EXES = \ tests\performance\server.exe UNIT_TEST_EXES = \ + tests\unit\associated_allocator.exe \ + tests\unit\associated_cancellation_slot.exe \ + tests\unit\associated_executor.exe \ + tests\unit\associator.exe \ + tests\unit\async_result.exe \ + tests\unit\awaitable.exe \ tests\unit\basic_datagram_socket.exe \ tests\unit\basic_deadline_timer.exe \ tests\unit\basic_raw_socket.exe \ tests\unit\basic_seq_packet_socket.exe \ tests\unit\basic_serial_port.exe \ tests\unit\basic_signal_set.exe \ + tests\unit\basic_socket.exe \ tests\unit\basic_socket_acceptor.exe \ tests\unit\basic_stream_socket.exe \ tests\unit\basic_streambuf.exe \ tests\unit\basic_waitable_timer.exe \ + tests\unit\bind_cancellation_slot.exe \ + tests\unit\bind_executor.exe \ tests\unit\buffered_read_stream.exe \ tests\unit\buffered_stream.exe \ tests\unit\buffered_write_stream.exe \ tests\unit\buffer.exe \ tests\unit\buffers_iterator.exe \ + tests\unit\cancellation_signal.exe \ + tests\unit\cancellation_state.exe \ + tests\unit\cancellation_type.exe \ + tests\unit\co_spawn.exe \ tests\unit\completion_condition.exe \ + tests\unit\compose.exe \ tests\unit\connect.exe \ tests\unit\coroutine.exe \ - tests\unit\datagram_socket_service.exe \ - tests\unit\deadline_timer_service.exe \ tests\unit\deadline_timer.exe \ + tests\unit\defer.exe \ + tests\unit\detached.exe \ + tests\unit\dispatch.exe \ tests\unit\error.exe \ + tests\unit\execution_context.exe \ + tests\unit\execution\any_executor.exe \ + tests\unit\execution\blocking.exe \ + tests\unit\execution\blocking_adaptation.exe \ + tests\unit\execution\bulk_execute.exe \ + tests\unit\execution\bulk_guarantee.exe \ + tests\unit\execution\connect.exe \ + tests\unit\execution\context_as.exe \ + tests\unit\execution\execute.exe \ + tests\unit\execution\executor.exe \ + tests\unit\execution\invocable_archetype.exe \ + tests\unit\execution\mapping.exe \ + tests\unit\execution\operation_state.exe \ + tests\unit\execution\outstanding_work.exe \ + tests\unit\execution\prefer_only.exe \ + tests\unit\execution\receiver.exe \ + tests\unit\execution\relationship.exe \ + tests\unit\execution\schedule.exe \ + tests\unit\execution\scheduler.exe \ + tests\unit\execution\sender.exe \ + tests\unit\execution\set_done.exe \ + tests\unit\execution\set_error.exe \ + tests\unit\execution\set_value.exe \ + tests\unit\execution\start.exe \ + tests\unit\execution\submit.exe \ + tests\unit\executor.exe \ + tests\unit\executor_work_guard.exe \ tests\unit\generic\basic_endpoint.exe \ tests\unit\generic\datagram_protocol.exe \ tests\unit\generic\raw_protocol.exe \ @@ -135,9 +186,14 @@ UNIT_TEST_EXES = \ tests\unit\generic\stream_protocol.exe \ tests\unit\high_resolution_timer.exe \ tests\unit\io_context.exe \ + tests\unit\io_context_strand.exe \ tests\unit\ip\address.exe \ tests\unit\ip\address_v4.exe \ + tests\unit\ip\address_v4_iterator.exe \ + tests\unit\ip\address_v4_range.exe \ tests\unit\ip\address_v6.exe \ + tests\unit\ip\address_v6_iterator.exe \ + tests\unit\ip\address_v6_range.exe \ tests\unit\ip\basic_endpoint.exe \ tests\unit\ip\basic_resolver.exe \ tests\unit\ip\basic_resolver_entry.exe \ @@ -146,46 +202,62 @@ UNIT_TEST_EXES = \ tests\unit\ip\host_name.exe \ tests\unit\ip\icmp.exe \ tests\unit\ip\multicast.exe \ + tests\unit\ip\network_v4.exe \ + tests\unit\ip\network_v6.exe \ tests\unit\ip\resolver_query_base.exe \ - tests\unit\ip\resolver_service.exe \ tests\unit\ip\tcp.exe \ tests\unit\ip\udp.exe \ tests\unit\ip\unicast.exe \ tests\unit\ip\v6_only.exe \ + tests\unit\local\basic_endpoint.exe \ + tests\unit\local\connect_pair.exe \ + tests\unit\local\datagram_protocol.exe \ + tests\unit\local\stream_protocol.exe \ tests\unit\is_read_buffered.exe \ tests\unit\is_write_buffered.exe \ + tests\unit\packaged_task.exe \ tests\unit\placeholders.exe \ - tests\unit\raw_socket_service.exe \ + tests\unit\post.exe \ tests\unit\read.exe \ tests\unit\read_at.exe \ tests\unit\read_until.exe \ - tests\unit\seq_packet_socket_service.exe \ + tests\unit\redirect_error.exe \ tests\unit\serial_port.exe \ tests\unit\serial_port_base.exe \ - tests\unit\serial_port_service.exe \ tests\unit\signal_set.exe \ - tests\unit\signal_set_service.exe \ - tests\unit\socket_acceptor_service.exe \ tests\unit\socket_base.exe \ - tests\unit\strand.exe \ + tests\unit\static_thread_pool.exe \ tests\unit\steady_timer.exe \ - tests\unit\stream_socket_service.exe \ + tests\unit\strand.exe \ tests\unit\streambuf.exe \ + tests\unit\system_context.exe \ + tests\unit\system_executor.exe \ tests\unit\system_timer.exe \ + tests\unit\this_coro.exe \ tests\unit\thread.exe \ + tests\unit\thread_pool.exe \ tests\unit\time_traits.exe \ - tests\unit\waitable_timer_service.exe \ - tests\unit\windows\basic_handle.exe \ + tests\unit\ts\buffer.exe \ + tests\unit\ts\executor.exe \ + tests\unit\ts\internet.exe \ + tests\unit\ts\io_context.exe \ + tests\unit\ts\net.exe \ + tests\unit\ts\netfwd.exe \ + tests\unit\ts\socket.exe \ + tests\unit\ts\timer.exe \ + tests\unit\use_awaitable.exe \ + tests\unit\use_future.exe \ + tests\unit\uses_executor.exe \ + tests\unit\wait_traits.exe \ tests\unit\windows\basic_object_handle.exe \ + tests\unit\windows\basic_overlapped_handle.exe \ tests\unit\windows\basic_random_access_handle.exe \ tests\unit\windows\basic_stream_handle.exe \ tests\unit\windows\object_handle.exe \ - tests\unit\windows\object_handle_service.exe \ + tests\unit\windows\overlapped_handle.exe \ tests\unit\windows\overlapped_ptr.exe \ tests\unit\windows\random_access_handle.exe \ - tests\unit\windows\random_access_handle_service.exe \ tests\unit\windows\stream_handle.exe \ - tests\unit\windows\stream_handle_service.exe \ tests\unit\write.exe \ tests\unit\write_at.exe @@ -220,9 +292,9 @@ CPP03_EXAMPLE_EXES = \ examples\cpp03\socks4\sync_client.exe \ examples\cpp03\timeouts\async_tcp_client.exe \ examples\cpp03\timeouts\blocking_tcp_client.exe \ + examples\cpp03\timeouts\blocking_token_tcp_client.exe \ examples\cpp03\timeouts\blocking_udp_client.exe \ examples\cpp03\timeouts\server.exe \ - examples\cpp03\timers\tick_count_timer.exe \ examples\cpp03\timers\time_t_timer.exe \ examples\cpp03\tutorial\timer1\timer.exe \ examples\cpp03\tutorial\timer2\timer.exe \ @@ -289,15 +361,24 @@ tests\unit\unit_test.obj: tests\unit\unit_test.cpp {tests\unit}.cpp{tests\unit}.exe: cl -Fe$@ -Fo$(<:.cpp=.obj) $(CXXFLAGS) $(DEFINES) $< $(LIBS) -link -opt:ref +{tests\unit\execution}.cpp{tests\unit\execution}.exe: + cl -Fe$@ -Fo$(<:.cpp=.obj) $(CXXFLAGS) $(DEFINES) $< $(LIBS) -link -opt:ref + {tests\unit\generic}.cpp{tests\unit\generic}.exe: cl -Fe$@ -Fo$(<:.cpp=.obj) $(CXXFLAGS) $(DEFINES) $< $(LIBS) -link -opt:ref {tests\unit\ip}.cpp{tests\unit\ip}.exe: cl -Fe$@ -Fo$(<:.cpp=.obj) $(CXXFLAGS) $(DEFINES) $< $(LIBS) -link -opt:ref +{tests\unit\local}.cpp{tests\unit\local}.exe: + cl -Fe$@ -Fo$(<:.cpp=.obj) $(CXXFLAGS) $(DEFINES) $< $(LIBS) -link -opt:ref + {tests\unit\ssl}.cpp{tests\unit\ssl}.exe: cl -Fe$@ -Fo$(<:.cpp=.obj) $(CXXFLAGS) $(SSL_CXXFLAGS) $(DEFINES) $< $(SSL_LIBS) $(LIBS) -link -opt:ref +{tests\unit\ts}.cpp{tests\unit\ts}.exe: + cl -Fe$@ -Fo$(<:.cpp=.obj) $(CXXFLAGS) $(DEFINES) $< $(LIBS) -link -opt:ref + {tests\unit\windows}.cpp{tests\unit\windows}.exe: cl -Fe$@ -Fo$(<:.cpp=.obj) $(CXXFLAGS) $(DEFINES) $< $(LIBS) -link -opt:ref @@ -388,6 +469,12 @@ tests\unit\unit_test.obj: tests\unit\unit_test.cpp {examples\cpp11\executors}.cpp{examples\cpp11\executors}.exe: cl -Fe$@ -Fo$(<:.cpp=.obj) $(CXXFLAGS) $(DEFINES) $< $(LIBS) -link -opt:ref +{examples\cpp11\operations}.cpp{examples\cpp11\operations}.exe: + cl -Fe$@ -Fo$(<:.cpp=.obj) $(CXXFLAGS) $(DEFINES) $< $(LIBS) -link -opt:ref + +{examples\cpp14\operations}.cpp{examples\cpp14\operations}.exe: + cl -Fe$@ -Fo$(<:.cpp=.obj) $(CXXFLAGS) $(DEFINES) $< $(LIBS) -link -opt:ref + examples\cpp03\http\server\http_server.exe: \ examples\cpp03\http\server\connection.cpp \ examples\cpp03\http\server\connection_manager.cpp \ |