From e869ff20a31c6e19b1a63adb7e131c959c3ddb61 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 3 Aug 2005 15:27:13 +0000
Subject: * common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub:
 integrated   macro definitions.

* bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.

* {win32,wince}/Makefile.sub: separate config.h for compiler versions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/Makefile.sub | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'win32/Makefile.sub')

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 7141575e9f..067f46e362 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -168,9 +168,6 @@ EXTSTATIC     =
 
 OBJEXT = obj
 
-EXTOBJS       = 
-DLDOBJS       = 
-
 WINMAINOBJ    = winmain.$(OBJEXT)
 MINIOBJS      = dmydln.$(OBJEXT)
 
@@ -210,9 +207,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
 #define HAVE_PROTOTYPES 1
 #define TOKEN_PASTE(x,y) x##y
 #define HAVE_STDARG_PROTOTYPES 1
-#if _MSC_VER > 1100
+!if $(MSC_VER) > 1100
 #define NORETURN(x) __declspec(noreturn) x
-#endif
+!endif
 #define HAVE_DECL_SYS_NERR 1
 #define HAVE_LIMITS_H 1
 #define HAVE_FCNTL_H 1
-- 
cgit v1.2.3