NOTE: This patch has been committed.
nt/ChangeLog addition:
2005-10-28 Ben Wing <ben(a)xemacs.org>
* 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.
build source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: nt/xemacs.mak
Index: nt/xemacs.mak
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.mak,v
retrieving revision 1.116
diff -u -p -r1.116 xemacs.mak
--- nt/xemacs.mak 2005/09/26 08:13:00 1.116
+++ nt/xemacs.mak 2005/10/28 05:39:23
@@ -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
Show replies by date