summaryrefslogtreecommitdiff
path: root/wince
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-03 15:27:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-03 15:27:13 +0000
commite869ff20a31c6e19b1a63adb7e131c959c3ddb61 (patch)
treef4f5d900e998d283298787dfb2c91530018732ef /wince
parenta0d58fef04f389082c5c397ab77688a3608abc27 (diff)
* 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
Diffstat (limited to 'wince')
-rw-r--r--wince/Makefile.sub7
-rw-r--r--wince/setup.mak1
2 files changed, 3 insertions, 5 deletions
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 2b8dd06..ae53a6b 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 629ea99..d2dbad2 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