diff --git a/reactos/ChangeLog b/reactos/ChangeLog index 8462dc863ee..98228635cbe 100644 --- a/reactos/ChangeLog +++ b/reactos/ChangeLog @@ -1,3 +1,9 @@ +2003-04-04 Casper S. Hornstrup + + * lib/freetype/builds/compiler/gcc.mk (CC): Comment out; use CC from + rules.mak instead. + * lib/freetype/README.ROS: Note this in porting guide. + 2003-03-29 Casper S. Hornstrup * ntoskrnl/ex/sysinfo.c (SystemProcessInformation): Fix warning. diff --git a/reactos/lib/freetype/README.ROS b/reactos/lib/freetype/README.ROS index 88e67fdc43e..0664a06bfdc 100644 --- a/reactos/lib/freetype/README.ROS +++ b/reactos/lib/freetype/README.ROS @@ -39,6 +39,14 @@ Setup the FreeType build by copying the correct configuration file: copy lib\freetype\builds\win32\w32-mingw32.mk lib\freetype\config.mk +Support cross-compillation by not setting CC in builds\compiler\gcc.mk: + +# Compiler command line name +# +#CC := gcc + +The CC variable from rules.mak will be used then (with the correct prefix). + Copy the ReactOS specific files from the old directory to the new: move lib\freetype\Makefile lib\freetype\Makefile.freetype @@ -65,4 +73,4 @@ file, so it is obvious to everyone which FreeType version we're using. After testing, you can commit the new/changed files to CVS. ALthough files config.mk and freetype.def are generated, they should be included in CVS. -$Id: README.ROS,v 1.1 2003/04/01 08:38:28 gvg Exp $ +$Id: README.ROS,v 1.2 2003/04/04 21:30:30 chorns Exp $ diff --git a/reactos/lib/freetype/builds/compiler/gcc.mk b/reactos/lib/freetype/builds/compiler/gcc.mk index f2c94de3bc3..da5335d83d2 100644 --- a/reactos/lib/freetype/builds/compiler/gcc.mk +++ b/reactos/lib/freetype/builds/compiler/gcc.mk @@ -15,7 +15,7 @@ # Compiler command line name # -CC := gcc +#CC := gcc # The object file extension (for standard and static libraries). This can be # .o, .tco, .obj, etc., depending on the platform.