Hi Matz! Awesome language! Sorry about the diff... a context diff is below... -- Glenn Yukihiro Matsumoto wrote: > Hi, > [...] > PLEASE send us unified / context diff. Old diff is too hard to read. > > matz. ============================================================================== *** Makefile.old Thu Sep 30 17:35:01 2004 --- Makefile Wed Sep 14 23:56:33 2005 *************** *** 4,11 **** #### Start of system configuration section. #### srcdir = . ! topdir = $(rubylibdir)/$(arch) ! hdrdir = $(rubylibdir)/$(arch) VPATH = $(srcdir) DESTDIR = c: --- 4,11 ---- #### Start of system configuration section. #### srcdir = . ! topdir = c:/ruby/lib/ruby/1.8/i386-mswin32 ! hdrdir = $(topdir) VPATH = $(srcdir) DESTDIR = c: *************** *** 21,27 **** infodir = $(prefix)/info oldincludedir = $(DESTDIR)/usr/include libexecdir = $(exec_prefix)/libexec ! compile_dir = $(DESTDIR)/tmp/ruby-1.8.0 sbindir = $(exec_prefix)/sbin includedir = $(prefix)/include sysconfdir = $(prefix)/etc --- 21,27 ---- infodir = $(prefix)/info oldincludedir = $(DESTDIR)/usr/include libexecdir = $(exec_prefix)/libexec ! compile_dir = $(DESTDIR)/Dev/RubyDev/rubyinstaller/cvs-repo/installer-win/stable/download/ruby-1.8.2/win32 sbindir = $(exec_prefix)/sbin includedir = $(prefix)/include sysconfdir = $(prefix)/etc *************** *** 36,45 **** LIBRUBYARG_SHARED = $(LIBRUBY) LIBRUBYARG_STATIC = $(LIBRUBY_A) ! CFLAGS = -MD -Zi -O2b2xg- -G6 ! CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) -I. -I. -I./missing CXXFLAGS = $(CFLAGS) ! DLDFLAGS = -link -incremental:no -pdb:none -dll $(LIBPATH) -def:$(DEFFILE) LDSHARED = cl -nologo -LD AR = lib -nologo EXEEXT = .exe --- 36,45 ---- LIBRUBYARG_SHARED = $(LIBRUBY) LIBRUBYARG_STATIC = $(LIBRUBY_A) ! CFLAGS = -MD -Zi -O2b2xg- -G6 ! CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) -I. -I./.. -I./../missing CXXFLAGS = $(CFLAGS) ! DLDFLAGS = -link -incremental:no -debug -opt:ref -opt:icf -dll $(LIBPATH) -def:$(DEFFILE) LDSHARED = cl -nologo -LD AR = lib -nologo EXEEXT = .exe *************** *** 49,55 **** arch = i386-mswin32 sitearch = i386-msvcrt ruby_version = 1.8 ! RUBY = ruby RM = $(RUBY) -run -e rm -- -f MAKEDIRS = $(RUBY) -run -e mkdir -- -p INSTALL_PROG = $(RUBY) -run -e install -- -vpm 0755 --- 49,56 ---- arch = i386-mswin32 sitearch = i386-msvcrt ruby_version = 1.8 ! ruby = c:/ruby/bin/ruby ! RUBY = $(ruby:/=\) RM = $(RUBY) -run -e rm -- -f MAKEDIRS = $(RUBY) -run -e mkdir -- -p INSTALL_PROG = $(RUBY) -run -e install -- -vpm 0755 *************** *** 59,65 **** LIBPATH = -libpath:"$(libdir)" ! DEFFILE = RubyBarChart.def CLEANFILES = DISTCLEANFILES = --- 60,66 ---- LIBPATH = -libpath:"$(libdir)" ! DEFFILE = $(srcdir)/$(TARGET).def CLEANFILES = DISTCLEANFILES = *************** *** 67,75 **** target_prefix = LOCAL_LIBS = LIBS = $(LIBRUBYARG_SHARED) oldnames.lib user32.lib advapi32.lib wsock32.lib ! OBJS = RubyBarChart_wrap.obj Account.obj Contract.obj Portfolio.obj EntryExitSystem.obj PositionSizing.obj Tick.obj TARGET = RubyBarChart DLLIB = $(TARGET).so RUBYCOMMONDIR = $(sitedir)$(target_prefix) RUBYLIBDIR = $(sitelibdir)$(target_prefix) --- 68,77 ---- target_prefix = LOCAL_LIBS = LIBS = $(LIBRUBYARG_SHARED) oldnames.lib user32.lib advapi32.lib wsock32.lib ! OBJS = Account.obj Contract.obj EntryExitSystem.obj Portfolio.obj PositionSizing.obj Tick.obj TARGET = RubyBarChart DLLIB = $(TARGET).so + STATIC_LIB = $(TARGET).lib RUBYCOMMONDIR = $(sitedir)$(target_prefix) RUBYLIBDIR = $(sitelibdir)$(target_prefix) *************** *** 79,84 **** --- 81,87 ---- CLEANOBJS = "*.{obj,lib,s[ol],pdb,bak}" all: $(DLLIB) + static: $(STATIC_LIB) clean: @$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) *************** *** 133,138 **** --- 136,144 ---- @-$(RM) $@ @-$(RM) $(TARGET).lib $(LDSHARED) -Fe$(@) $(OBJS) $(LIBS) $(LOCAL_LIBS) $(DLDFLAGS) + + $(STATIC_LIB): $(OBJS) + $(AR) -machine:x86 -out:$@ $(OBJS) RubyBarChart_wrap.cxx: RubyBarChart.i Makefile extconf.rb Account.h Contract.h Portfolio.h Tick.h EntryExitSystem.h Order.h PositionSizing.h