From aefb8fc2c40a82197d41aae27d5161dbda82c3ce 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 wince/Makefile.sub | 7 ++-----
 wince/setup.mak    | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'wince')

diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 2b8dd06b1..ae53a6b26 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -172,9 +172,6 @@ EXTSTATIC     =
 
 OBJEXT = obj
 
-EXTOBJS       = 
-DLDOBJS       = 
-
 WINMAINOBJ    = wincemain.$(OBJEXT)
 
 all: $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk
@@ -215,9 +212,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/wince/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_FCNTL_H 1
 #define HAVE_SYS_UTIME_H 1
diff --git a/wince/setup.mak b/wince/setup.mak
index 629ea993e..d2dbad231 100644
--- a/wince/setup.mak
+++ b/wince/setup.mak
@@ -64,6 +64,7 @@ EXTOUT = $(EXTOUT)
 MAJOR = RUBY_VERSION_MAJOR
 MINOR = RUBY_VERSION_MINOR
 TEENY = RUBY_VERSION_TEENY
+MSC_VER = _MSC_VER
 <<
 
 -generic-: nul
-- 
cgit