diff --git a/ChangeLog b/ChangeLog index 47f9291b9..810dda295 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2001-06-19 David Turner + * builds/win32/visualc/freetype.dsp, builds/win32/visualc/index.html: + updated the Visual C++ project (for the 2.0.4 release) + + * builds/unix/detect.mk: added rule for AIX detection (which uses + /usr/sbin/init instead of /sbin/init, go figure..) + * include/freetype/fterrors.h: updated some of the error macros to simplify Werner's latest tricks :o) diff --git a/builds/unix/detect.mk b/builds/unix/detect.mk index 5f53f84d1..6af635cfe 100644 --- a/builds/unix/detect.mk +++ b/builds/unix/detect.mk @@ -18,7 +18,7 @@ ifeq ($(PLATFORM),ansi) # Note: this test is duplicated in "builds/toplevel.mk". # - is_unix := $(strip $(wildcard /sbin/init) $(wildcard /hurd/auth)) + is_unix := $(strip $(wildcard /sbin/init) $(wildcard /usr/sbin/init) $(wildcard /hurd/auth)) ifneq ($(is_unix),) PLATFORM := unix diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp index 831bc18cb..b7a1cb127 100644 --- a/builds/win32/visualc/freetype.dsp +++ b/builds/win32/visualc/freetype.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Intermediate_Dir "..\..\..\objs\release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /Za /W3 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FD /c +# ADD CPP /nologo /Za /W4 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -52,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype202.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype204.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -67,7 +67,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "..\..\..\objs\debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_DEBUG_LEVEL_ERROR" /D "FT_DEBUG_LEVEL_TRACE" /FD /GZ /c +# ADD CPP /nologo /Za /W4 /Gm /GX /ZI /Od /I "..\..\..\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_DEBUG_LEVEL_ERROR" /D "FT_DEBUG_LEVEL_TRACE" /FD /GZ /c # SUBTRACT CPP /X /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -76,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype202_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype204_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -92,7 +92,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" # ADD BASE CPP /nologo /Za /W3 /Gm /GX /ZI /Od /I "..\freetype\include\\" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /GZ /c # SUBTRACT BASE CPP /X -# ADD CPP /nologo /MTd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_DEBUG_LEVEL_ERROR" /D "FT_DEBUG_LEVEL_TRACE" /FD /GZ /c +# ADD CPP /nologo /MTd /Za /W4 /Gm /GX /ZI /Od /I "..\..\..\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_DEBUG_LEVEL_ERROR" /D "FT_DEBUG_LEVEL_TRACE" /FD /GZ /c # SUBTRACT CPP /X /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -101,7 +101,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"lib\freetype200b8_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype202MT_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype204MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -116,7 +116,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "..\..\..\objs\release_mt" # PROP Target_Dir "" # ADD BASE CPP /nologo /Za /W3 /GX /O2 /I "..\freetype\include\\" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "FT_FLAT_COMPILE" /YX /FD /c -# ADD CPP /nologo /MT /Za /W3 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FD /c +# ADD CPP /nologo /MT /Za /W4 /GX /O2 /I "..\..\..\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -125,7 +125,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo /out:"lib\freetype200b8.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype202MT.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype204MT.lib" !ENDIF @@ -141,17 +141,6 @@ LIB32=link.exe -lib # Begin Source File SOURCE=..\..\..\src\autohint\autohint.c - -!IF "$(CFG)" == "freetype - Win32 Release" - -!ELSEIF "$(CFG)" == "freetype - Win32 Debug" - -!ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" - -!ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" - -!ENDIF - # End Source File # Begin Source File diff --git a/builds/win32/visualc/freetype.dsw b/builds/win32/visualc/freetype.dsw index f81ae050f..b1b375dbb 100644 --- a/builds/win32/visualc/freetype.dsw +++ b/builds/win32/visualc/freetype.dsw @@ -7,10 +7,6 @@ Project: "freetype"=.\freetype.dsp - Package Owner=<4> Package=<5> {{{ - begin source code control - "$/DEV/freetype", KAOAAAAA - . - end source code control }}} Package=<4> @@ -19,71 +15,10 @@ Package=<4> ############################################################################### -Project: "ftdump"=.\ftdump.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - "$/DEV/freetype", KAOAAAAA - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name freetype - End Project Dependency -}}} - -############################################################################### - -Project: "ftstring"=.\ftstring.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - "$/DEV/freetype", KAOAAAAA - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name freetype - End Project Dependency -}}} - -############################################################################### - -Project: "ftview"=.\ftview.dsp - Package Owner=<4> - -Package=<5> -{{{ - begin source code control - "$/DEV/freetype", KAOAAAAA - . - end source code control -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name freetype - End Project Dependency -}}} - -############################################################################### - Global: Package=<5> {{{ - begin source code control - "$/DEV/freetype", KAOAAAAA - . - end source code control }}} Package=<3> diff --git a/builds/win32/visualc/ftdump.dsp b/builds/win32/visualc/ftdump.dsp deleted file mode 100644 index ca34a4a0d..000000000 --- a/builds/win32/visualc/ftdump.dsp +++ /dev/null @@ -1,118 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ftdump" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=ftdump - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ftdump.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ftdump.mak" CFG="ftdump - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ftdump - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "ftdump - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/DEV/freetype", KAOAAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ftdump - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "demos/obj/ftdump/release" -# PROP Intermediate_Dir "demos/obj/ftdump/release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\freetype\include\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib lib\freetype200b8.lib /nologo /subsystem:console /machine:I386 -# Begin Special Build Tool -TargetPath=.\demos\obj\ftdump\release\ftdump.exe -TargetName=ftdump -SOURCE="$(InputPath)" -PostBuild_Cmds=echo copy $(TargetPath) .\demos\bin\$(TargetName).exe copy $(TargetPath) .\demos\bin\$(TargetName).exe -# End Special Build Tool - -!ELSEIF "$(CFG)" == "ftdump - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "ftdump___Win32_Debug" -# PROP BASE Intermediate_Dir "ftdump___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "demos/obj/ftdump/debug" -# PROP Intermediate_Dir "demos/obj/ftdump/debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\freetype\include\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib lib\freetype200b8_D.lib /nologo /subsystem:console /debug /machine:I386 /out:"demos/obj/ftdump/debug/ftdump_D.exe" /pdbtype:sept -# Begin Special Build Tool -TargetPath=.\demos\obj\ftdump\debug\ftdump_D.exe -TargetName=ftdump_D -SOURCE="$(InputPath)" -PostBuild_Cmds=echo copy $(TargetPath) .\demos\bin\$(TargetName).exe copy $(TargetPath) .\demos\bin\$(TargetName).exe -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "ftdump - Win32 Release" -# Name "ftdump - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\demos\src\common.c -# End Source File -# Begin Source File - -SOURCE=.\demos\src\ftdump.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/builds/win32/visualc/ftstring.dsp b/builds/win32/visualc/ftstring.dsp deleted file mode 100644 index 9e0e68f46..000000000 --- a/builds/win32/visualc/ftstring.dsp +++ /dev/null @@ -1,142 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ftstring" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=ftstring - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ftstring.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ftstring.mak" CFG="ftstring - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ftstring - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "ftstring - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/DEV/freetype", KAOAAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ftstring - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "demos/obj/ftstring/release" -# PROP Intermediate_Dir "demos/obj/ftstring/release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\freetype\include\\" /I "demos\graph" /I "demos\graph\win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "FT_FLAT_COMPILE" /D "DEVICE_WIN32" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib lib\freetype200b8.lib /nologo /subsystem:console /machine:I386 -# Begin Special Build Tool -TargetPath=.\demos\obj\ftstring\release\ftstring.exe -TargetName=ftstring -SOURCE="$(InputPath)" -PostBuild_Cmds=echo copy $(TargetPath) .\demos\bin\$(TargetName).exe copy $(TargetPath) .\demos\bin\$(TargetName).exe -# End Special Build Tool - -!ELSEIF "$(CFG)" == "ftstring - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "ftstring___Win32_Debug" -# PROP BASE Intermediate_Dir "ftstring___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "demos/obj/ftstring/debug" -# PROP Intermediate_Dir "demos/obj/ftstring/debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\freetype\include\\" /I "demos\graph" /I "demos\graph\win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "FT_FLAT_COMPILE" /D "DEVICE_WIN32" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib lib\freetype200b8_D.lib /nologo /subsystem:console /debug /machine:I386 /out:"demos/obj/ftstring/debug/ftstring_D.exe" /pdbtype:sept -# Begin Special Build Tool -TargetPath=.\demos\obj\ftstring\debug\ftstring_D.exe -TargetName=ftstring_D -SOURCE="$(InputPath)" -PostBuild_Cmds=echo copy $(TargetPath) .\demos\bin\$(TargetName).exe copy $(TargetPath) .\demos\bin\$(TargetName).exe -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "ftstring - Win32 Release" -# Name "ftstring - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\demos\src\common.c -# End Source File -# Begin Source File - -SOURCE=.\demos\src\ftstring.c -# End Source File -# Begin Source File - -SOURCE=.\demos\graph\grblit.c -# End Source File -# Begin Source File - -SOURCE=.\demos\graph\grdevice.c -# End Source File -# Begin Source File - -SOURCE=.\demos\graph\grfont.c -# End Source File -# Begin Source File - -SOURCE=.\demos\graph\grinit.c -# End Source File -# Begin Source File - -SOURCE=.\demos\graph\grobjs.c -# End Source File -# Begin Source File - -SOURCE=.\demos\graph\win32\grwin32.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/builds/win32/visualc/ftview.dsp b/builds/win32/visualc/ftview.dsp deleted file mode 100644 index 4959216cf..000000000 --- a/builds/win32/visualc/ftview.dsp +++ /dev/null @@ -1,142 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ftview" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=ftview - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ftview.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ftview.mak" CFG="ftview - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ftview - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "ftview - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName ""$/DEV/freetype", KAOAAAAA" -# PROP Scc_LocalPath "." -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ftview - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "demos/obj/ftview/release" -# PROP Intermediate_Dir "demos/obj/ftview/release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I "..\freetype\include\\" /I "demos\graph" /I "demos\graph\win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "FT_FLAT_COMPILE" /D "DEVICE_WIN32" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib lib\freetype200b8.lib /nologo /subsystem:console /machine:I386 -# Begin Special Build Tool -TargetPath=.\demos\obj\ftview\release\ftview.exe -TargetName=ftview -SOURCE="$(InputPath)" -PostBuild_Cmds=echo copy $(TargetPath) .\demos\bin\$(TargetName).exe copy $(TargetPath) .\demos\bin\$(TargetName).exe -# End Special Build Tool - -!ELSEIF "$(CFG)" == "ftview - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "ftview___Win32_Debug" -# PROP BASE Intermediate_Dir "ftview___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "demos/obj/ftview/debug" -# PROP Intermediate_Dir "demos/obj/ftview/debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\freetype\include\\" /I "demos\graph" /I "demos\graph\win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "FT_FLAT_COMPILE" /D "DEVICE_WIN32" /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib lib\freetype200b8_D.lib /nologo /subsystem:console /debug /machine:I386 /out:"demos/obj/ftview/debug/ftview_D.exe" /pdbtype:sept -# Begin Special Build Tool -TargetPath=.\demos\obj\ftview\debug\ftview_D.exe -TargetName=ftview_D -SOURCE="$(InputPath)" -PostBuild_Cmds=echo copy $(TargetPath) .\demos\bin\$(TargetName).exe copy $(TargetPath) .\demos\bin\$(TargetName).exe -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "ftview - Win32 Release" -# Name "ftview - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\demos\src\common.c -# End Source File -# Begin Source File - -SOURCE=.\demos\src\ftview.c -# End Source File -# Begin Source File - -SOURCE=.\demos\graph\grblit.c -# End Source File -# Begin Source File - -SOURCE=.\demos\graph\grdevice.c -# End Source File -# Begin Source File - -SOURCE=.\demos\graph\grfont.c -# End Source File -# Begin Source File - -SOURCE=.\demos\graph\grinit.c -# End Source File -# Begin Source File - -SOURCE=.\demos\graph\grobjs.c -# End Source File -# Begin Source File - -SOURCE=.\demos\graph\win32\grwin32.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/builds/win32/visualc/index.html b/builds/win32/visualc/index.html index a47fee5ba..4f365c953 100644 --- a/builds/win32/visualc/index.html +++ b/builds/win32/visualc/index.html @@ -1,91 +1,27 @@ - - -Freetype2 (for Windows) - - - - - - - - - -
welcomepersonalzeberdeefreetype
- - - - - - -
welcomepersonalzeberdeefor - Windows

