shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Solidify VC2005 builds.

* include/freetype/internal/ftcalc.h (FT_MSB) [_MSC_VER]: Explicitly
declare `_BitScanReverse' intrinsic.
* builds/windows/visualc/freetype.vcproj [Debug]: Disable intrinsics.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+2019-05-31  Alexei Podtelezhnikov  <apodtele@gmail.com>

+

+	Solidify VC2005 builds.

+

+	* include/freetype/internal/ftcalc.h (FT_MSB) [_MSC_VER]: Explicitly

+	declare `_BitScanReverse' intrinsic.

+	* builds/windows/visualc/freetype.vcproj [Debug]: Disable intrinsics.

+

 2019-05-30  Nikhil Ramakrishnan  <ramakrishnan.nikhil@gmail.com>

 	[sfnt] Separate WOFF sources and headers.

--- a/builds/windows/visualc/freetype.vcproj

+++ b/builds/windows/visualc/freetype.vcproj

@@ -185,7 +185,6 @@

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				EnableIntrinsicFunctions="true"

 				AdditionalIncludeDirectories="..\..\..\include"

 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT"

 				BasicRuntimeChecks="3"

@@ -259,7 +258,6 @@

 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				EnableIntrinsicFunctions="true"

 				AdditionalIncludeDirectories="..\..\..\include"

 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY"

 				GeneratePreprocessedFile="0"

--- a/include/freetype/internal/ftcalc.h

+++ b/include/freetype/internal/ftcalc.h

@@ -378,6 +378,7 @@

 #if FT_SIZEOF_INT == 4

 #include <intrin.h>

+#pragma intrinsic( _BitScanReverse )

   static __inline FT_Int32

   FT_MSB_i386( FT_UInt32  x )

@@ -385,7 +386,6 @@

     unsigned long  where;

-    /* not available in older VC versions */

     _BitScanReverse( &where, x );

     return (FT_Int32)where;