cvs: gd /libgd/windows Makefile libgd.rc

edink		Wed May 17 13:05:19 2006 UTC

  Modified files:              
    /gd/libgd/windows	Makefile libgd.rc 
  Log:
  Use bgd.dll name, and update copyright info
  
http://cvs.php.net/viewcvs.cgi/gd/libgd/windows/Makefile?r1=1.2&r2=1.3&diff_format=u
Index: gd/libgd/windows/Makefile
diff -u gd/libgd/windows/Makefile:1.2 gd/libgd/windows/Makefile:1.3
--- gd/libgd/windows/Makefile:1.2	Wed May 17 12:39:53 2006
+++ gd/libgd/windows/Makefile	Wed May 17 13:05:19 2006
@@ -1,5 +1,5 @@
 # Makefile form Microsoft C++ nmake.exe
-# $Id: Makefile,v 1.2 2006/05/17 12:39:53 edink Exp $
+# $Id: Makefile,v 1.3 2006/05/17 13:05:19 edink Exp $
 
 CC=cl.exe
 LD=link.exe
@@ -42,14 +42,15 @@
 CPPFLAGS=$(CFLAGS)
 
 !if "$(DLLNAME)" == ""
-DLLNAME=libgd.dll
+DLLNAME=bgd.dll
 !endif
 
+DYNAMICLIB=$(DLLNAME:.dll=.lib)
+
 !if "$(STATICLIB)" == ""
-STATICLIB=libgd_a.lib
+STATICLIB=bgd_a.lib
 !endif
 
-
 OBJS= \
 	gd2copypal.obj \
   gd.obj \
@@ -97,7 +98,7 @@
 all: $(DLLNAME) $(STATICLIB) tests
 
 $(EXE_OBJS:.obj=.exe): $*.obj $(DLLNAME)
-	link /out:$*.exe $*.obj libgd.lib
+	link /out:$*.exe $*.obj $(DYNAMICLIB)
 
 tests: $(EXE_OBJS:.obj=.exe)
 
http://cvs.php.net/viewcvs.cgi/gd/libgd/windows/libgd.rc?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/windows/libgd.rc
diff -u gd/libgd/windows/libgd.rc:1.1 gd/libgd/windows/libgd.rc:1.2
--- gd/libgd/windows/libgd.rc:1.1	Wed May 17 12:34:24 2006
+++ gd/libgd/windows/libgd.rc	Wed May 17 13:05:19 2006
@@ -1,5 +1,5 @@
 /* This is a template RC file.
- * $Id: libgd.rc,v 1.1 2006/05/17 12:34:24 edink Exp $
+ * $Id: libgd.rc,v 1.2 2006/05/17 13:05:19 edink Exp $
  * Do not edit with MSVC */
 #ifdef APSTUDIO_INVOKED
 # error dont edit with MSVC
@@ -17,8 +17,8 @@
 
 //Version
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,33,0
- PRODUCTVERSION 2,0,33,0
+ FILEVERSION GD_MAJOR_VERSION,GD_MINOR_VERSION,GD_RELEASE_VERSION,0
+ PRODUCTVERSION GD_MAJOR_VERSION,GD_MINOR_VERSION,GD_RELEASE_VERSION,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -34,17 +34,17 @@
         BLOCK "040904b0"
         BEGIN
             VALUE "Comments", "Thaks to Tom Boutell" "\0"
-            VALUE "CompanyName", "The PHP Group\0"
+            VALUE "CompanyName", "LIBGD Development Team\0"
             VALUE "FileDescription", "LIBGD" "\0"
-            VALUE "FileVersion", "2.0.33\0"
-            VALUE "InternalName", "libgd.dll" "\0"
-            VALUE "LegalCopyright", "Copyright © 1997-2006 The PHP Group\0"
-            VALUE "LegalTrademarks", "PHP\0"
-            VALUE "OriginalFilename", "libgd.dll" "\0"
+            VALUE "FileVersion", GD_VERSION_STRING "\0"
+            VALUE "InternalName", "bgd.dll" "\0"
+            VALUE "LegalCopyright", "Copyright © 1997-2006 Thomas Boutell and contributors, see COPYING\0" 
+            VALUE "LegalTrademarks", "Thomas Boutell and contributors\0"
+            VALUE "OriginalFilename", "bgd.dll" "\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "LIBGD dynamic link library" "\0"
             VALUE "SpecialBuild", "win32" "\0"
-			VALUE "URL", "http://www.php.net"
+			VALUE "URL", "http://www.libgd.org/"
         END
     END
     BLOCK "VarFileInfo"