svn rev #25252: trunk/src/windows/ leashdll/

[hartmans@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25252
Commit By: hartmans
Log Message:
Fixed resource file compilation in leashdll

Signed-off-by: Alexey Melnikov <aamelnikov at gmail.com>


Changed Files:
U   trunk/src/windows/leashdll/Makefile.in
U   trunk/src/windows/leashdll/lsh_pwd.rc
U   trunk/src/windows/version.rc
Modified: trunk/src/windows/leashdll/Makefile.in
===================================================================
--- trunk/src/windows/leashdll/Makefile.in	2011-09-28 20:54:53 UTC (rev 25251)
+++ trunk/src/windows/leashdll/Makefile.in	2011-09-28 20:54:58 UTC (rev 25252)
@@ -33,10 +33,10 @@
 	$(OUTPRE)loadfuncs.$(OBJEXT)
 
 #TODO: Fix resource compilation
-#RESFILE = $(OUTPRE)lsh_pwd.res
+RESFILE = $(OUTPRE)lsh_pwd.res
 XOBJS	= $(RESFILE)
 
-RCFLAGS = /i $(BUILDTOP)\include
+RCFLAGS = -I$(BUILDTOP)\include -I$(BUILDTOP) -DLEASHDLL_LIB
 
 ###From another project inside K 1.9:
 ###VERSIONRC = $(BUILDTOP)\windows\version.rc
@@ -73,4 +73,5 @@
 
 #TODO: Add dependencies on include files here
 
-#$(RESFILE): resource.rc
+$(RESFILE): lsh_pwd.rc
+

Modified: trunk/src/windows/leashdll/lsh_pwd.rc
===================================================================
--- trunk/src/windows/leashdll/lsh_pwd.rc	2011-09-28 20:54:53 UTC (rev 25251)
+++ trunk/src/windows/leashdll/lsh_pwd.rc	2011-09-28 20:54:58 UTC (rev 25252)
@@ -187,7 +187,7 @@
 3 TEXTINCLUDE DISCARDABLE
 BEGIN
     "\r\n"
-    "#include ""ver.rc""\r\n"
+    "#include ""..\\version.rc""\r\n"
     "\0"
 END
 
@@ -255,7 +255,7 @@
 // Generated from the TEXTINCLUDE 3 resource.
 //
 
-#include "ver.rc"
+#include "..\version.rc"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

Modified: trunk/src/windows/version.rc
===================================================================
--- trunk/src/windows/version.rc	2011-09-28 20:54:53 UTC (rev 25251)
+++ trunk/src/windows/version.rc	2011-09-28 20:54:58 UTC (rev 25252)
@@ -108,6 +108,16 @@
 #endif
 #endif /* GSSAPI */
 
+#ifdef LEASHDLL_LIB
+#define K5_DESCRIPTION "Leash Helper API - MIT GSS / Kerberos v5 distribution\0"
+#define K5_INTERNAL_NAME "leashw\0"
+#define K5_FILETYPE	VFT_DLL
+#if !defined(_WIN32)
+#define K5_ORIGINAL_NAME "leashw.dll\0"
+#else
+#define K5_ORIGINAL_NAME "leashw32.dll\0"
+#endif
+#endif /* LEASHDLL_LIB */
 
 #ifdef WSHELPER_LIB
 #define K5_DESCRIPTION "Winsock Helper (wshelper) API - MIT GSS / Kerberos v5 distribution\0"