User: ben Date: 05/10/28 07:42:08 Modified: xemacs/nt ChangeLog xemacs.mak Log: patches for bignum, xemacs.mak xemacs.mak: Set default values for BUILD_BIGNUM_MINGW_SHARED, BUILD_BIGNUM_NATIVE_SHARED to 0 to avoid make problems. xemacs.mak: Don't look in gmp-dynamic, gmp-static; the include file doesn't vary. Revision Changes Path 1.192 +8 -0 XEmacs/xemacs/nt/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v retrieving revision 1.191 retrieving revision 1.192 diff -u -p -r1.191 -r1.192 --- ChangeLog 2005/10/26 15:14:28 1.191 +++ ChangeLog 2005/10/28 05:42:07 1.192 ＠＠ -1,3 +1,11 ＠＠ +2005-10-28 Ben Wing <ben(a)xemacs.org&gt; + + * xemacs.mak (HAVE_BIGNUM): + Set default values for BUILD_BIGNUM_MINGW_SHARED, + BUILD_BIGNUM_NATIVE_SHARED to 0 to avoid make problems. + * xemacs.mak (OPT_INCLUDES): + Don't look in gmp-dynamic, gmp-static; the include file doesn't vary. + 2005-10-26 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * XEmacs 21.5.23 "daikon" is released. 1.117 +8 -2 XEmacs/xemacs/nt/xemacs.mak Index: xemacs.mak =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.mak,v retrieving revision 1.116 retrieving revision 1.117 diff -u -p -r1.116 -r1.117 --- xemacs.mak 2005/09/26 08:13:00 1.116 +++ xemacs.mak 2005/10/28 05:42:07 1.117 ＠＠ -171,6 +171,12 ＠＠ HAVE_LDAP=0 !if !defined(HAVE_BIGNUM) HAVE_BIGNUM=0 !endif +!if !defined(BUILD_BIGNUM_MINGW_SHARED) +BUILD_BIGNUM_MINGW_SHARED=0 +!endif +!if !defined(BUILD_BIGNUM_NATIVE_SHARED) +BUILD_BIGNUM_NATIVE_SHARED=0 +!endif !if !defined(OPTIMIZED_BUILD) OPTIMIZED_BUILD=1 !endif ＠＠ -564,10 +570,10 ＠＠ OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM !else !if $(BUILD_BIGNUM_NATIVE_SHARED) OPT_LIBS=$(OPT_LIBS) "$(BIGNUM_DIR)\gmp-dynamic\gmp.lib" -OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM_DIR)\gmp-dynamic" +OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM_DIR)" !else OPT_LIBS=$(OPT_LIBS) "$(BIGNUM_DIR)\gmp-static\gmp.lib" -OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM_DIR)\gmp-static" +OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM_DIR)" !endif !endif OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\number-gmp.obj $(OUTDIR)\number.obj