update for Win32

diff --git a/README b/README
index 8f521c601af31ea642f225e5f201fd6cb754a883..db3e1d59777a2cdfa3c9e0607ad1dcd376895d5c 100644 (file)
--- a/README
+++ b/README
@@ -53,16 +53,18 @@ Install
 
  Case 2: Win32 platform (VC++)
 
-   1. copy win32\Makefile Makefile
-   2. copy win32\config.h config.h
-   3. nmake
+   1. copy win32\Makefile src\Makefile
+   2. copy win32\config.h src\config.h
+   3. cd src
+   4. nmake
 
       onig_s.lib:  static link library
       onig.dll:    dynamic link library
 
   * test (ASCII/Shift_JIS)
-   4. copy win32\testc.c testc.c
-   5. nmake ctest
+   1. copy win32\testc.c src\testc.c
+   2. cd src
+   3. nmake ctest
 
 
 

diff --git a/README.ja b/README.ja
index 110770d693e841338f8c0454e487509a0791e72c..4b0ef40d968a6a0bd4f8dbafbc3237facdb32278 100644 (file)
--- a/README.ja
+++ b/README.ja
@@ -54,16 +54,18 @@ https://github.com/kkos/oniguruma
 
  ¥±¡¼¥¹£²: Win32(VC++)´Ä¶­
 
-   1. copy win32\Makefile Makefile
-   2. copy win32\config.h config.h
-   3. nmake
+   1. copy win32\Makefile src\Makefile
+   2. copy win32\config.h src\config.h
+   3. cd src
+   4. nmake
 
       onig_s.lib:  static link library
       onig.dll:    dynamic link library
 
   * Æ°ºî¥Æ¥¹¥È (ASCII/Shift_JIS)
-   4. copy win32\testc.c testc.c
-   5. nmake ctest
+   1. copy win32\testc.c src\testc.c
+   2. cd src
+   3. nmake ctest
 
 
 

diff --git a/README.md b/README.md
index 70f2b8275b1c01b424f0a0dd91aa02236724f3af..1d86a3210b2c85a94f4c2206639d497eb90175d8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -54,17 +54,19 @@ Install
 
 ### Case 2: Win32 platform (VC++)
 
-   1. copy win32\Makefile Makefile
-   2. copy win32\config.h config.h
-   3. nmake
+   1. copy win32\Makefile src\Makefile
+   2. copy win32\config.h src\config.h
+   3. cd src
+   4. nmake
 
       onig_s.lib:  static link library
       onig.dll:    dynamic link library
 
    * test (ASCII/Shift_JIS)
 
-   4. copy win32\testc.c testc.c
-   5. nmake ctest
+   1. copy win32\testc.c src\testc.c
+   2. cd src
+   3. nmake ctest
 
 
 

diff --git a/win32/Makefile b/win32/Makefile
index 27d8832ee097433a2007b726763950e7ae173208..300b3174201805f8af8e58285013f89073d72121 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -35,25 +35,25 @@ onigobjs     = reggnu.obj regerror.obj regparse.obj regext.obj regcomp.obj \
 posixobjs    = regposix.obj regposerr.obj\r
 libobjs      = $(onigobjs) $(posixobjs)\r
 \r
-jp_objs      =  $(encdir)\euc_jp.obj $(encdir)\sjis.obj\r
-iso8859_objs =  $(encdir)\iso8859_1.obj  $(encdir)\iso8859_2.obj \\r
-               $(encdir)\iso8859_3.obj  $(encdir)\iso8859_4.obj \\r
-               $(encdir)\iso8859_5.obj  $(encdir)\iso8859_6.obj \\r
-               $(encdir)\iso8859_7.obj  $(encdir)\iso8859_8.obj \\r
-               $(encdir)\iso8859_9.obj  $(encdir)\iso8859_10.obj \\r
-               $(encdir)\iso8859_11.obj $(encdir)\iso8859_13.obj \\r
-               $(encdir)\iso8859_14.obj $(encdir)\iso8859_15.obj \\r
-               $(encdir)\iso8859_16.obj\r
-\r
-encobjs      =  $(encdir)\ascii.obj $(encdir)\utf8.obj \\r
-               $(encdir)\unicode.obj \\r
-               $(encdir)\utf16_be.obj $(encdir)\utf16_le.obj \\r
-               $(encdir)\utf32_be.obj $(encdir)\utf32_le.obj \\r
+jp_objs      =  euc_jp.obj sjis.obj\r
+iso8859_objs =  iso8859_1.obj  iso8859_2.obj \\r
+               iso8859_3.obj  iso8859_4.obj \\r
+               iso8859_5.obj  iso8859_6.obj \\r
+               iso8859_7.obj  iso8859_8.obj \\r
+               iso8859_9.obj  iso8859_10.obj \\r
+               iso8859_11.obj iso8859_13.obj \\r
+               iso8859_14.obj iso8859_15.obj \\r
+               iso8859_16.obj\r
+\r
+encobjs = ascii.obj utf8.obj \\r
+               unicode.obj \\r
+               utf16_be.obj utf16_le.obj \\r
+               utf32_be.obj utf32_le.obj \\r
                $(jp_objs) $(iso8859_objs) \\r
