libdrawtext

changeset 42:f067608d8a7c

find changesets by author, revision, files, or words in the commit message
- fixed glyphmap loading on windows (open glyphmap as binary) - added installation post-build rules in visual studio project
author John Tsiombikas <nuclear@member.fsf.org>
date Sat, 07 Jun 2014 13:37:54 +0300
parents 4ef470696332
children 43444ec90632
files install.bat libdrawtext.vcproj src/font.c
diffstat 3 files changed, 11 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/install.bat	Sat Jun 07 13:37:54 2014 +0300
     1.3 @@ -0,0 +1,5 @@
     1.4 +mkdir c:\usr\include\
     1.5 +copy /Y usr\include\* c:\usr\include\
     1.6 +mkdir c:\usr\lib
     1.7 +copy /Y usr\lib\* c:\usr\lib\
     1.8 +pause

     2.1 --- a/libdrawtext.vcproj	Thu Apr 17 11:21:39 2014 +0300
     2.2 +++ b/libdrawtext.vcproj	Sat Jun 07 13:37:54 2014 +0300
     2.3 @@ -21,7 +21,7 @@
     2.4  			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
     2.5  			IntermediateDirectory="$(ConfigurationName)"
     2.6  			ConfigurationType="4"
     2.7 -			CharacterSet="1"
     2.8 +			CharacterSet="2"
     2.9  			>
    2.10  			<Tool
    2.11  				Name="VCPreBuildEventTool"
    2.12 @@ -77,6 +77,7 @@
    2.13  			/>
    2.14  			<Tool
    2.15  				Name="VCPostBuildEventTool"
    2.16 +				CommandLine="mkdir usr\include&#x0D;&#x0A;mkdir usr\lib&#x0D;&#x0A;copy /Y src\drawtext.h usr\include\drawtext.h&#x0D;&#x0A;copy /Y $(TargetPath) usr\lib\$(TargetName)-dbg.lib&#x0D;&#x0A;"
    2.17  			/>
    2.18  		</Configuration>
    2.19  		<Configuration
    2.20 @@ -84,8 +85,8 @@
    2.21  			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
    2.22  			IntermediateDirectory="$(ConfigurationName)"
    2.23  			ConfigurationType="4"
    2.24 -			CharacterSet="1"
    2.25 -			WholeProgramOptimization="1"
    2.26 +			CharacterSet="2"
    2.27 +			WholeProgramOptimization="0"
    2.28  			>
    2.29  			<Tool
    2.30  				Name="VCPreBuildEventTool"
    2.31 @@ -141,6 +142,7 @@
    2.32  			/>
    2.33  			<Tool
    2.34  				Name="VCPostBuildEventTool"
    2.35 +				CommandLine="mkdir usr\include&#x0D;&#x0A;mkdir usr\lib&#x0D;&#x0A;copy /Y src\drawtext.h usr\include\drawtext.h&#x0D;&#x0A;copy /Y $(TargetPath) usr\lib&#x0D;&#x0A;"
    2.36  			/>
    2.37  		</Configuration>
    2.38  	</Configurations>

     3.1 --- a/src/font.c	Thu Apr 17 11:21:39 2014 +0300
     3.2 +++ b/src/font.c	Sat Jun 07 13:37:54 2014 +0300
     3.3 @@ -332,7 +332,7 @@
     3.4  	FILE *fp;
     3.5  	struct dtx_glyphmap *gmap;
     3.6  
     3.7 -	if(!(fp = fopen(fname, "r"))) {
     3.8 +	if(!(fp = fopen(fname, "rb"))) {
     3.9  		return 0;
    3.10  	}
    3.11  	gmap = dtx_load_glyphmap_stream(fp);