diff --git a/reactos/lib/freetype/Makefile b/reactos/lib/freetype/Makefile index c1c1293b202..d925e9ddcb4 100644 --- a/reactos/lib/freetype/Makefile +++ b/reactos/lib/freetype/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 2003/04/02 23:25:56 gvg Exp $ +# $Id: Makefile,v 1.3 2003/04/18 10:48:12 gvg Exp $ PATH_TO_TOP = ../.. @@ -34,9 +34,9 @@ all: $(MK_FULLNAME) $(MK_NOSTRIPNAME) objs/*.o objs/libfreetype.a: ifeq ($(DBG), 1) - @$(MAKE) -f Makefile.freetype CFLAGS="-c -g -Wall" + @$(MAKE) -f Makefile.freetype CFLAGS="-c -g -Wall" CC:=$(CC) else - @$(MAKE) -f Makefile.freetype + @$(MAKE) -f Makefile.freetype CC:=$(CC) endif # Automatic dependency tracking diff --git a/reactos/lib/freetype/README.ROS b/reactos/lib/freetype/README.ROS index 0664a06bfdc..9e9ff09eef6 100644 --- a/reactos/lib/freetype/README.ROS +++ b/reactos/lib/freetype/README.ROS @@ -39,14 +39,6 @@ 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 @@ -73,4 +65,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.2 2003/04/04 21:30:30 chorns Exp $ +$Id: README.ROS,v 1.3 2003/04/18 10:48:12 gvg Exp $ diff --git a/reactos/lib/freetype/builds/compiler/gcc.mk b/reactos/lib/freetype/builds/compiler/gcc.mk index da5335d83d2..f2c94de3bc3 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.