From 24258919dbe905342dd554d3746e107051b63b6c Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Mon, 19 Sep 2011 00:59:29 +0000 Subject: [PATCH] Fix x64 compile issues: remove bufferoverflowu.lib; this is obsolete as of VS2005SP1. Use undecorated _DllMainCRTStartup as entry point instead of _DllMainCRTStartup@12 Signed-off-by: Kevin Wasserman Signed-off-by: Sam Hartman git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25207 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ccapi/lib/win/Makefile.in | 2 +- src/config/win-pre.in | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ccapi/lib/win/Makefile.in b/src/ccapi/lib/win/Makefile.in index 7ca749a18..f97c92b0c 100644 --- a/src/ccapi/lib/win/Makefile.in +++ b/src/ccapi/lib/win/Makefile.in @@ -91,7 +91,7 @@ midl : ccs_request.h ccs_reply.h # Main program: $(OUTPRE)ccapi.dll: $(OBJS) ccapi.def - $(LINK) $(LFLAGS) -entry:_DllMainCRTStartup@12 -dll /map:$*.map /out:$@ /DEF:ccapi.def $(OBJS) \ + $(LINK) $(LFLAGS) -entry:$(ENTRYPOINT) -dll /map:$*.map /out:$@ /DEF:ccapi.def $(OBJS) \ /implib:ccapi.lib $(dllflags) $(LIBS) $(KFWLIB) $(SCLIB) rpcrt4.lib $(conlibsdll) $(conflags) ccapi.def: diff --git a/src/config/win-pre.in b/src/config/win-pre.in index ff79095fd..e211c13f3 100644 --- a/src/config/win-pre.in +++ b/src/config/win-pre.in @@ -135,14 +135,16 @@ CCOPTS=-nologo /W3 $(PDB_OPTS) $(DLL_FILE_DEF) LOPTS=-nologo -incremental:no !if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) -CCLINKOPTION=/link bufferoverflowu.lib -SCLIB=bufferoverflowu.lib -DEBUGOPT=/Zi +ENTRYPOINT=_DllMainCRTStartup +#CCLINKOPTION=/link bufferoverflowu.lib +#SCLIB=bufferoverflowu.lib +#DEBUGOPT=/Zi !else +ENTRYPOINT=_DLLMainCRTStartup@12 +!endif CCLINKOPTION= SCLIB= DEBUGOPT=/Zi -!endif #if the compiler is vstudio 8, generate manifest !if exists("$(VCINSTALLDIR)\..\..\MICROSOFT VISUAL STUDIO 8") -- 2.26.2