harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r591059 - in /harmony/enhanced/classlib/trunk/depends/build: defines.mak rules.mak
Date Thu, 01 Nov 2007 15:47:49 GMT
Author: tellison
Date: Thu Nov  1 08:47:48 2007
New Revision: 591059

URL: http://svn.apache.org/viewvc?rev=591059&view=rev
Log:
Additional flags to tolerate MS Studio 2005.

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

Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mak?rev=591059&r1=591058&r2=591059&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mak (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mak Thu Nov  1 08:47:48 2007
@@ -38,8 +38,11 @@
 !ENDIF
 
 HYCOMMONCFLAGS = \
-  -$(WARNING_LEVEL) -GF -Gs -MD -Zm400 \
-  -D_DLL -D_MT -D_WINSOCKAPI_ $(PLATFORM_64) \
+  -$(WARNING_LEVEL) -GF -Gs -MD -Zm400 $(PLATFORM_64) \
+  -D_CRT_SECURE_NO_DEPRECATE \
+  -D_CRT_SECURE_NO_WARNINGS \
+  -D_SCL_SECURE_NO_DEPRECATE \
+  -D_DLL -D_MT -D_WINSOCKAPI_ \
   /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I.
 
 !ifndef HYDEBUGCFLAGS

Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mak?rev=591059&r1=591058&r2=591059&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mak (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mak Thu Nov  1 08:47:48 2007
@@ -39,18 +39,20 @@
 $(LIBNAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
 	$(implib) /NOLOGO -subsystem:windows -out:$(LIBNAME) \
 	$(HYLDFLAGS) -machine:$(CPU) \
+	/NODEFAULTLIB:libc \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
 !endif
 
 !ifdef DLLNAME
 $(DLLNAME): $(LIBNAME)
 	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
+	/NODEFAULTLIB:libcmt /NODEFAULTLIB:libc /FORCE:UNRESOLVED \
 	-entry:_DllMainCRTStartup$(DLLENTRY) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
-		$(COMMENT) \
+	$(COMMENT) \
 	-subsystem:windows -out:$@ -map:$*.map \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
-	kernel32.lib  ws2_32.lib advapi32.lib user32.lib gdi32.lib \
-		comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
+	kernel32.lib  msvcrt.lib ws2_32.lib advapi32.lib user32.lib gdi32.lib \
+	comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
 	if exist $(DLLNAME).manifest \
 		mt -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2
 !endif



Mime
View raw message