cvs: gd(GD_2_0) /libgd/windows Makefile
[email protected] ("Pierre-Alain Joye")
| Newsgroups | php.gd.cvs |
|---|---|
| Message-ID | <cvspajoye1177424693@cvsserver> |
pajoye Tue Apr 24 14:24:53 2007 UTC
Modified files: (Branch: GD_2_0)
/gd/libgd/windows Makefile
Log:
- remove libgd.dll.res as well on make clean
http://cvs.php.net/viewvc.cgi/gd/libgd/windows/Makefile?r1=1.5.2.4&r2=1.5.2.5&diff_format=u
Index: gd/libgd/windows/Makefile
diff -u gd/libgd/windows/Makefile:1.5.2.4 gd/libgd/windows/Makefile:1.5.2.5
--- gd/libgd/windows/Makefile:1.5.2.4 Tue Apr 17 10:50:04 2007
+++ gd/libgd/windows/Makefile Tue Apr 24 14:24:53 2007
@@ -1,13 +1,13 @@
# Makefile form Microsoft C++ nmake.exe
-# $Id: Makefile,v 1.5.2.4 2007/04/17 10:50:04 pajoye Exp $
+# $Id: Makefile,v 1.5.2.5 2007/04/24 14:24:53 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=Debug
+BUILD=Release
+#BUILD=Debug
LIBGDCFLAGS= \
/D PATHSEPARATOR="\";\"" \
@@ -33,11 +33,11 @@
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
+CFLAGS=$(CFLAGS) /Od /Zi /MTd /D_DEBUG /LDd
LDFLAGS=/DEBUG $(LDFLAGS) /nodefaultlib:msvcrt.lib $(EXTRA_LIBS)
LIBS=$(LIBS) msvcrtd.lib
!else
-CFLAGS=$(CFLAGS) /Og /Oi /O2 /Oy /GF /MD /DNDEBUG /LD
+CFLAGS=$(CFLAGS) /Og /Oi /O2 /Oy /GF /MT /DNDEBUG /LD
LDFLAGS=/nodefaultlib:msvcrtd.lib $(EXTRA_LIBS)
LIBS=$(LIBS) msvcrt.lib
!endif
@@ -141,5 +141,5 @@
copy ..\COPYING distro\COPYING.TXT
clean:
- -del /q *.obj *.dll *.lib *.ilk *.pdb *.exp *.exe *.png
+ -del /q *.obj *.dll *.lib *.ilk *.pdb *.exp *.exe *.png *.res
-rmdir /s /q distro
\ No newline at end of file