David Byron's version resource fix

2 files changed, 44 insertions, 3 deletions

diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index d0bf9153e..847e67b13 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -19,10 +19,12 @@ PROGRAM_NAME = curl.exe
 ## Release

 CCR = cl.exe /MD /O2 /D "NDEBUG"

 LINKR = link.exe /incremental:no /libpath:"../lib"

+RCR = rc.exe /dCURLDEBUG=0

 

 ## Debug

 CCD = cl.exe /MDd /Gm /ZI /Od /D "_DEBUG" /GZ

 LINKD = link.exe /incremental:yes /debug /libpath:"../lib"

+RCD = rc.exe /dCURLDEBUG=1

 

 !IFNDEF ZLIB_PATH

 ZLIB_PATH  = ../../zlib-1.1.4

@@ -30,6 +32,7 @@ ZLIB_PATH  = ../../zlib-1.1.4
 

 CFLAGS = /I "../lib" /I "../include" /I "$(ZLIB_PATH)" /nologo /W3 /GX /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 LFLAGS = /nologo /libpath:"$(ZLIB_PATH)" /out:$(PROGRAM_NAME) /subsystem:console /machine:I386

+RESFLAGS = /i "../include"

 LINKLIBS = wsock32.lib libcurl.lib winmm.lib zlib.lib

 LINKLIBS_DEBUG = wsock32.lib libcurld.lib winmm.lib zlib.lib

 

@@ -39,7 +42,8 @@ RELEASE_OBJS= \
 	urlglobr.obj \

 	getpassr.obj \

 	homedirr.obj \

-	mainr.obj

+	mainr.obj \

+	curlr.res

 

 DEBUG_OBJS= \

 	hugehelpd.obj \

@@ -47,7 +51,8 @@ DEBUG_OBJS= \
 	urlglobd.obj \

 	getpassd.obj \

 	homedird.obj \

-	maind.obj

+	maind.obj \

+	curld.res

 	

 ######################

 # release-ssl

@@ -63,7 +68,7 @@ LINKLIBS  = $(LINKLIBS) $(SSLLIBS)
 LINKLIBS_DEBUG  = $(LINKLIBS_DEBUG) $(SSLLIBS)

 LFLAGS = $(LFLAGS) $(LFLAGSSSL)

 !ENDIF

- 

+

 all : release

 

 release: $(RELEASE_OBJS)

@@ -85,6 +90,8 @@ homedirr.obj: homedir.c
 	$(CCR) $(CFLAGS) /Fo"$@" homedir.c

 mainr.obj: main.c

 	$(CCR) $(CFLAGS) /Fo"$@" main.c

+curlr.res : curl.rc

+	$(RCR) $(RESFLAGS) /Fo"$@" curl.rc

 

 ## Debug

 hugehelpd.obj: hugehelp.c

@@ -99,6 +106,8 @@ homedird.obj: homedir.c
 	$(CCD) $(CFLAGS) /Fo"$@" homedir.c

 maind.obj: main.c

 	$(CCD) $(CFLAGS) /Fo"$@" main.c

+curld.res : curl.rc

+	$(RCD) $(RESFLAGS) /Fo"$@" curl.rc

 

 clean:

 	-@erase $(RELEASE_OBJS)

diff --git a/src/version.h b/src/version.h
index 13a34526d..98817e9b2 100644
--- 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