summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-11 05:31:48 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-10-11 05:31:48 +0000
commitba997e3529e3397dd64557891c06ccb350601d17 (patch)
treeee82f5c1f7fcb4e58c1e29531879b04dc826299b
parent46a30fd4a27df9ce2aa39c7835069262adec65da (diff)
* bcc32/Makefile.sub, too.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog2
-rw-r--r--bcc32/Makefile.sub2
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 49ffd49bda..ecf00c5b2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
Thu Oct 11 14:29:31 2007 NAKAMURA Usaku <usa@ruby-lang.org>
- * win32/Makefile.sub (COMMON_MACROS): workaround for old SDK's bug.
+ * */Makefile.sub (COMMON_MACROS): workaround for old SDK's bug.
[ruby-core:12584]
Thu Oct 11 06:35:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index e18702e360..b0f6e4c821 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -428,7 +428,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