Dynamic runtime library must be used with Open Watcom

Modified Files:
   ChangeLog configure configure.in doc/C/README.w32
   doc/ja_JP.eucJP/README.w32

diff --git a/ChangeLog b/ChangeLog
index 0f32b9b..27fbcd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-31 Keishi Suenaga <s_keishi@mutt.freemail.ne.jp>
+       * configure.in:
+         dynamic linked runtime library must be used with Open Watcom.
+
 2004-05-31  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
 
        * timidity/common.c (open_file): ignore directories when searching

diff --git a/configure b/configure
index 22fcdca..0cc466f 100755 (executable)
--- a/configure
+++ b/configure
@@ -3896,7 +3896,7 @@ case "$target" in
         ;;
       "xwcc386_w.sh "*)
          WATCOM=yes
-         CFLAGS="$CFLAGS -5s -zk0 -bm -zp=16 -w=4 -D_WINDOWS -DWIN32 -DINCLUDE_WINDOWS_H"
+         CFLAGS="$CFLAGS -br -5s -zk0 -bm -zp=16 -w=4 -D_WINDOWS -DWIN32 -DINCLUDE_WINDOWS_H"
          WATCOM_LDFLAGS=
          EXTRALIBS="$EXTRALIBS kernel32.lib winspool.lib comdlg32.lib advapi32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib user32.lib shell32.lib libcmt.lib"
          ;;
@@ -3929,7 +3929,7 @@ case "$target" in
         ;;
       "xwcc386_w.sh "*)
          WATCOM=yes
-         CFLAGS="$CFLAGS -5s -zk0 -bm -zp=16 -w=4 -D_WINDOWS -DWIN32 -DINCLUDE_WINDOWS_H"
+         CFLAGS="$CFLAGS -br -5s -zk0 -bm -zp=16 -w=4 -D_WINDOWS -DWIN32 -DINCLUDE_WINDOWS_H"
          WATCOM_LDFLAGS=
          EXTRALIBS="$EXTRALIBS kernel32.lib winspool.lib comdlg32.lib advapi32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib user32.lib shell32.lib libcmt.lib"
          ;;

diff --git a/configure.in b/configure.in
index 6854d06..80e5854 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -230,7 +230,7 @@ case "$target" in
         ;;
       "xwcc386_w.sh "*)
          WATCOM=yes
-         CFLAGS="$CFLAGS -5s -zk0 -bm -zp=16 -w=4 -D_WINDOWS -DWIN32 -DINCLUDE_WINDOWS_H"
+         CFLAGS="$CFLAGS -br -5s -zk0 -bm -zp=16 -w=4 -D_WINDOWS -DWIN32 -DINCLUDE_WINDOWS_H"
          WATCOM_LDFLAGS=
          EXTRALIBS="$EXTRALIBS kernel32.lib winspool.lib comdlg32.lib advapi32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib user32.lib shell32.lib libcmt.lib"
          ;;
@@ -263,7 +263,7 @@ case "$target" in
         ;;
       "xwcc386_w.sh "*)
          WATCOM=yes
-         CFLAGS="$CFLAGS -5s -zk0 -bm -zp=16 -w=4 -D_WINDOWS -DWIN32 -DINCLUDE_WINDOWS_H"
+         CFLAGS="$CFLAGS -br -5s -zk0 -bm -zp=16 -w=4 -D_WINDOWS -DWIN32 -DINCLUDE_WINDOWS_H"
          WATCOM_LDFLAGS=
          EXTRALIBS="$EXTRALIBS kernel32.lib winspool.lib comdlg32.lib advapi32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib user32.lib shell32.lib libcmt.lib"
          ;;

diff --git a/doc/C/README.w32 b/doc/C/README.w32
index 4f105fc..a86c02f 100644 (file)
--- a/doc/C/README.w32
+++ b/doc/C/README.w32
@@ -236,9 +236,6 @@ done
 
 3.OpenWatcom C++ in Msys environment
 
