generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-17 19:25:55 +02:00
Code Issues Projects Releases Wiki Activity

merge to upstream

Browse Source
This commit is contained in:
Stoian Ivanov
2014-05-12 10:24:31 +03:00
parent acb71e0096 098d01b16f
commit d5991d6728
170 changed files with 3706 additions and 2455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -25,6 +25,7 @@ tools/curve_keygen
tests/test_resource tests/test_resource
tests/test_ipc_wildcard tests/test_ipc_wildcard
tests/test_stream_empty tests/test_stream_empty
tests/test_stream_timeout
tests/test_issue_566 tests/test_issue_566
tests/test_ctx_destroy tests/test_ctx_destroy
tests/test_term_endpoint tests/test_term_endpoint
@@ -90,6 +91,8 @@ tests/test_connect_rid
tests/test_srcfd tests/test_srcfd
tests/test_stream_disconnect tests/test_stream_disconnect
tests/test_proxy_chain tests/test_proxy_chain
tests/test_bind_src_address
tests/test_metadata
tests/test*.log tests/test*.log
tests/test*.trs tests/test*.trs
src/platform.hpp* src/platform.hpp*
@@ -122,3 +125,4 @@ foreign/openpgm/*
zeromq-*.tar.gz zeromq-*.tar.gz
zeromq-*.zip zeromq-*.zip
core core
build

54
CMakeLists.txt
View File

@@ -9,6 +9,31 @@ if(APPLE)
option(ZMQ_BUILD_FRAMEWORK "Build as OS X framework" ON) option(ZMQ_BUILD_FRAMEWORK "Build as OS X framework" ON)
endif() endif()
if(WIN32)
option(WITH_TWEETNACL "Build with tweetnacl" OFF)
else()
option(WITH_TWEETNACL "Build with tweetnacl" ON)
endif()
if(WITH_TWEETNACL)
add_definitions(-DHAVE_TWEETNACL -DHAVE_LIBSODIUM)
include_directories(
tweetnacl/contrib/randombytes
tweetnacl/src
)
set(TWEETNACL_SOURCES
tweetnacl/src/tweetnacl.c
)
if(WIN32)
else()
list(APPEND TWEETNACL_SOURCES tweetnacl/contrib/randombytes/devurandom.c)
endif()
else()
find_library(SODIUM_FOUND sodium)
endif()
set(POLLER "" CACHE STRING "Choose polling system. valid values are set(POLLER "" CACHE STRING "Choose polling system. valid values are
kqueue, epoll, devpoll, poll or select [default=autodetect]") kqueue, epoll, devpoll, poll or select [default=autodetect]")
@@ -362,6 +387,7 @@ set(cxx-sources
lb.cpp lb.cpp
mailbox.cpp mailbox.cpp
mechanism.cpp mechanism.cpp
metadata.cpp
msg.cpp msg.cpp
mtrie.cpp mtrie.cpp
object.cpp object.cpp
@@ -469,6 +495,10 @@ foreach(source ${cxx-sources})
list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/src/${source}) list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/src/${source})
endforeach() endforeach()
foreach(source ${TWEETNACL_SOURCES})
list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/${source})
endforeach()
foreach(source ${rc-sources}) foreach(source ${rc-sources})
list(APPEND sources ${CMAKE_CURRENT_BINARY_DIR}/${source}) list(APPEND sources ${CMAKE_CURRENT_BINARY_DIR}/${source})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/${source}.in ${CMAKE_CURRENT_BINARY_DIR}/${source}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/${source}.in ${CMAKE_CURRENT_BINARY_DIR}/${source})
@@ -582,7 +612,7 @@ else()
endif() endif()
endif() endif()
target_link_libraries(libzmq ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(libzmq ${SODIUM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
if(HAVE_WS2_32) if(HAVE_WS2_32)
target_link_libraries(libzmq ws2_32) target_link_libraries(libzmq ws2_32)
elseif(HAVE_WS2) elseif(HAVE_WS2)
@@ -685,15 +715,17 @@ if(ZMQ_BUILD_TESTS)
test_connect_rid test_connect_rid
) )
if(NOT WIN32) if(NOT WIN32)
list(APPEND tests list(APPEND tests
test_monitor test_monitor
test_pair_ipc test_pair_ipc
test_reqrep_ipc test_reqrep_ipc
test_fork test_abstract_ipc
test_abstract_ipc test_proxy
test_proxy test_filter_ipc
test_filter_ipc )
) if(HAVE_FORK)
list(APPEND tests test_fork)
endif()
endif() endif()
foreach(test ${tests}) foreach(test ${tests})
@@ -701,7 +733,7 @@ if(ZMQ_BUILD_TESTS)
target_link_libraries(${test} libzmq) target_link_libraries(${test} libzmq)
if(RT_LIBRARY) if(RT_LIBRARY)
target_link_libraries(${test} ${RT_LIBRARY}) target_link_libraries(${test} ${RT_LIBRARY} )
endif() endif()
if(WIN32) if(WIN32)
add_test(NAME ${test} WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} COMMAND ${test}) add_test(NAME ${test} WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH} COMMAND ${test})

102
builds/msvc/Makefile.am
View File

@@ -3,14 +3,31 @@ LIBZMQ_DIST = vs2008/libzmq.sln \
vs2010/libzmq.sln \ vs2010/libzmq.sln \
vs2010/libzmq/libzmq.vcxproj \ vs2010/libzmq/libzmq.vcxproj \
vs2010/libzmq/libzmq.vcxproj.filters \ vs2010/libzmq/libzmq.vcxproj.filters \
vs2010/libzmq/libzmq.props \
vs2010/libzmq/libzmq.xml \
vs2010/libzmq.import.props \
vs2010/libzmq.import.xml \
vs2010/libsodium.import.props \
vs2010/libsodium.import.xml \
vs2012/libzmq.sln \ vs2012/libzmq.sln \
vs2012/libzmq/libzmq.vcxproj \ vs2012/libzmq/libzmq.vcxproj \
vs2012/libzmq/libzmq.vcxproj.filters \ vs2012/libzmq/libzmq.vcxproj.filters \
vs2012/libzmq/libzmq.props \
vs2012/libzmq/libzmq.xml \
vs2012/libzmq.import.props \
vs2012/libzmq.import.xml \
vs2012/libsodium.import.props \
vs2012/libsodium.import.xml \
vs2013/libzmq.sln \ vs2013/libzmq.sln \
vs2013/libzmq/libzmq.vcxproj \ vs2013/libzmq/libzmq.vcxproj \
vs2013/libzmq/libzmq.vcxproj.filters \ vs2013/libzmq/libzmq.vcxproj.filters \
vs2013/libzmq/libzmq.props \ vs2013/libzmq/libzmq.props \
platform.hpp errno.cpp errno.hpp vs2013/libzmq/libzmq.xml \
vs2013/libzmq.import.props \
vs2013/libzmq.import.xml \
vs2013/libsodium.import.props \
vs2013/libsodium.import.xml \
platform.hpp errno.cpp errno.hpp resource.h resource.rc
PERF_DIST = vs2008/c_local_lat/c_local_lat.vcproj \ PERF_DIST = vs2008/c_local_lat/c_local_lat.vcproj \
vs2008/c_local_thr/c_local_thr.vcproj \ vs2008/c_local_thr/c_local_thr.vcproj \
@@ -24,60 +41,59 @@ PERF_DIST = vs2008/c_local_lat/c_local_lat.vcproj \
vs2010/c_remote_thr/c_remote_thr.vcxproj \ vs2010/c_remote_thr/c_remote_thr.vcxproj \
vs2010/inproc_lat/inproc_lat.vcxproj \ vs2010/inproc_lat/inproc_lat.vcxproj \
vs2010/inproc_thr/inproc_thr.vcxproj \ vs2010/inproc_thr/inproc_thr.vcxproj \
vs2010/c_local_lat/c_local_lat.props \
vs2010/c_local_thr/c_local_thr.props \
vs2010/c_remote_lat/c_remote_lat.props \
vs2010/c_remote_thr/c_remote_thr.props \
vs2010/inproc_lat/inproc_lat.props \
vs2010/inproc_thr/inproc_thr.props \
vs2012/c_local_lat/c_local_lat.vcxproj \ vs2012/c_local_lat/c_local_lat.vcxproj \
vs2012/c_local_thr/c_local_thr.vcxproj \ vs2012/c_local_thr/c_local_thr.vcxproj \
vs2012/c_remote_lat/c_remote_lat.vcxproj \ vs2012/c_remote_lat/c_remote_lat.vcxproj \
vs2012/c_remote_thr/c_remote_thr.vcxproj \ vs2012/c_remote_thr/c_remote_thr.vcxproj \
vs2012/inproc_lat/inproc_lat.vcxproj \ vs2012/inproc_lat/inproc_lat.vcxproj \
vs2012/inproc_thr/inproc_thr.vcxproj \ vs2012/inproc_thr/inproc_thr.vcxproj \
vs2012/c_local_lat/c_local_lat.props \
vs2012/c_local_thr/c_local_thr.props \
vs2012/c_remote_lat/c_remote_lat.props \
vs2012/c_remote_thr/c_remote_thr.props \
vs2012/inproc_lat/inproc_lat.props \
vs2012/inproc_thr/inproc_thr.props \
vs2013/c_local_lat/c_local_lat.vcxproj \ vs2013/c_local_lat/c_local_lat.vcxproj \
vs2013/c_local_thr/c_local_thr.vcxproj \ vs2013/c_local_thr/c_local_thr.vcxproj \
vs2013/c_remote_lat/c_remote_lat.vcxproj \ vs2013/c_remote_lat/c_remote_lat.vcxproj \
vs2013/c_remote_thr/c_remote_thr.vcxproj \ vs2013/c_remote_thr/c_remote_thr.vcxproj \
vs2013/inproc_lat/inproc_lat.vcxproj \ vs2013/inproc_lat/inproc_lat.vcxproj \
vs2013/inproc_thr/inproc_thr.vcxproj vs2013/inproc_thr/inproc_thr.vcxproj \
vs2013/c_local_lat/c_local_lat.props \
vs2013/c_local_thr/c_local_thr.props \
vs2013/c_remote_lat/c_remote_lat.props \
vs2013/c_remote_thr/c_remote_thr.props \
vs2013/inproc_lat/inproc_lat.props \
vs2013/inproc_thr/inproc_thr.props
PROPERTIES_DIST = vs2010/properties/Common.props \ PROPERTIES_DIST = properties/Common.props \
vs2010/properties/Debug.props \ properties/Console.props \
vs2010/properties/Dynamic.props \ properties/ConsoleDebugDynamic.props \
vs2010/properties/Executable.props \ properties/ConsoleDebugLinkTimeCodeGeneration.props \
vs2010/properties/Precompiled.props \ properties/ConsoleDebugStatic.props \
vs2010/properties/Release.props \ properties/ConsoleReleaseDynamic.props \
vs2010/properties/Static.props \ properties/ConsoleReleaseLinkTimeCodeGeneration.props \
vs2010/properties/Win32.props \ properties/ConsoleReleaseStatic.props \
vs2010/properties/Win32_Release.props \ properties/Debug.props \
vs2010/properties/WithOpenPGM.props \ properties/Dynamic.props \
vs2010/properties/x64.props \ properties/DynamicDebug.props \
vs2010/properties/ZeroMQ.props \ properties/DynamicRelease.props \
vs2010/properties/ZeroMQ_Static.props \ properties/LinkTimeCodeGeneration.props \
vs2012/properties/Common.props \ properties/Release.props \
vs2012/properties/Debug.props \ properties/Static.props \
vs2012/properties/Dynamic.props \ properties/StaticDebug.props \
vs2012/properties/Executable.props \ properties/StaticDebugLinkTimeCodeGeneration.props \
vs2012/properties/Precompiled.props \ properties/StaticLinkTimeCodeGeneration.props \
vs2012/properties/Release.props \ properties/StaticRelease.props \
vs2012/properties/Static.props \ properties/StaticReleaseLinkTimeCodeGeneration.props \
vs2012/properties/Win32.props \ properties/Win32.props \
vs2012/properties/Win32_Release.props \ properties/x64.props
vs2012/properties/WithOpenPGM.props \
vs2012/properties/x64.props \
vs2012/properties/ZeroMQ.props \
vs2012/properties/ZeroMQ_Static.props \
vs2013/Common.props \
vs2013/Debug.props \
vs2013/Dynamic.props \
vs2013/DynamicDebug.props \
vs2013/DynamicRelease.props \
vs2013/LinkTimeCodeGeneration.props \
vs2013/Release.props \
vs2013/Static.props \
vs2013/StaticDebug.props \
vs2013/StaticDebugLinkTimeCodeGeneration.props \
vs2013/StaticLinkTimeCodeGeneration.props \
vs2013/StaticRelease.props \
vs2013/StaticReleaseLinkTimeCodeGeneration.props \
vs2013/Win32.props \
vs2013/x64.props
PRECOMPILED_DIST = ../../src/precompiled.hpp \ PRECOMPILED_DIST = ../../src/precompiled.hpp \
../../src/precompiled.cpp ../../src/precompiled.cpp

0
builds/msvc/vs2010/properties/Common.props → builds/msvc/properties/Common.props
View File

0
builds/msvc/vs2010/properties/Console.props → builds/msvc/properties/Console.props
View File

0
builds/msvc/vs2010/properties/ConsoleDebugDynamic.props → builds/msvc/properties/ConsoleDebugDynamic.props
View File

0
builds/msvc/vs2010/properties/ConsoleDebugLinkTimeCodeGeneration.props → builds/msvc/properties/ConsoleDebugLinkTimeCodeGeneration.props
View File

0
builds/msvc/vs2010/properties/ConsoleDebugStatic.props → builds/msvc/properties/ConsoleDebugStatic.props
View File

0
builds/msvc/vs2010/properties/ConsoleReleaseDynamic.props → builds/msvc/properties/ConsoleReleaseDynamic.props
View File

0
builds/msvc/vs2010/properties/ConsoleReleaseLinkTimeCodeGeneration.props → builds/msvc/properties/ConsoleReleaseLinkTimeCodeGeneration.props
View File

0
builds/msvc/vs2010/properties/ConsoleReleaseStatic.props → builds/msvc/properties/ConsoleReleaseStatic.props
View File

0
builds/msvc/vs2010/properties/Debug.props → builds/msvc/properties/Debug.props
View File

0
builds/msvc/vs2010/properties/Dynamic.props → builds/msvc/properties/Dynamic.props
View File

0
builds/msvc/vs2010/properties/DynamicDebug.props → builds/msvc/properties/DynamicDebug.props
View File

0
builds/msvc/vs2010/properties/DynamicRelease.props → builds/msvc/properties/DynamicRelease.props
View File

0
builds/msvc/vs2010/properties/LinkTimeCodeGeneration.props → builds/msvc/properties/LinkTimeCodeGeneration.props
View File

0
builds/msvc/vs2010/properties/Release.props → builds/msvc/properties/Release.props
View File

0
builds/msvc/vs2010/properties/Static.props → builds/msvc/properties/Static.props
View File

0
builds/msvc/vs2010/properties/StaticDebug.props → builds/msvc/properties/StaticDebug.props
View File

0
builds/msvc/vs2010/properties/StaticDebugLinkTimeCodeGeneration.props → builds/msvc/properties/StaticDebugLinkTimeCodeGeneration.props
View File

0
builds/msvc/vs2010/properties/StaticLinkTimeCodeGeneration.props → builds/msvc/properties/StaticLinkTimeCodeGeneration.props
View File

0
builds/msvc/vs2010/properties/StaticRelease.props → builds/msvc/properties/StaticRelease.props
View File

0
builds/msvc/vs2010/properties/StaticReleaseLinkTimeCodeGeneration.props → builds/msvc/properties/StaticReleaseLinkTimeCodeGeneration.props
View File

0
builds/msvc/vs2010/properties/Win32.props → builds/msvc/properties/Win32.props
View File

0
builds/msvc/vs2010/properties/x64.props → builds/msvc/properties/x64.props
View File

2
builds/msvc/resource.h
View File

@@ -1,6 +1,6 @@
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by libzmq.rc // Used by resource.rc
// Next default values for new objects // Next default values for new objects
// //

0
builds/msvc/libzmq.rc → builds/msvc/resource.rc
View File

48
builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

48
builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

1
builds/msvc/vs2010/libzmq.import.props
View File

@@ -17,6 +17,7 @@
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>

4
builds/msvc/vs2010/libzmq.import.xml
View File

@@ -16,6 +16,10 @@
<EnumValue Name="" DisplayName="No" /> <EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" /> <EnumValue Name="true" DisplayName="Yes" />
</EnumProperty> </EnumProperty>
<EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
</Rule> </Rule>
<Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1"> <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
<Rule.Categories> <Rule.Categories>

2
builds/msvc/vs2010/libzmq/libzmq.props
View File

@@ -29,6 +29,7 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
@@ -65,6 +66,7 @@
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild"> <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-openpgm : $(Option-openpgm)" Importance="high"/> <Message Text="Option-openpgm : $(Option-openpgm)" Importance="high"/>
<Message Text="Option-sodium : $(Option-sodium)" Importance="high"/> <Message Text="Option-sodium : $(Option-sodium)" Importance="high"/>
<Message Text="Option-gssapi : $(Option-gssapi)" Importance="high"/>
</Target> </Target>
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild"> <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">

50
builds/msvc/vs2010/libzmq/libzmq.vcxproj
View File

@@ -99,74 +99,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicDebug.props" /> <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicRelease.props" /> <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicDebug.props" /> <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicRelease.props" /> <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticDebug.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticRelease.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticDebug.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticRelease.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq.h" /> <ClInclude Include="..\..\..\..\include\zmq.h" />
@@ -334,7 +334,7 @@
<Xml Include="..\..\..\..\packaging\nuget\package.xml" /> <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\..\libzmq.rc" /> <ResourceCompile Include="..\..\resource.rc" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project> </Project>

20
builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
View File

@@ -205,6 +205,15 @@
<ClCompile Include="..\..\..\..\src\curve_server.cpp"> <ClCompile Include="..\..\..\..\src\curve_server.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq_utils.h"> <ClInclude Include="..\..\..\..\include\zmq_utils.h">
@@ -456,6 +465,15 @@
<ClInclude Include="..\..\..\..\src\curve_server.hpp"> <ClInclude Include="..\..\..\..\src\curve_server.hpp">
<Filter>src\include</Filter> <Filter>src\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
<Filter>src\include</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="include"> <Filter Include="include">
@@ -497,7 +515,7 @@
</Xml> </Xml>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\..\libzmq.rc"> <ResourceCompile Include="..\..\resource.rc">
<Filter>resource</Filter> <Filter>resource</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>

5
builds/msvc/vs2010/libzmq/libzmq.xml
View File

@@ -4,6 +4,7 @@
<Rule.Categories> <Rule.Categories>
<Category Name="openpgm" DisplayName="openpgm" /> <Category Name="openpgm" DisplayName="openpgm" />
<Category Name="sodium" DisplayName="sodium" /> <Category Name="sodium" DisplayName="sodium" />
<Category Name="gssapi" DisplayName="gssapi" />
</Rule.Categories> </Rule.Categories>
<Rule.DataSource> <Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" /> <DataSource Persistence="ProjectFile" ItemType="" />
@@ -16,5 +17,9 @@
<EnumValue Name="" DisplayName="No" /> <EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" /> <EnumValue Name="true" DisplayName="Yes" />
</EnumProperty> </EnumProperty>
<EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
</Rule> </Rule>
</ProjectSchemaDefinitions> </ProjectSchemaDefinitions>

48
builds/msvc/vs2010/local_lat/local_lat.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

48
builds/msvc/vs2010/local_thr/local_thr.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

48
builds/msvc/vs2010/remote_lat/remote_lat.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

48
builds/msvc/vs2010/remote_thr/remote_thr.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

48
builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

48
builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

1
builds/msvc/vs2012/libzmq.import.props
View File

@@ -18,6 +18,7 @@
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>

4
builds/msvc/vs2012/libzmq.import.xml
View File

@@ -16,6 +16,10 @@
<EnumValue Name="" DisplayName="No" /> <EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" /> <EnumValue Name="true" DisplayName="Yes" />
</EnumProperty> </EnumProperty>
<EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
</Rule> </Rule>
<Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1"> <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
<Rule.Categories> <Rule.Categories>

2
builds/msvc/vs2012/libzmq/libzmq.props
View File

@@ -29,6 +29,7 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
@@ -65,6 +66,7 @@
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild"> <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-openpgm : $(Option-openpgm)" Importance="high"/> <Message Text="Option-openpgm : $(Option-openpgm)" Importance="high"/>
<Message Text="Option-sodium : $(Option-sodium)" Importance="high"/> <Message Text="Option-sodium : $(Option-sodium)" Importance="high"/>
<Message Text="Option-gssapi : $(Option-gssapi)" Importance="high"/>
</Target> </Target>
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild"> <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">

50
builds/msvc/vs2012/libzmq/libzmq.vcxproj
View File

@@ -99,74 +99,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicDebug.props" /> <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicRelease.props" /> <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicDebug.props" /> <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicRelease.props" /> <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticDebug.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticRelease.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticDebug.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticRelease.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq.h" /> <ClInclude Include="..\..\..\..\include\zmq.h" />
@@ -334,7 +334,7 @@
<Xml Include="..\..\..\..\packaging\nuget\package.xml" /> <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\..\libzmq.rc" /> <ResourceCompile Include="..\..\resource.rc" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project> </Project>

20
builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
View File

@@ -205,6 +205,15 @@
<ClCompile Include="..\..\..\..\src\curve_server.cpp"> <ClCompile Include="..\..\..\..\src\curve_server.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq_utils.h"> <ClInclude Include="..\..\..\..\include\zmq_utils.h">
@@ -456,6 +465,15 @@
<ClInclude Include="..\..\..\..\src\curve_server.hpp"> <ClInclude Include="..\..\..\..\src\curve_server.hpp">
<Filter>src\include</Filter> <Filter>src\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
<Filter>src\include</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="include"> <Filter Include="include">
@@ -497,7 +515,7 @@
</Xml> </Xml>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\..\libzmq.rc"> <ResourceCompile Include="..\..\resource.rc">
<Filter>resource</Filter> <Filter>resource</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>

5
builds/msvc/vs2012/libzmq/libzmq.xml
View File

@@ -4,6 +4,7 @@
<Rule.Categories> <Rule.Categories>
<Category Name="openpgm" DisplayName="openpgm" /> <Category Name="openpgm" DisplayName="openpgm" />
<Category Name="sodium" DisplayName="sodium" /> <Category Name="sodium" DisplayName="sodium" />
<Category Name="gssapi" DisplayName="gssapi" />
</Rule.Categories> </Rule.Categories>
<Rule.DataSource> <Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" /> <DataSource Persistence="ProjectFile" ItemType="" />
@@ -16,5 +17,9 @@
<EnumValue Name="" DisplayName="No" /> <EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" /> <EnumValue Name="true" DisplayName="Yes" />
</EnumProperty> </EnumProperty>
<EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
</Rule> </Rule>
</ProjectSchemaDefinitions> </ProjectSchemaDefinitions>

48
builds/msvc/vs2012/local_lat/local_lat.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

48
builds/msvc/vs2012/local_thr/local_thr.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

26
builds/msvc/vs2012/properties/Common.props
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PropertySheetDisplayName>Common Settings</_PropertySheetDisplayName>
<CharacterSet>Unicode</CharacterSet>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<!-- Windows and CRT definitions for unicode. Note that Linux only supports unicode so char is 16 bit. -->
<PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<Target Name="ConfigInfo" BeforeTargets="PrepareForBuild">
<Message Text="ConfigurationType : $(ConfigurationType)" Importance="high"/>
<Message Text="Configuration : $(Configuration)" Importance="high"/>
<Message Text="PlatformToolset : $(PlatformToolset)" Importance="high"/>
<Message Text="Building..." Importance="high"/>
</Target>
</Project>

20
builds/msvc/vs2012/properties/Console.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Common.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Application</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
</Project>

21
builds/msvc/vs2012/properties/ConsoleDebugDynamic.props
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Console.props" />
<Import Project="Debug.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Debug Dynamic</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT dynamically when building a dynamic library is conventional. -->
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<LinkIncremental>true</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
</Project>

21
builds/msvc/vs2012/properties/ConsoleDebugLinkTimeCodeGeneration.props
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Console.props" />
<Import Project="Debug.props" />
<Import Project="LinkTimeCodeGeneration.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Debug Link Time Code Generation Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<LinkIncremental>false</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
</Project>

20
builds/msvc/vs2012/properties/ConsoleDebugStatic.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Console.props" />
<Import Project="Debug.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Debug Static</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<LinkIncremental>true</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
</Project>

20
builds/msvc/vs2012/properties/ConsoleReleaseDynamic.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Console.props" />
<Import Project="Release.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Release Dynamic</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT dynamically when building a dynamic library is conventional. -->
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
</Project>

20
builds/msvc/vs2012/properties/ConsoleReleaseLinkTimeCodeGeneration.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Console.props" />
<Import Project="Release.props" />
<Import Project="LinkTimeCodeGeneration.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Release Link Time Code Generation Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
</Project>

19
builds/msvc/vs2012/properties/ConsoleReleaseStatic.props
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Console.props" />
<Import Project="Release.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Release Static</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
</Project>

28
builds/msvc/vs2012/properties/Debug.props
View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PropertySheetDisplayName>Debug Configuration</_PropertySheetDisplayName>
<!-- RootNamespace is used to deconflict output files from differing project versions. -->
<IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
<OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile><DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
</Project>

18
builds/msvc/vs2012/properties/Dynamic.props
View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Common.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Dynamic Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
</Project>

21
builds/msvc/vs2012/properties/DynamicDebug.props
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Dynamic.props" />
<Import Project="Debug.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Dynamic Debug Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT dynamically when building a dynamic library is conventional. -->
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<LinkIncremental>true</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
</Project>

20
builds/msvc/vs2012/properties/DynamicRelease.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Dynamic.props" />
<Import Project="Release.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Dynamic Release Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT dynamically when building a dynamic library is conventional. -->
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
</Project>

20
builds/msvc/vs2012/properties/LinkTimeCodeGeneration.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PropertySheetDisplayName>Link Time Code Generation Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
<Link>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<Lib>
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
</ItemDefinitionGroup>
</Project>

40
builds/msvc/vs2012/properties/Release.props
View File

@@ -1,40 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PropertySheetDisplayName>Release Configuration</_PropertySheetDisplayName>
<!-- RootNamespace is used to deconflict output files from differing project versions. -->
<IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
<OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\</OutDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalOptions>/Oy- %(AdditionalOptions)</AdditionalOptions>
<!--<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>-->
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<MinimalRebuild>false</MinimalRebuild>
<Optimization>MaxSpeed</Optimization>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<!--<GenerateDebugInformation>true</GenerateDebugInformation>-->
<ImportLibrary>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib</ImportLibrary>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
<ClCompile>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
</ItemDefinitionGroup>
</Project>

18
builds/msvc/vs2012/properties/Static.props
View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Common.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Static Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
</Project>

21
builds/msvc/vs2012/properties/StaticDebug.props
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Static.props" />
<Import Project="Debug.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Static Debug Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT statically when building a static library is conventional. -->
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<LinkIncremental>true</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
</Project>

21
builds/msvc/vs2012/properties/StaticDebugLinkTimeCodeGeneration.props
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Debug.props" />
<Import Project="StaticLinkTimeCodeGeneration.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Static Debug Link Time Code Generation Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT statically when building a static library is conventional. -->
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<LinkIncremental>false</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
</Project>

17
builds/msvc/vs2012/properties/StaticLinkTimeCodeGeneration.props
View File

@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Static.props" />
<Import Project="LinkTimeCodeGeneration.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Static Link Time Code Generation Library</_PropertySheetDisplayName>
<!-- This overrides Static.props->Common.props->TargetName and therefore this
reference must always be set after Static.props->Common.props is included. -->
<TargetName>$(TargetName).ltcg</TargetName>
</PropertyGroup>
</Project>

20
builds/msvc/vs2012/properties/StaticRelease.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Static.props" />
<Import Project="Release.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Static Release Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT statically when building a static library is conventional. -->
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
</Project>

20
builds/msvc/vs2012/properties/StaticReleaseLinkTimeCodeGeneration.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Release.props" />
<Import Project="StaticLinkTimeCodeGeneration.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Static Release Link Time Code Generation Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT statically when building a static library is conventional. -->
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
</Project>

20
builds/msvc/vs2012/properties/Win32.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PropertySheetDisplayName>Win32 Settings</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>WIN32;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<Lib>
<AdditionalOptions>/MACHINE:X86 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
</Project>

23
builds/msvc/vs2012/properties/x64.props
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PropertySheetDisplayName>x64 Settings</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Note that Win64 defines may cause WIN32 to become defined when using windows headers,
but _WIN32 implies Windows 32 bit or above. If the standard headers are not included
these are sometimes required even for 64 bit builds and should never cause harm there.-->
<PreprocessorDefinitions>WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<Lib>
<AdditionalOptions>/MACHINE:X64 %(AdditionalOptions)</AdditionalOptions>
</Lib>
</ItemDefinitionGroup>
</Project>

48
builds/msvc/vs2012/remote_lat/remote_lat.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

48
builds/msvc/vs2012/remote_thr/remote_thr.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

48
builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

48
builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

1
builds/msvc/vs2013/libzmq.import.props
View File

@@ -23,6 +23,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>

4
builds/msvc/vs2013/libzmq.import.xml
View File

@@ -16,6 +16,10 @@
<EnumValue Name="" DisplayName="No" /> <EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" /> <EnumValue Name="true" DisplayName="Yes" />
</EnumProperty> </EnumProperty>
<EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
</Rule> </Rule>
<Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1"> <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
<Rule.Categories> <Rule.Categories>

2
builds/msvc/vs2013/libzmq/libzmq.props
View File

@@ -29,6 +29,7 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
@@ -65,6 +66,7 @@
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild"> <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-openpgm : $(Option-openpgm)" Importance="high"/> <Message Text="Option-openpgm : $(Option-openpgm)" Importance="high"/>
<Message Text="Option-sodium : $(Option-sodium)" Importance="high"/> <Message Text="Option-sodium : $(Option-sodium)" Importance="high"/>
<Message Text="Option-gssapi : $(Option-gssapi)" Importance="high"/>
</Target> </Target>
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild"> <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">

56
builds/msvc/vs2013/libzmq/libzmq.vcxproj
View File

@@ -99,74 +99,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicDebug.props" /> <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicRelease.props" /> <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicDebug.props" /> <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicRelease.props" /> <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticDebug.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticRelease.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticDebug.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\StaticRelease.props" /> <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq.h" /> <ClInclude Include="..\..\..\..\include\zmq.h" />
@@ -189,6 +189,9 @@
<ClInclude Include="..\..\..\..\src\err.hpp" /> <ClInclude Include="..\..\..\..\src\err.hpp" />
<ClInclude Include="..\..\..\..\src\fd.hpp" /> <ClInclude Include="..\..\..\..\src\fd.hpp" />
<ClInclude Include="..\..\..\..\src\fq.hpp" /> <ClInclude Include="..\..\..\..\src\fq.hpp" />
<ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
<ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
<ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
<ClInclude Include="..\..\..\..\src\i_engine.hpp" /> <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
<ClInclude Include="..\..\..\..\src\i_poll_events.hpp" /> <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
<ClInclude Include="..\..\..\..\src\io_object.hpp" /> <ClInclude Include="..\..\..\..\src\io_object.hpp" />
@@ -265,6 +268,9 @@
<ClCompile Include="..\..\..\..\src\epoll.cpp" /> <ClCompile Include="..\..\..\..\src\epoll.cpp" />
<ClCompile Include="..\..\..\..\src\err.cpp" /> <ClCompile Include="..\..\..\..\src\err.cpp" />
<ClCompile Include="..\..\..\..\src\fq.cpp" /> <ClCompile Include="..\..\..\..\src\fq.cpp" />
<ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
<ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
<ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
<ClCompile Include="..\..\..\..\src\io_object.cpp" /> <ClCompile Include="..\..\..\..\src\io_object.cpp" />
<ClCompile Include="..\..\..\..\src\io_thread.cpp" /> <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
<ClCompile Include="..\..\..\..\src\ip.cpp" /> <ClCompile Include="..\..\..\..\src\ip.cpp" />
@@ -334,7 +340,7 @@
<Xml Include="..\..\..\..\packaging\nuget\package.xml" /> <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\..\libzmq.rc" /> <ResourceCompile Include="..\..\resource.rc" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project> </Project>

20
builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
View File

@@ -205,6 +205,15 @@
<ClCompile Include="..\..\..\..\src\curve_server.cpp"> <ClCompile Include="..\..\..\..\src\curve_server.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq_utils.h"> <ClInclude Include="..\..\..\..\include\zmq_utils.h">
@@ -456,6 +465,15 @@
<ClInclude Include="..\..\..\..\src\curve_server.hpp"> <ClInclude Include="..\..\..\..\src\curve_server.hpp">
<Filter>src\include</Filter> <Filter>src\include</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
<Filter>src\include</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="include"> <Filter Include="include">
@@ -497,7 +515,7 @@
</Xml> </Xml>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\..\libzmq.rc"> <ResourceCompile Include="..\..\resource.rc">
<Filter>resource</Filter> <Filter>resource</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>

5
builds/msvc/vs2013/libzmq/libzmq.xml
View File

@@ -4,6 +4,7 @@
<Rule.Categories> <Rule.Categories>
<Category Name="openpgm" DisplayName="openpgm" /> <Category Name="openpgm" DisplayName="openpgm" />
<Category Name="sodium" DisplayName="sodium" /> <Category Name="sodium" DisplayName="sodium" />
<Category Name="gssapi" DisplayName="gssapi" />
</Rule.Categories> </Rule.Categories>
<Rule.DataSource> <Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" /> <DataSource Persistence="ProjectFile" ItemType="" />
@@ -16,5 +17,9 @@
<EnumValue Name="" DisplayName="No" /> <EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" /> <EnumValue Name="true" DisplayName="Yes" />
</EnumProperty> </EnumProperty>
<EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
</Rule> </Rule>
</ProjectSchemaDefinitions> </ProjectSchemaDefinitions>

48
builds/msvc/vs2013/local_lat/local_lat.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

48
builds/msvc/vs2013/local_thr/local_thr.vcxproj
View File

@@ -64,74 +64,74 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseDynamic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" /> <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleDebugStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" /> <Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\ConsoleReleaseStatic.props" /> <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" /> <Import Project="$(ProjectDir)..\..\properties\x64.props" />
</ImportGroup> </ImportGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\perf\platform.hpp" /> <ClInclude Include="..\..\..\..\perf\platform.hpp" />

26
builds/msvc/vs2013/properties/Common.props
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PropertySheetDisplayName>Common Settings</_PropertySheetDisplayName>
<CharacterSet>Unicode</CharacterSet>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<!-- Windows and CRT definitions for unicode. Note that Linux only supports unicode so char is 16 bit. -->
<PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<Target Name="ConfigInfo" BeforeTargets="PrepareForBuild">
<Message Text="ConfigurationType : $(ConfigurationType)" Importance="high"/>
<Message Text="Configuration : $(Configuration)" Importance="high"/>
<Message Text="PlatformToolset : $(PlatformToolset)" Importance="high"/>
<Message Text="Building..." Importance="high"/>
</Target>
</Project>

20
builds/msvc/vs2013/properties/Console.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Common.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Application</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
</Project>

21
builds/msvc/vs2013/properties/ConsoleDebugDynamic.props
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Console.props" />
<Import Project="Debug.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Debug Dynamic</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT dynamically when building a dynamic library is conventional. -->
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<LinkIncremental>true</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
</Project>

21
builds/msvc/vs2013/properties/ConsoleDebugLinkTimeCodeGeneration.props
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Console.props" />
<Import Project="Debug.props" />
<Import Project="LinkTimeCodeGeneration.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Debug Link Time Code Generation Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<LinkIncremental>false</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
</Project>

20
builds/msvc/vs2013/properties/ConsoleDebugStatic.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Console.props" />
<Import Project="Debug.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Debug Static</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<LinkIncremental>true</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
</Project>

20
builds/msvc/vs2013/properties/ConsoleReleaseDynamic.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Console.props" />
<Import Project="Release.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Release Dynamic</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT dynamically when building a dynamic library is conventional. -->
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
</Project>

20
builds/msvc/vs2013/properties/ConsoleReleaseLinkTimeCodeGeneration.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Console.props" />
<Import Project="Release.props" />
<Import Project="LinkTimeCodeGeneration.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Release Link Time Code Generation Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
</Project>

19
builds/msvc/vs2013/properties/ConsoleReleaseStatic.props
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Console.props" />
<Import Project="Release.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Console Release Static</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
</Project>

28
builds/msvc/vs2013/properties/Debug.props
View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PropertySheetDisplayName>Debug Configuration</_PropertySheetDisplayName>
<!-- RootNamespace is used to deconflict output files from differing project versions. -->
<IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
<OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile><DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<FunctionLevelLinking>true</FunctionLevelLinking>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib</ImportLibrary>
</Link>
</ItemDefinitionGroup>
</Project>

18
builds/msvc/vs2013/properties/Dynamic.props
View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Common.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Dynamic Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
</Project>

21
builds/msvc/vs2013/properties/DynamicDebug.props
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Dynamic.props" />
<Import Project="Debug.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Dynamic Debug Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT dynamically when building a dynamic library is conventional. -->
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<LinkIncremental>true</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
</Project>

20
builds/msvc/vs2013/properties/DynamicRelease.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Dynamic.props" />
<Import Project="Release.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Dynamic Release Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT dynamically when building a dynamic library is conventional. -->
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
</Project>

20
builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props
View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PropertySheetDisplayName>Link Time Code Generation Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
<Link>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<Lib>
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
</ItemDefinitionGroup>
</Project>

40
builds/msvc/vs2013/properties/Release.props
View File

@@ -1,40 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PropertySheetDisplayName>Release Configuration</_PropertySheetDisplayName>
<!-- RootNamespace is used to deconflict output files from differing project versions. -->
<IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
<OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\</OutDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalOptions>/Oy- %(AdditionalOptions)</AdditionalOptions>
<!--<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>-->
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<MinimalRebuild>false</MinimalRebuild>
<Optimization>MaxSpeed</Optimization>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<!--<GenerateDebugInformation>true</GenerateDebugInformation>-->
<ImportLibrary>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib</ImportLibrary>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
<ClCompile>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
</ClCompile>
</ItemDefinitionGroup>
</Project>

18
builds/msvc/vs2013/properties/Static.props
View File

@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Common.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Static Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
</Project>

21
builds/msvc/vs2013/properties/StaticDebug.props
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Static.props" />
<Import Project="Debug.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Static Debug Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT statically when building a static library is conventional. -->
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<LinkIncremental>true</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
</Project>

21
builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Debug.props" />
<Import Project="StaticLinkTimeCodeGeneration.props" />
</ImportGroup>
<PropertyGroup>
<_PropertySheetDisplayName>Static Debug Link Time Code Generation Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<!-- Linking CRT statically when building a static library is conventional. -->
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<LinkIncremental>false</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
</Project>

Some files were not shown because too many files have changed in this diff Show More