cvs: gd(GD_2_0) /libgd/windows Makefile

pajoye		Tue Apr 17 10:50:04 2007 UTC

  Modified files:              (Branch: GD_2_0)
    /gd/libgd/windows	Makefile 
  Log:
  - user friendly deps path definition 
  
http://cvs.php.net/viewvc.cgi/gd/libgd/windows/Makefile?r1=1.5.2.3&r2=1.5.2.4&diff_format=u
Index: gd/libgd/windows/Makefile
diff -u gd/libgd/windows/Makefile:1.5.2.3 gd/libgd/windows/Makefile:1.5.2.4
--- gd/libgd/windows/Makefile:1.5.2.3	Mon Mar  5 15:42:16 2007
+++ gd/libgd/windows/Makefile	Tue Apr 17 10:50:04 2007
@@ -1,9 +1,14 @@
 # Makefile form Microsoft C++ nmake.exe
-# $Id: Makefile,v 1.5.2.3 2007/03/05 15:42:16 pajoye Exp $
+# $Id: Makefile,v 1.5.2.4 2007/04/17 10:50:04 pajoye Exp $
+
+EXTRA_INCLUDE=C:\\gd_build\\gd_deps\\include
+EXTRA_LIBS=/libpath:C:\\gd_build\\gd_deps\\lib
 
 CC=cl.exe
 LD=link.exe
-BUILD=Release
+#BUILD=Release
+BUILD=Debug
+
 LIBGDCFLAGS= \
    /D PATHSEPARATOR="\";\"" \
    /D DEFAULT_FONTPATH="\"C:\\WINDOWS\\FONTS;C:\\WINNT\\FONTS\"" \
@@ -24,16 +29,16 @@
    /D HAVE_LIBPNG  \
    /D USE_GD_IMGSTRTTF
 
-CFLAGS=-I. -I.. -nologo -DWIN32 -D_WIN32 -DMSWIN32 -DBGDWIN32 $(LIBGDCFLAGS)
+CFLAGS=-I. -I.. -I$(EXTRA_INCLUDE) -nologo -DWIN32 -D_WIN32 -DMSWIN32 -DBGDWIN32 $(LIBGDCFLAGS)
 LIBS=libjpeg.lib freetype2.lib libpng.lib zlib.lib kernel32.lib user32.lib advapi32.lib
 
 !if "$(BUILD)" == "Debug"
 CFLAGS=$(CFLAGS) /Od /Zi /MDd /D_DEBUG /LDd
-LDFLAGS=/DEBUG $(LDFLAGS) /nodefaultlib:msvcrt.lib
+LDFLAGS=/DEBUG $(LDFLAGS) /nodefaultlib:msvcrt.lib  $(EXTRA_LIBS)
 LIBS=$(LIBS) msvcrtd.lib
 !else
 CFLAGS=$(CFLAGS) /Og /Oi /O2 /Oy /GF /MD /DNDEBUG /LD
-LDFLAGS=/nodefaultlib:msvcrtd.lib
+LDFLAGS=/nodefaultlib:msvcrtd.lib $(EXTRA_LIBS)
 LIBS=$(LIBS) msvcrt.lib
 !endif
 
@@ -77,8 +82,7 @@
   gd_wbmp.obj \
   gdxpm.obj \
   wbmp.obj
-
-
+  
 EXE_OBJS= \
   annotate.obj \
   circletexttest.obj \
@@ -138,4 +142,4 @@
 	
 clean:
 	-del /q *.obj *.dll *.lib *.ilk *.pdb *.exp *.exe *.png
-	-rmdir /s /q distro
+	-rmdir /s /q distro
\ No newline at end of file