API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Dec 6th, 2018
82
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.68 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/MQ2DanNet/MQ2DanNet.vcxproj b/MQ2DanNet/MQ2DanNet.vcxproj
  2. index 0a63139..735ee9f 100644
  3. --- a/MQ2DanNet/MQ2DanNet.vcxproj
  4. +++ b/MQ2DanNet/MQ2DanNet.vcxproj
  5. @@ -52,17 +52,18 @@
  6.      <Link />
  7.      <ClCompile>
  8.        <AdditionalIncludeDirectories>$(ProjectDir)deps\archive;$(ProjectDir)deps\libzmq\include;$(ProjectDir)deps\libczmq\include;$(ProjectDir)deps\libzyre\include;$(ProjectDir)..;$(ProjectDir)..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  9. -      <PreprocessorDefinitions>ZMQ_STATIC;CZMQ_STATIC;ZYRE_STATIC;ZMQ_BUILD_DRAFT_API;CZMQ_BUILD_DRAFT_API;ZYRE_BUILD_DRAFT_API;MQ2DANNET_NODE_EXPORTS;CINTERFACE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  10. +      <PreprocessorDefinitions>LOCAL_BUILD;ZMQ_STATIC;CZMQ_STATIC;ZYRE_STATIC;ZMQ_BUILD_DRAFT_API;CZMQ_BUILD_DRAFT_API;ZYRE_BUILD_DRAFT_API;MQ2DANNET_NODE_EXPORTS;CINTERFACE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  11.        <WarningLevel>Level3</WarningLevel>
  12.        <MultiProcessorCompilation>true</MultiProcessorCompilation>
  13.        <StructMemberAlignment>4Bytes</StructMemberAlignment>
  14.        <BufferSecurityCheck>false</BufferSecurityCheck>
  15.        <FunctionLevelLinking>false</FunctionLevelLinking>
  16. -      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  17. +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  18. +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
  19.      </ClCompile>
  20.      <Link>
  21.        <AdditionalDependencies>MQ2Main.lib;libzmq.lib;libczmq.lib;libzyre.lib;libczmq.lib;libzyre.lib;libzmq.lib;ws2_32.lib;rpcrt4.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
  22. -      <AdditionalLibraryDirectories>$(ProjectDir);$(ProjectDir)..\..\Detours\lib;$(ProjectDir)..\..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  23. +      <AdditionalLibraryDirectories>$(ProjectDir);$(ProjectDir)..\..\Detours\lib;$(ProjectDir)..\..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  24.        <SubSystem>Windows</SubSystem>
  25.        <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
  26.      </Link>
  27. @@ -78,6 +79,8 @@
  28.        <BufferSecurityCheck>false</BufferSecurityCheck>
  29.        <FunctionLevelLinking>false</FunctionLevelLinking>
  30.        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  31. +      <ExceptionHandling>
  32. +      </ExceptionHandling>
  33.      </ClCompile>
  34.      <PostBuildEvent>
  35.        <Command>
  36. @@ -85,7 +88,7 @@
  37.      </PostBuildEvent>
  38.      <Link>
  39.        <AdditionalDependencies>MQ2Main.lib;libzmq.lib;libczmq.lib;libzyre.lib;ws2_32.lib;rpcrt4.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
  40. -      <AdditionalLibraryDirectories>$(ProjectDir);$(ProjectDir)..\..\Detours\lib;$(ProjectDir)..\..\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  41. +      <AdditionalLibraryDirectories>$(ProjectDir);$(ProjectDir)..\..\Detours\lib;$(ProjectDir)..\..\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  42.        <SubSystem>Windows</SubSystem>
  43.        <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
  44.      </Link>
  45. diff --git a/MQ2DanNet/deps/libczmq/libczmq.vcxproj b/MQ2DanNet/deps/libczmq/libczmq.vcxproj
  46. index 1a8f327..f8252d8 100644
  47. --- a/MQ2DanNet/deps/libczmq/libczmq.vcxproj
  48. +++ b/MQ2DanNet/deps/libczmq/libczmq.vcxproj
  49. @@ -102,7 +102,7 @@
  50.        <ConformanceMode>true</ConformanceMode>
  51.        <AdditionalIncludeDirectories>$(ProjectDir)..\libzmq\include\;$(ProjectDir)include\;$(ProjectDir)src\;$(ProjectDir)</AdditionalIncludeDirectories>
  52.        <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ZMQ_STATIC;CZMQ_STATIC;ZMQ_BUILD_DRAFT_API;CZMQ_BUILD_DRAFT_API;ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  53. +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  54.        <MultiProcessorCompilation>true</MultiProcessorCompilation>
  55.      </ClCompile>
  56.    </ItemDefinitionGroup>
  57. diff --git a/MQ2DanNet/deps/libzmq/libzmq.vcxproj b/MQ2DanNet/deps/libzmq/libzmq.vcxproj
  58. index fc9dce4..44bb389 100644
  59. --- a/MQ2DanNet/deps/libzmq/libzmq.vcxproj
  60. +++ b/MQ2DanNet/deps/libzmq/libzmq.vcxproj
  61. @@ -343,7 +343,7 @@
  62.        <ConformanceMode>true</ConformanceMode>
  63.        <AdditionalIncludeDirectories>$(ProjectDir)include\;$(ProjectDir)src\;$(ProjectDir)</AdditionalIncludeDirectories>
  64.        <PreprocessorDefinitions>WIN32;_WINDOWS;ZMQ_STATIC;ZMQ_BUILD_DRAFT_API;_REENTRANT;_THREAD_SAFE;ZMQ_CUSTOM_PLATFORM_HPP;FD_SETSIZE=16384;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  65. -      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  66. +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  67.      </ClCompile>
  68.    </ItemDefinitionGroup>
  69.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  70. diff --git a/MQ2DanNet/deps/libzyre/libzyre.vcxproj b/MQ2DanNet/deps/libzyre/libzyre.vcxproj
  71. index 7d8dfed..59b2330 100644
  72. --- a/MQ2DanNet/deps/libzyre/libzyre.vcxproj
  73. +++ b/MQ2DanNet/deps/libzyre/libzyre.vcxproj
  74. @@ -103,7 +103,7 @@
  75.        <AdditionalIncludeDirectories>$(ProjectDir)..\libczmq\include\;$(ProjectDir)..\libzmq\include\;$(ProjectDir)include\;$(ProjectDir)src\;$(ProjectDir)</AdditionalIncludeDirectories>
  76.        <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ZMQ_STATIC;CZMQ_STATIC;ZYRE_STATIC;ZMQ_BUILD_DRAFT_API;CZMQ_BUILD_DRAFT_API;ZYRE_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  77.        <MultiProcessorCompilation>true</MultiProcessorCompilation>
  78. -      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  79. +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  80.      </ClCompile>
  81.    </ItemDefinitionGroup>
  82.    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!