diff options
| author | Jocelyn Turcotte <jturcotte@woboq.com> | 2015-03-23 15:43:59 +0300 |
|---|---|---|
| committer | Jocelyn Turcotte <jturcotte@woboq.com> | 2015-03-23 15:53:09 +0300 |
| commit | ad5620efb5dbd2d78e39d1bf31abb7eea16557f8 (patch) | |
| tree | 040481c89bc8245a833815c98fdefe02b5e2d9b8 /shell_integration | |
| parent | f455c7133872a026ec08cde5a8e54b571c876779 (diff) | |
Disable asserts in official builds
Make sure that we define NDEBUG in all configurations.
Also remove inconsistent defines:
WIN32: We don't use
_DEBUG;_WINDOWS;_USRDLL: Should be defined by the compiler if necessary
OCCONTEXTMENU_EXPORTS: We currently don't use dllimport anyway
This also update the binary submodule with an updated build.
Diffstat (limited to 'shell_integration')
| -rw-r--r-- | shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj | 4 | ||||
| -rw-r--r-- | shell_integration/windows/OCOverlays/OCOverlays.vcxproj | 2 | ||||
| -rw-r--r-- | shell_integration/windows/OCUtil/OCUtil.vcxproj | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj b/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj index 3fce7dbec..023d2d0ca 100644 --- a/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj +++ b/shell_integration/windows/OCContextMenu/OCContextMenu.vcxproj @@ -83,7 +83,6 @@ <PrecompiledHeader>Use</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;OCCONTEXTMENU_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories>..\OCUtil;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> @@ -101,8 +100,8 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;OCCONTEXTMENU_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\OCUtil;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -132,6 +131,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\OCUtil;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <AdditionalLibraryDirectories>..\$(Configuration)\$(Platform);</AdditionalLibraryDirectories> diff --git a/shell_integration/windows/OCOverlays/OCOverlays.vcxproj b/shell_integration/windows/OCOverlays/OCOverlays.vcxproj index ca38c38cb..a96754c07 100644 --- a/shell_integration/windows/OCOverlays/OCOverlays.vcxproj +++ b/shell_integration/windows/OCOverlays/OCOverlays.vcxproj @@ -127,6 +127,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\OCUtil;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -145,6 +146,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\OCUtil;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/shell_integration/windows/OCUtil/OCUtil.vcxproj b/shell_integration/windows/OCUtil/OCUtil.vcxproj index cd5db9a87..d1c07588c 100644 --- a/shell_integration/windows/OCUtil/OCUtil.vcxproj +++ b/shell_integration/windows/OCUtil/OCUtil.vcxproj @@ -120,6 +120,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PrecompiledHeader>Use</PrecompiledHeader> + <PreprocessorDefinitions>NDEBUG;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -136,6 +137,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PrecompiledHeader>Use</PrecompiledHeader> + <PreprocessorDefinitions>NDEBUG;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> |