microsoft
/
IPC.Bond
зеркало из https://github.com/microsoft/IPC.Bond.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixing broken release build (#6)

This commit is contained in:
Ara Ayvazyan 2017-07-01 17:43:08 -07:00 коммит произвёл GitHub
Родитель 15fd1ac907
Коммит b946027cc1
5 изменённых файлов: 11 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Interop/Build/Interop.vcxproj
Просмотреть файл

@ -52,7 +52,7 @@
<TargetMachine>MachineX64</TargetMachine>
</Lib>
<ClCompile>
<AdditionalIncludeDirectories>..\..\Inc;..\Inc;..\..\IPC\Inc;..\..\bond\build\target\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\Inc;..\Inc;..\..\IPC\Inc;..\..\bond\build\target\$(Configuration)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>Use</PrecompiledHeader>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

2
Managed/Build/Managed.vcxproj
Просмотреть файл

@ -37,7 +37,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>wininet.lib;..\..\IPC\$(Platform)\$(Configuration)\IPC.lib;..\..\IPC\$(Platform)\$(Configuration)\IPC.Interop.lib;..\..\IPC\$(Platform)\$(Configuration)\IPC.Managed.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>..\..\IPC\$(Platform)\$(Configuration)\IPC.lib;..\..\IPC\$(Platform)\$(Configuration)\IPC.Interop.lib;..\..\IPC\$(Platform)\$(Configuration)\IPC.Managed.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalOptions>/ignore:4248 %(AdditionalOptions)</AdditionalOptions>
</Link>

2
Native/Build/Native.vcxproj
Просмотреть файл

@ -62,7 +62,7 @@
<TargetMachine>MachineX64</TargetMachine>
</Lib>
<ClCompile>
<AdditionalIncludeDirectories>..\..\Inc;..\Inc;..\..\bond\build\target\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\Inc;..\Inc;..\..\bond\build\target\$(Configuration)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>Use</PrecompiledHeader>
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

4
UnitTests/Build/UnitTests.vcxproj
Просмотреть файл

@ -33,13 +33,13 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>Ws2_32.lib;Synchronization.lib;..\..\IPC\$(Platform)\$(Configuration)\IPC.lib;..\..\bond\build\target\lib\bond\bond.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>..\..\IPC\$(Platform)\$(Configuration)\IPC.lib;..\..\bond\build\target\$(Configuration)\lib\bond\bond.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Lib>
<TargetMachine>MachineX64</TargetMachine>
</Lib>
<ClCompile>
<AdditionalIncludeDirectories>..\..\Inc;..\..\IPC\Inc;..\..\bond\build\target\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\Inc;..\..\IPC\Inc;..\..\bond\build\target\$(Configuration)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>Use</PrecompiledHeader>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOND_COMPACT_BINARY_PROTOCOL;BOND_SIMPLE_BINARY_PROTOCOL;BOND_FAST_BINARY_PROTOCOL;BOND_SIMPLE_JSON_PROTOCOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

12
bond.cmd
Просмотреть файл

@ -1,18 +1,18 @@
@setlocal
@if "%1"=="" (set config=Debug) else (set config=%1)
@set PreferredToolArchitecture=x64
@set BOOST_ROOT=%CD%\IPC\packages\boost.1.63.0.0\lib\native\include
@set BOOST_LIBRARYDIR=%CD%\IPC\packages\boost.1.63.0.0
@set BOND_GBC_PATH=%CD%\IPC\packages\Bond.Compiler.6.0.0\tools
@mkdir bond\build
@mkdir bond\build\target
@mkdir bond\build\target\%config%
@pushd bond\build
@cmake -G "Visual Studio 14 2015 Win64" -DBOND_LIBRARIES_ONLY=ON -DBOND_ENABLE_COMM=FALSE -DBOND_ENABLE_GRPC=FALSE -DCMAKE_INSTALL_PREFIX=%CD%\target ..
@cmake --build . --target
@cmake --build . --target INSTALL
@cmake -G "Visual Studio 14 2015 Win64" -DBOND_LIBRARIES_ONLY=ON -DBOND_ENABLE_COMM=FALSE -DBOND_ENABLE_GRPC=FALSE -DCMAKE_INSTALL_PREFIX=%CD%\target\%config% ..
@cmake --build . --config %config% --target
@cmake --build . --config %config% --target INSTALL
@popd
@endlocal