-
+ +
+FreeType 2 Project Files for Visual C++ +
+ -

Freetype (for Windows)

-
+

FreeType 2 Project Files for Visual C++

-

Information

-

To learn all about Freetype, visit here.

-
+

This directory contains a project file for Visual C++, named + freetype.dsp. It will compile the following libraries + from the FreeType 2.0.4 sources:

+ + -

Freetype for Windows

-

One of the problems with The Freetype Project is that it doesn’t come with -any nice workspace and project files for use with MS Visual C++.

-

So, as I’ve been using Freetype within some of my own software, I’ve had to -create these file for myself, and I herewith provide them back to the open -source community.

-

The usual rules apply:

- -
+

Build directories are placed in the top-level "objs" directory

-

Download

-

You can download: -

-

-
+

Enjoy :-)

-

How to use the Workspace and Project Files

-

These are some quick note that I’ve put together to help you get started. I -hope they make sense ;-)

-

The project files have been set up in such a manner than no changes are -necessary to either the Freetype2 source code, or any environment or VC settings -for things like include folders, etc... in other words, this is a very clean -implementation.

-

Note the following:

- -

When you open up the workspace, and perhaps also the project files within, -you might get some error message to do with Visual Source Safe... do not panic, -and simply ignore these warnings, choose not to use VSS in future, save the -workspace/project files, and all should be well.

-

The ‘freetype’ project build a static library. There are four build -options, which will result in the following being generated into the ‘lib’ -directory in your ‘freetype’ directory):

- -

The ‘ftdump’, ‘ftstring’, and ‘ftview’ projects build the respective sample -applications. The binaries are placed into the ‘bin’ directory in the ‘demos’ -directory. Note that if you build the debug versions, the filenames have a ‘_D’ -suffix.

-
-
- + + \ No newline at end of file diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index d60f723e6..1b1f4d26a 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -563,7 +563,7 @@ THE SOFTWARE. FT_Long* offsets; FT_Long bitmapSizes[GLYPHPADOPTIONS]; FT_ULong format, size; - int nbitmaps, i, sizebitmaps; + int nbitmaps, i, sizebitmaps = 0; char* bitmaps;