-               $(encdir)\euc_tw.obj $(encdir)\euc_kr.obj $(encdir)\big5.obj \\r
-               $(encdir)\gb18030.obj \\r
-               $(encdir)\koi8_r.obj  \\r
-               $(encdir)\cp1251.obj # $(encdir)\koi8.obj\r
+               euc_tw.obj euc_kr.obj big5.obj \\r
+               gb18030.obj \\r
+               koi8_r.obj  \\r
+               cp1251.obj # koi8.obj\r
 \r
 onigsources  = regerror.c regparse.c regext.c regcomp.c regexec.c regenc.c \\r
               regsyntax.c regtrav.c regversion.c reggnu.c st.c\r
@@ -61,7 +61,6 @@ posixsources = regposix.c regposerr.c
 libsources   = $(posixsources) $(onigsources)\r
 rubysources  = $(onigsources)\r
 \r
-encdir       = enc\r
 patchfiles   = re.c.168.patch re.c.181.patch\r
 distfiles    = README COPYING HISTORY \\r
                Makefile.in configure.in config.h.in configure \\r
@@ -82,8 +81,8 @@ makeargs = $(MFLAGS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' CC='$(CC)'
 default: all\r
 \r
 setup:\r
-       $(CP) win32\config.h config.h\r
-       $(CP) win32\testc.c  testc.c\r
+       $(CP) ..\win32\config.h config.h\r
+       $(CP) ..\win32\testc.c  testc.c\r
 \r
 \r
 all: $(libname) $(dllname) \r
@@ -108,37 +107,37 @@ regposix.obj:  regposix.c $(posixheaders) oniguruma.h config.h
 regposerr.obj: regposerr.c $(posixheaders) config.h\r
 st.obj:        st.c regint.h oniguruma.h config.h st.h\r
 \r
-$(encdir)\ascii.obj:      $(encdir)\ascii.c regenc.h config.h\r
-$(encdir)\unicode.obj:    $(encdir)\unicode.c regenc.h config.h\r
-$(encdir)\utf8.obj:       $(encdir)\utf8.c regenc.h config.h\r
-$(encdir)\utf16_be.obj:   $(encdir)\utf16_be.c regenc.h config.h\r
-$(encdir)\utf16_le.obj:   $(encdir)\utf16_le.c regenc.h config.h\r
-$(encdir)\utf32_be.obj:   $(encdir)\utf32_be.c regenc.h config.h\r
-$(encdir)\utf32_le.obj:   $(encdir)\utf32_le.c regenc.h config.h\r
-$(encdir)\euc_jp.obj:     $(encdir)\euc_jp.c regenc.h config.h\r
-$(encdir)\euc_tw.obj:     $(encdir)\euc_tw.c regenc.h config.h\r
-$(encdir)\euc_kr.obj:     $(encdir)\euc_kr.c regenc.h config.h\r
-$(encdir)\sjis.obj:       $(encdir)\sjis.c regenc.h config.h\r
-$(encdir)\iso8859_1.obj:  $(encdir)\iso8859_1.c regenc.h config.h\r
-$(encdir)\iso8859_2.obj:  $(encdir)\iso8859_2.c regenc.h config.h\r
-$(encdir)\iso8859_3.obj:  $(encdir)\iso8859_3.c regenc.h config.h\r
-$(encdir)\iso8859_4.obj:  $(encdir)\iso8859_4.c regenc.h config.h\r
-$(encdir)\iso8859_5.obj:  $(encdir)\iso8859_5.c regenc.h config.h\r
-$(encdir)\iso8859_6.obj:  $(encdir)\iso8859_6.c regenc.h config.h\r
-$(encdir)\iso8859_7.obj:  $(encdir)\iso8859_7.c regenc.h config.h\r
-$(encdir)\iso8859_8.obj:  $(encdir)\iso8859_8.c regenc.h config.h\r
-$(encdir)\iso8859_9.obj:  $(encdir)\iso8859_9.c regenc.h config.h\r
-$(encdir)\iso8859_10.obj: $(encdir)\iso8859_10.c regenc.h config.h\r
-$(encdir)\iso8859_11.obj: $(encdir)\iso8859_11.c regenc.h config.h\r
-$(encdir)\iso8859_13.obj: $(encdir)\iso8859_13.c regenc.h config.h\r
-$(encdir)\iso8859_14.obj: $(encdir)\iso8859_14.c regenc.h config.h\r
-$(encdir)\iso8859_15.obj: $(encdir)\iso8859_15.c regenc.h config.h\r
-$(encdir)\iso8859_16.obj: $(encdir)\iso8859_16.c regenc.h config.h\r
-$(encdir)\koi8.obj:       $(encdir)\koi8.c   regenc.h config.h\r
-$(encdir)\koi8_r.obj:     $(encdir)\koi8_r.c regenc.h config.h\r
-$(encdir)\cp1251.obj:     $(encdir)\cp1251.c regenc.h config.h\r
-$(encdir)\big5.obj:       $(encdir)\big5.c   regenc.h config.h\r
-$(encdir)\gb18030.obj:    $(encdir)\gb18030.c   regenc.h config.h\r
+ascii.obj:      ascii.c regenc.h config.h\r
+unicode.obj:    unicode.c regenc.h config.h\r
+utf8.obj:       utf8.c regenc.h config.h\r
+utf16_be.obj:   utf16_be.c regenc.h config.h\r
+utf16_le.obj:   utf16_le.c regenc.h config.h\r
+utf32_be.obj:   utf32_be.c regenc.h config.h\r
+utf32_le.obj:   utf32_le.c regenc.h config.h\r
+euc_jp.obj:     euc_jp.c regenc.h config.h\r
+euc_tw.obj:     euc_tw.c regenc.h config.h\r
+euc_kr.obj:     euc_kr.c regenc.h config.h\r
+sjis.obj:       sjis.c regenc.h config.h\r
+iso8859_1.obj:  iso8859_1.c regenc.h config.h\r
+iso8859_2.obj:  iso8859_2.c regenc.h config.h\r
+iso8859_3.obj:  iso8859_3.c regenc.h config.h\r
+iso8859_4.obj:  iso8859_4.c regenc.h config.h\r
+iso8859_5.obj:  iso8859_5.c regenc.h config.h\r
+iso8859_6.obj:  iso8859_6.c regenc.h config.h\r
+iso8859_7.obj:  iso8859_7.c regenc.h config.h\r
+iso8859_8.obj:  iso8859_8.c regenc.h config.h\r
+iso8859_9.obj:  iso8859_9.c regenc.h config.h\r
+iso8859_10.obj: iso8859_10.c regenc.h config.h\r
+iso8859_11.obj: iso8859_11.c regenc.h config.h\r
+iso8859_13.obj: iso8859_13.c regenc.h config.h\r
+iso8859_14.obj: iso8859_14.c regenc.h config.h\r
+iso8859_15.obj: iso8859_15.c regenc.h config.h\r
+iso8859_16.obj: iso8859_16.c regenc.h config.h\r
+koi8.obj:       koi8.c   regenc.h config.h\r
+koi8_r.obj:     koi8_r.c regenc.h config.h\r
+cp1251.obj:     cp1251.c regenc.h config.h\r
+big5.obj:       big5.c   regenc.h config.h\r
+gb18030.obj:    gb18030.c regenc.h config.h\r
 \r
 \r
 # Ruby test\r
@@ -166,28 +165,7 @@ $(testc)u: $(testc)u.c $(libname)
        $(CC) -nologo -o $(testc)u -DONIG_EXTERN=extern $(testc)u.c $(libname)\r
 \r
 clean:\r
-       del *.obj $(encdir)\*.obj *.lib *.exp *.dll $(testp).exe $(testc).exe $(testc).obj\r
-\r
-\r
-# backup file suffix\r
-SORIG = ruby_orig\r
-\r
-# ruby 1.9 source update\r
-19:\r
-       $(CP) regerror.c    $(RUBYDIR)\r
-       $(CP) regparse.c    $(RUBYDIR)\r
-       $(CP) regcomp.c     $(RUBYDIR)\r
-       $(CP) regexec.c     $(RUBYDIR)\r
-       $(CP) regenc.c      $(RUBYDIR)\r
-       $(CP) regint.h      $(RUBYDIR)\r
-       $(CP) regparse.h    $(RUBYDIR)\r
-       $(CP) regenc.h      $(RUBYDIR)\r
-       $(CP) oniguruma.h   $(RUBYDIR)\r
-       $(CP) enc\ascii.c   $(RUBYDIR)\r
-       $(CP) enc\utf8.c    $(RUBYDIR)\r
-       $(CP) enc\euc_jp.c  $(RUBYDIR)\r
-       $(CP) enc\sjis.c    $(RUBYDIR)\r
-       $(CP) enc\unicode.c $(RUBYDIR)\r
+       del *.obj *.lib *.exp *.dll $(testp).exe $(testc).exe $(testc).obj\r
 \r
 \r
 samples: all\r