diff options
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 3733dc8..135c2db 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -74,6 +74,7 @@ RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat RMDIR = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat RMDIRS = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rmall.bat +MAKEDIRS = $(COMSPEC) /E:ON /C $(srcdir:/=\)\win32\makedirs.bat CP = copy > nul MV = move > nul !if !defined(BASERUBY) @@ -122,6 +123,9 @@ PLATFORM = mswin32 !ifdef NTVER ARCHDEFS = -D_WIN32_WINNT=$(NTVER) $(ARCHDEFS) !endif +!if !defined(PLATFORM_DIR) +PLATFORM_DIR = win32 +!endif arch = $(ARCH)-$(PLATFORM) sitearch = $(ARCH)-$(RT) @@ -219,13 +223,13 @@ RFLAGS = -r EXTLIBS = !endif !if !defined(LIBS) -LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib imagehlp.lib $(EXTLIBS) +LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib imagehlp.lib shlwapi.lib $(EXTLIBS) !endif !if "$(ENABLE_WIN95)" == "yes" LIBS = unicows.lib $(LIBS) !endif !if !defined(MISSING) -MISSING = acosh.obj cbrt.obj crypt.obj erf.obj ffs.obj langinfo.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32.obj setproctitle.obj +MISSING = acosh.obj cbrt.obj crypt.obj erf.obj ffs.obj langinfo.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32/win32.obj win32/file.obj setproctitle.obj !endif ARFLAGS = -machine:$(MACHINE) -out: @@ -286,8 +290,6 @@ DEFAULT_PRELUDES = $(NO_GEM_PRELUDE) DEFAULT_PRELUDES = $(YES_GEM_PRELUDE) !endif -MAKEDIRS = $(MINIRUBY) -run -e mkdir -- -p - !if !defined(STACK) !if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" STACK = 0x400000 @@ -535,11 +537,13 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define HAVE_FCNTL_H 1 #define HAVE_SYS_UTIME_H 1 #define HAVE_FLOAT_H 1 +#define HAVE_TIME_H 1 #define rb_pid_t int #define rb_gid_t int #define rb_uid_t int #define HAVE_STRUCT_STAT_ST_RDEV 1 #define HAVE_ST_RDEV 1 +#define HAVE_STRUCT_TIMEVAL 1 !if $(MSC_VER) >= 1600 #define HAVE_STDINT_H 1 !else @@ -593,7 +597,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define GETGROUPS_T int #define RETSIGTYPE void #define TYPEOF_TIMEVAL_TV_SEC long -#define GC_MARK_STACKFRAME_WORD 30 #define HAVE_ALLOCA 1 #define HAVE_DUP2 1 #define HAVE_MEMCMP 1 @@ -920,6 +923,10 @@ clean-rdoc distclean-rdoc realclean-rdoc: clean-capi distclean-capi realclean-capi: -$(Q)$(RMALL) $(CAPIOUT:/=\) +clean-platform: + $(Q)$(RM) $(PLATFORM_D:/=\) + -$(Q)$(RMDIR) $(PLATFORM_DIR:/=\) + clean-ext distclean-ext realclean-ext:: !if "$(EXTS)" != "" @for %I in ($(EXTS)) \ @@ -993,7 +1000,7 @@ $(ruby_pc): $(RBCONFIG) {$(win_srcdir)/sys}.c.obj: $(ECHO) compiling $(<:\=/) $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) -{$(srcdir)}.c.obj: +{$(srcdir)}.c{}.obj: $(ECHO) compiling $(<:\=/) $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) .c.obj: @@ -1040,7 +1047,7 @@ enc/unicode/name2ctype.h: {$(srcdir)}enc/unicode/name2ctype.h.blt $(OBJS): {$(hdrdir)/ruby}win32.h -dir.$(OBJEXT) win32.$(OBJEXT): {$(srcdir)}win32/dir.h +dir.$(OBJEXT) win32/win32.$(OBJEXT): {$(srcdir)}win32/dir.h ext/extinit.obj: ext/extinit.c $(SETUP) $(ECHO) compiling ext/extinit.c |