David Byron's version resource fix

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index d0bf9153efad132f982e9a85fea81e6f4957c49e..847e67b13947ad0af97cc551e95a21c0312ebb64 100644 (file)
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -19,10 +19,12 @@ PROGRAM_NAME = curl.exe
 ## Release\r
 CCR = cl.exe /MD /O2 /D "NDEBUG"\r
 LINKR = link.exe /incremental:no /libpath:"../lib"\r
+RCR = rc.exe /dCURLDEBUG=0\r
 \r
 ## Debug\r
 CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ\r
 LINKD = link.exe /incremental:yes /debug /libpath:"../lib"\r
+RCD = rc.exe /dCURLDEBUG=1\r
 \r
 !IFNDEF ZLIB_PATH\r
 ZLIB_PATH  = ../../zlib-1.1.4\r
@@ -30,6 +32,7 @@ ZLIB_PATH  = ../../zlib-1.1.4
 \r
 CFLAGS = /I "../lib" /I "../include" /I "$(ZLIB_PATH)" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
 LFLAGS = /nologo /libpath:"$(ZLIB_PATH)" /out:$(PROGRAM_NAME) /subsystem:console /machine:I386\r
+RESFLAGS = /i "../include"\r
 LINKLIBS = wsock32.lib libcurl.lib winmm.lib zlib.lib\r
 LINKLIBS_DEBUG = wsock32.lib libcurld.lib winmm.lib zlib.lib\r
 \r
@@ -39,7 +42,8 @@ RELEASE_OBJS= \
        urlglobr.obj \\r
        getpassr.obj \\r
        homedirr.obj \\r
-       mainr.obj\r
+       mainr.obj \\r
+       curlr.res\r
 \r
 DEBUG_OBJS= \\r
        hugehelpd.obj \\r
@@ -47,7 +51,8 @@ DEBUG_OBJS= \
        urlglobd.obj \\r
        getpassd.obj \\r
        homedird.obj \\r
-       maind.obj\r
+       maind.obj \\r
+       curld.res\r
        \r
 ######################\r
 # release-ssl\r
@@ -63,7 +68,7 @@ LINKLIBS  = $(LINKLIBS) $(SSLLIBS)
 LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)\r
 LFLAGS = $(LFLAGS) $(LFLAGSSSL)\r
 !ENDIF\r
- \r
+\r
 all : release\r
 \r
 release: $(RELEASE_OBJS)\r
@@ -85,6 +90,8 @@ homedirr.obj: homedir.c
        $(CCR) $(CFLAGS) /Fo"$@" homedir.c\r
 mainr.obj: main.c\r
        $(CCR) $(CFLAGS) /Fo"$@" main.c\r
+curlr.res : curl.rc\r
+       $(RCR) $(RESFLAGS) /Fo"$@" curl.rc\r
 \r
 ## Debug\r
 hugehelpd.obj: hugehelp.c\r
@@ -99,6 +106,8 @@ homedird.obj: homedir.c
        $(CCD) $(CFLAGS) /Fo"$@" homedir.c\r
 maind.obj: main.c\r
        $(CCD) $(CFLAGS) /Fo"$@" main.c\r
+curld.res : curl.rc\r
+       $(RCD) $(RESFLAGS) /Fo"$@" curl.rc\r
 \r
 clean:\r
        -@erase $(RELEASE_OBJS)\r

diff --git a/src/version.h b/src/version.h
index 13a34526d5d993845d017b69692ce6fdf95088d5..98817e9b26e5335ebb997fe9f51334cfe3663f3d 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,35 @@
+#ifndef __VERSION_H
+#define __VERSION_H
+/***************************************************************************
+ *                                  _   _ ____  _     
+ *  Project                     ___| | | |  _ \| |    
+ *                             / __| | | | |_) | |    
+ *                            | (__| |_| |  _ <| |___ 
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ * 
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id$
+ ***************************************************************************/
+
+#include <curl/curl.h>
+
 #define CURL_NAME "curl"
 #define CURL_VERSION LIBCURL_VERSION
+#define CURL_VERSION_MAJOR LIBCURL_VERSION_MAJOR
+#define CURL_VERSION_MINOR LIBCURL_VERSION_MINOR
+#define CURL_VERSION_PATCH LIBCURL_VERSION_PATCH
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "
+
+#endif