harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r514931 - /harmony/enhanced/classlib/trunk/depends/build/rules.mak
Date Tue, 06 Mar 2007 00:12:05 GMT
Author: ayza
Date: Mon Mar  5 16:12:04 2007
New Revision: 514931

URL: http://svn.apache.org/viewvc?view=rev&rev=514931
Log:
Fixing DLL entry point for 64-bit architecture, see HARMONY-3191.

Modified:
    harmony/enhanced/classlib/trunk/depends/build/rules.mak

Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mak?view=diff&rev=514931&r1=514930&r2=514931
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mak (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mak Mon Mar  5 16:12:04 2007
@@ -15,11 +15,10 @@
 
 !IF "$(HY_OS)-$(HY_ARCH)" == "windows-x86_64" 
 ml=ml64
-# don't quite know what to specify as an entry point on win/em64t
-ENTRY_OPTION=
+DLLENTRY=
 !ELSE
 ml=ml
-ENTRY_OPTION=-entry:_DllMainCRTStartup@12
+DLLENTRY=@12
 !ENDIF
 
 .c.obj:
@@ -46,7 +45,7 @@
 !ifdef DLLNAME
 $(DLLNAME): $(LIBNAME)
 	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
-	$(ENTRY_OPTION) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
+	-entry:_DllMainCRTStartup$(DLLENTRY) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
 		$(COMMENT) \
 	-subsystem:windows -out:$@ -map:$*.map \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
@@ -54,7 +53,6 @@
 		comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
 	if exist $(DLLNAME).manifest \
 		mt -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2
-#	del /Q $(DLLNAME).manifest
 !endif
 
 !ifdef EXENAME



Mime
View raw message