diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-11 05:33:42 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-11 05:33:42 +0000 |
| commit | 7b830f7339d23051670f049ffc74860684a9325f (patch) | |
| tree | 8f9ff3764bf5685e9f9333030812f2d585352042 | |
| parent | 64ab91fca7d2cf2e4cb6eca5d738e61e9c115fe2 (diff) | |
* {bcc32,win32}/Makefile.sub (COMMON_MACROS): workaround for old SDK's
bug. [ruby-core:12584]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13678 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Oct 11 14:32:46 2007 NAKAMURA Usaku <usa@ruby-lang.org> + + * {bcc32,win32}/Makefile.sub (COMMON_MACROS): workaround for old SDK's + bug. [ruby-core:12584] + Wed Oct 10 23:34:45 2007 Tanaka Akira <akr@fsij.org> * lib/securerandom.rb: new file. [ruby-dev:31928] diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 17e9ac3a6c..93452bea01 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -398,7 +398,7 @@ s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),; s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t -s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN,;t t +s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN WIN32,;t t s,@COMMON_HEADERS@,winsock2.h windows.h,;t t s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t s,@EXPORT_PREFIX@,_,;t t diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a6df99dd1f..955f634862 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -424,7 +424,7 @@ s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}. s,@RULE_SUBST@,{.;$$(srcdir);$$(topdir);$$(hdrdir)}%s,;t t s,@TRY_LINK@,$$(CC) -Feconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS) -link $$(LDFLAGS) $$(LIBPATH) $$(XLDFLAGS),;t t s,@COMMON_LIBS@,m,;t t -s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN,;t t +s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN WIN32,;t t !if defined(USE_WINSOCK2) s,@COMMON_HEADERS@,winsock2.h windows.h,;t t !else |