diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-03 15:27:13 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-08-03 15:27:13 +0000 |
| commit | c503845053cb7bf43e790a9221c1242b74864ace (patch) | |
| tree | 665dd5207af0c2302e27f748d824a9978f1685ff /wince | |
| parent | 2142de62813607e088321a046daadd184cd7722b (diff) | |
| download | ruby-c503845053cb7bf43e790a9221c1242b74864ace.tar.gz ruby-c503845053cb7bf43e790a9221c1242b74864ace.tar.xz ruby-c503845053cb7bf43e790a9221c1242b74864ace.zip | |
* 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/trunk@8902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'wince')
| -rw-r--r-- | wince/Makefile.sub | 11 | ||||
| -rw-r--r-- | wince/setup.mak | 1 |
2 files changed, 5 insertions, 7 deletions
diff --git a/wince/Makefile.sub b/wince/Makefile.sub index d2639c915..71a7df216 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -176,9 +176,6 @@ EXTSTATIC = OBJEXT = obj -EXTOBJS = -DLDOBJS = - WINMAINOBJ = wincemain.$(OBJEXT) all: $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk @@ -219,13 +216,13 @@ $(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 -#if _MSC_VER >= 1300 +!endif +!if $(MSC_VER) >= 1300 #define DEPRECATED(x) __declspec(deprecated) x #define NOINLINE(x) __declspec(noinline) 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 |