diff options
| author | Sam Hartman <hartmans@mit.edu> | 2011-09-28 20:54:58 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2011-09-28 20:54:58 +0000 |
| commit | 56d0d1506f1692750d777a3a33f4de6cdcba40fc (patch) | |
| tree | 0585ae462ac557c796ef383edba61ccbe9f408bb | |
| parent | 0961c51886484e373d4337f4ed4369d9090f8696 (diff) | |
| download | krb5-56d0d1506f1692750d777a3a33f4de6cdcba40fc.tar.gz krb5-56d0d1506f1692750d777a3a33f4de6cdcba40fc.tar.xz krb5-56d0d1506f1692750d777a3a33f4de6cdcba40fc.zip | |
Fixed resource file compilation in leashdll
Signed-off-by: Alexey Melnikov <aamelnikov@gmail.com>
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25252 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/windows/leashdll/Makefile.in | 7 | ||||
| -rw-r--r-- | src/windows/leashdll/lsh_pwd.rc | 4 | ||||
| -rw-r--r-- | src/windows/version.rc | 10 |
3 files changed, 16 insertions, 5 deletions
diff --git a/src/windows/leashdll/Makefile.in b/src/windows/leashdll/Makefile.in index fd9b0f4319..1d5a4619f2 100644 --- a/src/windows/leashdll/Makefile.in +++ b/src/windows/leashdll/Makefile.in @@ -33,10 +33,10 @@ OBJS= $(OUTPRE)AFSroutines.$(OBJEXT) \ $(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 @@ $(OUTPRE)$(DLL_NAME).dll: $(DEF_FILE) $(OBJS) $(XOBJS) #TODO: Add dependencies on include files here -#$(RESFILE): resource.rc +$(RESFILE): lsh_pwd.rc + diff --git a/src/windows/leashdll/lsh_pwd.rc b/src/windows/leashdll/lsh_pwd.rc index c6d5a1bf13..b2f7deb4c9 100644 --- a/src/windows/leashdll/lsh_pwd.rc +++ b/src/windows/leashdll/lsh_pwd.rc @@ -187,7 +187,7 @@ END 3 TEXTINCLUDE DISCARDABLE BEGIN "\r\n" - "#include ""ver.rc""\r\n" + "#include ""..\\version.rc""\r\n" "\0" END @@ -255,7 +255,7 @@ END // Generated from the TEXTINCLUDE 3 resource. // -#include "ver.rc" +#include "..\version.rc" ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff --git a/src/windows/version.rc b/src/windows/version.rc index 166d961a51..060614acb5 100644 --- a/src/windows/version.rc +++ b/src/windows/version.rc @@ -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" |