-======= CAUTION !! ===========
-You cannnat distribute generated TiMidity++ binary!!. Because of LICENCE issue.
-==============================
 (1)OpenWatcom and MSYS
     1)Set OpenWatcom(http://www.openwatcom.org)
        1-1)Download OpenWatcom, install and configure them
@@ -354,7 +351,8 @@ You cannnat distribute generated TiMidity++ binary!!. Because of LICENCE issue.
             Microsoft Platform SDK
         install and configure them.
 ======= CAUTION !! ===========
-If you plan to distribute TiMidity++ binary, use "Visual C++" or "Visual Studio" not "Microsoft Visual C++ Toolkit 2003". because of LICENCE issue. And link msvcrt.lib instead of libcmt.lib
+If you plan to distribute TiMidity++ binary, use "Visual C++" or "Visual Studio" not "Microsoft Visual C++ Toolkit 2003". because of LICENCE issue. 
+Use -MD option insted of -MT and link msvcrt.lib instead of libcmt.lib.
 ==============================
 
    2)Setup Mngw and MSYS (See MingwWiki(http://mingw.sourceforge.net/MinGWiki/))

diff --git a/doc/ja_JP.eucJP/README.w32 b/doc/ja_JP.eucJP/README.w32
index d0da1ae..aa7be70 100644 (file)
--- a/doc/ja_JP.eucJP/README.w32
+++ b/doc/ja_JP.eucJP/README.w32
@@ -205,9 +205,6 @@ done
 
 
 £³¡¥Msys´Ä¶­²¼¤ÇOpenWatcom¤Ç¥³¥ó¥Ñ¥¤¥ë
-======= CAUTION !! ===========
-Open Watcom ¤Ç¥³¥ó¥Ñ¥¤¥ë¤·¤¿¥Ð¥¤¥Ê¥ê¤Ï¥é¥¤¥»¥ó¥¹¾åÇÛÉۤǤ­¤Ê¤¤¡£
-============================== 
 ¡Ê£±¡ËOpenWatcom¤ÈMSYS¤Î¥»¥Ã¥È¥¢¥Ã¥×
        £±¡ËOpenWatcom¤Î¥»¥Ã¥È¥¢¥Ã¥×(http://www.openwatcom.org)
                £±¡Ý£±¡ËOpenWatcom¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¤¯¤ë¡£
@@ -316,8 +313,8 @@ Open Watcom 
                ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¡£
 ======= CAUTION !! ===========
 Microsoft Visual C++ Toolkit 2003¤Ç¥³¥ó¥Ñ¥¤¥ë¤·¤¿¥Ð¥¤¥Ê¥ê¤Ï¥é¥¤¥»¥ó¥¹¾åÇÛÉۤǤ­¤Ê¤¤¡£
-ÇÛÉÛ¤¹¤ë¥Ð¥¤¥Ê¥ê¤Ï¡¢"Visual C++" ¤« "Visual Studio"¤Çºî¤ëɬÍפ¬¤¢¤ë¡£
-¤½¤ÎºÝ¤Ï¡¡libcmt.lib ¤Ç¤Ï¤Ê¤¯¡¡msvcrt.lib¤ò¥ê¥ó¥¯¤¹¤ë¤³¤È
+ÇÛÉÛ¤¹¤ë¥Ð¥¤¥Ê¥ê¤Ï¡¢"Visual C++" ¤« "Visual Studio"¤ÇºîÀ®¤¹¤ëɬÍפ¬¤¢¤ë¡£
+¤½¤ÎºÝ¤Ï¡¢-MT ¥ª¥×¥·¥ç¥ó¤Ç¤Ï¤Ê¤¯ -MD ¥ª¥×¥·¥ç¥ó¤ò»È¤¤¡¢libcmt.lib ¤Ç¤Ï¤Ê¤¯¡¡msvcrt.lib¤ò¥ê¥ó¥¯¤¹¤ë¤³¤È
 ============================== 
                
        £²¡ËMSYS¤Î¥»¥Ã¥È¥¢¥Ã¥×(http://sourceforge.net/projects/mingw/¡¡http://mingw.sourceforge.net/MinGWiki/))