Menu
▾
▴
ggnfs-commits
|
From: <brg...@us...> - 2011-01-12 11:57:39
|
Revision: 401
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=401&view=rev
Author: brgladman
Date: 2011-01-12 11:57:31 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Correct location of the GMP/MPIR header file
Modified Paths:
--------------
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
trunk/build.vc10/mp_lib.props
Removed Paths:
-------------
trunk/build.vc10/gmp.h
Deleted: trunk/build.vc10/gmp.h
===================================================================
--- trunk/build.vc10/gmp.h 2010-10-07 02:26:00 UTC (rev 400)
+++ trunk/build.vc10/gmp.h 2011-01-12 11:57:31 UTC (rev 401)
@@ -1,2187 +0,0 @@
-/* Definitions for GNU multiple precision functions. -*- mode: c -*-
-
-Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
-
-#ifndef __GMP_H__
-
-#if defined (__cplusplus)
-#include <iosfwd> /* for std::istream, std::ostream, std::string */
-#endif
-
-
-#if ! defined (__GMP_WITHIN_CONFIGURE)
-# if defined( _MSC_VER )
-# if defined( _WIN64 )
-# define __GMP_BITS_PER_MP_LIMB 64
-# define GMP_LIMB_BITS 64
-# define SIZEOF_MP_LIMB_T 8
-# define _LONG_LONG_LIMB 1
-# elif defined( _WIN32 )
-# define __GMP_BITS_PER_MP_LIMB 32
-# define GMP_LIMB_BITS 32
-# define SIZEOF_MP_LIMB_T 4
-# ifdef _LONG_LONG_LIMB
-# undef _LONG_LONG_LIMB
-# endif
-# else
-# error This is the wrong version of gmp.h
-# endif
-# endif
-# define GMP_NAIL_BITS 0
-#endif
-#define GMP_NUMB_BITS (GMP_LIMB_BITS - GMP_NAIL_BITS)
-#define GMP_NUMB_MASK ((~ __GMP_CAST (mp_limb_t, 0)) >> GMP_NAIL_BITS)
-#define GMP_NUMB_MAX GMP_NUMB_MASK
-#define GMP_NAIL_MASK (~ GMP_NUMB_MASK)
-
-
-/* The following (everything under ifndef __GNU_MP__) must be identical in
- gmp.h and mp.h to allow both to be included in an application or during
- the library build. */
-#ifndef __GNU_MP__
-#define __GNU_MP__ 4
-
-#define __need_size_t /* tell gcc stddef.h we only want size_t */
-#if defined (__cplusplus)
-#include <cstddef> /* for size_t */
-#else
-#include <stddef.h> /* for size_t */
-#endif
-#undef __need_size_t
-
-
-
-/* __STDC__ - some ANSI compilers define this only to 0, hence the use of
- "defined" and not "__STDC__-0". In particular Sun workshop C 5.0
- sets __STDC__ to 0, but requires "##" for token pasting.
-
- _AIX - gnu ansidecl.h asserts that all known AIX compilers are ANSI but
- don't always define __STDC__.
-
- __DECC - current versions of DEC C (5.9 for instance) for alpha are ANSI,
- but don't define __STDC__ in their default mode. Don't know if old
- versions might have been K&R, but let's not worry about that unless
- someone is still using one.
-
- _mips - gnu ansidecl.h says the RISC/OS MIPS compiler is ANSI in SVR4
- mode, but doesn't define __STDC__.
-
- _MSC_VER - Microsoft C is ANSI, but __STDC__ is undefined unless the /Za
- option is given (in which case it's 1).
-
- _WIN32 - tested for by gnu ansidecl.h, no doubt on the assumption that
- all w32 compilers are ansi.
-
- Note: This same set of tests is used by gen-psqr.c and
- demos/expr/expr-impl.h, so if anything needs adding, then be sure to
- update those too. */
-
-#if defined (__STDC__) \
- || defined (__cplusplus) \
- || defined (_AIX) \
- || defined (__DECC) \
- || (defined (__mips) && defined (_SYSTYPE_SVR4)) \
- || defined (_MSC_VER) \
- || defined (_WIN32)
-#define __GMP_HAVE_CONST 1
-#define __GMP_HAVE_PROTOTYPES 1
-#define __GMP_HAVE_TOKEN_PASTE 1
-#else
-#define __GMP_HAVE_CONST 0
-#define __GMP_HAVE_PROTOTYPES 0
-#define __GMP_HAVE_TOKEN_PASTE 0
-#endif
-
-
-#if __GMP_HAVE_CONST
-#define __gmp_const const
-#define __gmp_signed signed
-#else
-#define __gmp_const
-#define __gmp_signed
-#endif
-
-
-/* __GMP_DECLSPEC supports Windows DLL versions of libgmp, and is empty in
- all other circumstances.
-
- When compiling objects for libgmp, __GMP_DECLSPEC is an export directive,
- or when compiling for an application it's an import directive. The two
- cases are differentiated by __GMP_WITHIN_GMP defined by the GMP Makefiles
- (and not defined from an application).
-
- __GMP_DECLSPEC_XX is similarly used for libgmpxx. __GMP_WITHIN_GMPXX
- indicates when building libgmpxx, and in that case libgmpxx functions are
- exports, but libgmp functions which might get called are imports.
-
- libmp.la uses __GMP_DECLSPEC, just as if it were libgmp.la. libgmp and
- libmp don't call each other, so there's no conflict or confusion.
-
- Libtool DLL_EXPORT define is not used.
-
- There's no attempt to support GMP built both static and DLL. Doing so
- would mean applications would have to tell us which of the two is going
- to be used when linking, and that seems very tedious and error prone if
- using GMP by hand, and equally tedious from a package since autoconf and
- automake don't give much help.
-
- __GMP_DECLSPEC is required on all documented global functions and
- variables, the various internals in gmp-impl.h etc can be left unadorned.
- But internals used by the test programs or speed measuring programs
- should have __GMP_DECLSPEC, and certainly constants or variables must
- have it or the wrong address will be resolved.
-
- In gcc __declspec can go at either the start or end of a prototype.
-
- In Microsoft C __declspec must go at the start, or after the type like
- void __declspec(...) *foo()". There's no __dllexport or anything to
- guard against someone foolish #defining dllexport. _export used to be
- available, but no longer.
-
- In Borland C _export still exists, but needs to go after the type, like
- "void _export foo();". Would have to change the __GMP_DECLSPEC syntax to
- make use of that. Probably more trouble than it's worth. */
-
-#if defined (__GNUC__)
-#define __GMP_DECLSPEC_EXPORT __declspec(__dllexport__)
-#define __GMP_DECLSPEC_IMPORT __declspec(__dllimport__)
-#endif
-#if defined (_MSC_VER) || defined (__BORLANDC__)
-#define __GMP_DECLSPEC_EXPORT __declspec(dllexport)
-#define __GMP_DECLSPEC_IMPORT __declspec(dllimport)
-#endif
-#ifdef __WATCOMC__
-#define __GMP_DECLSPEC_EXPORT __export
-#define __GMP_DECLSPEC_IMPORT __import
-#endif
-#ifdef __IBMC__
-#define __GMP_DECLSPEC_EXPORT _Export
-#define __GMP_DECLSPEC_IMPORT _Import
-#endif
-
-#if __GMP_LIBGMP_DLL
-#if __GMP_WITHIN_GMP
-/* compiling to go into a DLL libgmp */
-#define __GMP_DECLSPEC __GMP_DECLSPEC_EXPORT
-#else
-/* compiling to go into an application which will link to a DLL libgmp */
-#define __GMP_DECLSPEC __GMP_DECLSPEC_IMPORT
-#endif
-#else
-/* all other cases */
-#define __GMP_DECLSPEC
-#endif
-
-
-#ifdef __GMP_SHORT_LIMB
-typedef unsigned int mp_limb_t;
-typedef int mp_limb_signed_t;
-#else
-#ifdef _LONG_LONG_LIMB
-typedef unsigned long long int mp_limb_t;
-typedef long long int mp_limb_signed_t;
-#else
-typedef unsigned long int mp_limb_t;
-typedef long int mp_limb_signed_t;
-#endif
-#endif
-
-/* For reference, note that the name __mpz_struct gets into C++ mangled
- function names, which means although the "__" suggests an internal, we
- must leave this name for binary compatibility. */
-typedef struct
-{
- int _mp_alloc; /* Number of *limbs* allocated and pointed
- to by the _mp_d field. */
- int _mp_size; /* abs(_mp_size) is the number of limbs the
- last field points to. If _mp_size is
- negative this is a negative number. */
- mp_limb_t *_mp_d; /* Pointer to the limbs. */
-} __mpz_struct;
-
-#endif /* __GNU_MP__ */
-
-
-typedef __mpz_struct MP_INT; /* gmp 1 source compatibility */
-typedef __mpz_struct mpz_t[1];
-
-typedef mp_limb_t * mp_ptr;
-typedef __gmp_const mp_limb_t * mp_srcptr;
-#if defined (_CRAY) && ! defined (_CRAYMPP)
-/* plain `int' is much faster (48 bits) */
-#define __GMP_MP_SIZE_T_INT 1
-typedef int mp_size_t;
-typedef int mp_exp_t;
-#else
-#define __GMP_MP_SIZE_T_INT 0
-typedef long int mp_size_t;
-typedef long int mp_exp_t;
-#endif
-
-typedef struct
-{
- __mpz_struct _mp_num;
- __mpz_struct _mp_den;
-} __mpq_struct;
-
-typedef __mpq_struct MP_RAT; /* gmp 1 source compatibility */
-typedef __mpq_struct mpq_t[1];
-
-typedef struct
-{
- int _mp_prec; /* Max precision, in number of `mp_limb_t's.
- Set by mpf_init and modified by
- mpf_set_prec. The area pointed to by the
- _mp_d field contains `prec' + 1 limbs. */
- int _mp_size; /* abs(_mp_size) is the number of limbs the
- last field points to. If _mp_size is
- negative this is a negative number. */
- mp_exp_t _mp_exp; /* Exponent, in the base of `mp_limb_t'. */
- mp_limb_t *_mp_d; /* Pointer to the limbs. */
-} __mpf_struct;
-
-/* typedef __mpf_struct MP_FLOAT; */
-typedef __mpf_struct mpf_t[1];
-
-/* Available random number generation algorithms. */
-typedef enum
-{
- GMP_RAND_ALG_DEFAULT = 0,
- GMP_RAND_ALG_LC = GMP_RAND_ALG_DEFAULT /* Linear congruential. */
-} gmp_randalg_t;
-
-/* Random state struct. */
-typedef struct
-{
- mpz_t _mp_seed; /* _mp_d member points to state of the generator. */
- gmp_randalg_t _mp_alg; /* Currently unused. */
- union {
- void *_mp_lc; /* Pointer to function pointers structure. */
- } _mp_algdata;
-} __gmp_randstate_struct;
-typedef __gmp_randstate_struct gmp_randstate_t[1];
-
-/* Types for function declarations in gmp files. */
-/* ??? Should not pollute user name space with these ??? */
-typedef __gmp_const __mpz_struct *mpz_srcptr;
-typedef __mpz_struct *mpz_ptr;
-typedef __gmp_const __mpf_struct *mpf_srcptr;
-typedef __mpf_struct *mpf_ptr;
-typedef __gmp_const __mpq_struct *mpq_srcptr;
-typedef __mpq_struct *mpq_ptr;
-
-
-/* This is not wanted in mp.h, so put it outside the __GNU_MP__ common
- section. */
-#if __GMP_LIBGMP_DLL
-#if __GMP_WITHIN_GMPXX
-/* compiling to go into a DLL libgmpxx */
-#define __GMP_DECLSPEC_XX __GMP_DECLSPEC_EXPORT
-#else
-/* compiling to go into a application which will link to a DLL libgmpxx */
-#define __GMP_DECLSPEC_XX __GMP_DECLSPEC_IMPORT
-#endif
-#else
-/* all other cases */
-#define __GMP_DECLSPEC_XX
-#endif
-
-
-#if __GMP_HAVE_PROTOTYPES
-#define __GMP_PROTO(x) x
-#else
-#define __GMP_PROTO(x) ()
-#endif
-
-#ifndef __MPN
-#if __GMP_HAVE_TOKEN_PASTE
-#define __MPN(x) __gmpn_##x
-#else
-#define __MPN(x) __gmpn_/**/x
-#endif
-#endif
-
-/* For reference, "defined(EOF)" cannot be used here. In g++ 2.95.4,
- <iostream> defines EOF but not FILE. */
-#if defined (FILE) \
- || defined (H_STDIO) \
- || defined (_H_STDIO) /* AIX */ \
- || defined (_STDIO_H) /* glibc, Sun, SCO */ \
- || defined (_STDIO_H_) /* BSD, OSF */ \
- || defined (__STDIO_H) /* Borland */ \
- || defined (__STDIO_H__) /* IRIX */ \
- || defined (_STDIO_INCLUDED) /* HPUX */ \
- || defined (__dj_include_stdio_h_) /* DJGPP */ \
- || defined (_FILE_DEFINED) /* Microsoft */ \
- || defined (__STDIO__) /* Apple MPW MrC */ \
- || defined (_MSL_STDIO_H) /* Metrowerks */ \
- || defined (_STDIO_H_INCLUDED) /* QNX4 */ \
- || defined (_ISO_STDIO_ISO_H) /* Sun C++ */
-#define _GMP_H_HAVE_FILE 1
-#endif
-
-/* In ISO C, if a prototype involving "struct obstack *" is given without
- that structure defined, then the struct is scoped down to just the
- prototype, causing a conflict if it's subsequently defined for real. So
- only give prototypes if we've got obstack.h. */
-#if defined (_OBSTACK_H) /* glibc <obstack.h> */
-#define _GMP_H_HAVE_OBSTACK 1
-#endif
-
-/* The prototypes for gmp_vprintf etc are provided only if va_list is
- available, via an application having included <stdarg.h> or <varargs.h>.
- Usually va_list is a typedef so can't be tested directly, but C99
- specifies that va_start is a macro (and it was normally a macro on past
- systems too), so look for that.
-
- <stdio.h> will define some sort of va_list for vprintf and vfprintf, but
- let's not bother trying to use that since it's not standard and since
- application uses for gmp_vprintf etc will almost certainly require the
- whole <stdarg.h> or <varargs.h> anyway. */
-
-#ifdef va_start
-#define _GMP_H_HAVE_VA_LIST 1
-#endif
-
-/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
-#if defined (__GNUC__) && defined (__GNUC_MINOR__)
-#define __GMP_GNUC_PREREQ(maj, min) \
- ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#else
-#define __GMP_GNUC_PREREQ(maj, min) 0
-#endif
-
-/* "pure" is in gcc 2.96 and up, see "(gcc)Function Attributes". Basically
- it means a function does nothing but examine its arguments and memory
- (global or via arguments) to generate a return value, but changes nothing
- and has no side-effects. __GMP_NO_ATTRIBUTE_CONST_PURE lets
- tune/common.c etc turn this off when trying to write timing loops. */
-#if __GMP_GNUC_PREREQ (2,96) && ! defined (__GMP_NO_ATTRIBUTE_CONST_PURE)
-#define __GMP_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-#define __GMP_ATTRIBUTE_PURE
-#endif
-
-
-/* __GMP_CAST allows us to use static_cast in C++, so our macros are clean
- to "g++ -Wold-style-cast".
-
- Casts in "extern inline" code within an extern "C" block don't induce
- these warnings, so __GMP_CAST only needs to be used on documented
- macros. */
-
-#ifdef __cplusplus
-#define __GMP_CAST(type, expr) (static_cast<type> (expr))
-#else
-#define __GMP_CAST(type, expr) ((type) (expr))
-#endif
-
-
-/* An empty "throw ()" means the function doesn't throw any C++ exceptions,
- this can save some stack frame info in applications.
-
- Currently it's given only on functions which never divide-by-zero etc,
- don't allocate memory, and are expected to never need to allocate memory.
- This leaves open the possibility of a C++ throw from a future GMP
- exceptions scheme.
-
- mpz_set_ui etc are omitted to leave open the lazy allocation scheme
- described in doc/tasks.html. mpz_get_d etc are omitted to leave open
- exceptions for float overflows.
-
- Note that __GMP_NOTHROW must be given on any inlines the same as on their
- prototypes (for g++ at least, where they're used together). Note also
- that g++ 3.0 demands that __GMP_NOTHROW is before other attributes like
- __GMP_ATTRIBUTE_PURE. */
-
-#if defined (__cplusplus)
-#define __GMP_NOTHROW throw ()
-#else
-#define __GMP_NOTHROW
-#endif
-
-
-/* PORTME: What other compilers have a useful "extern inline"? "static
- inline" would be an acceptable substitute if the compiler (or linker)
- discards unused statics. */
-
- /* gcc has __inline__ in all modes, including strict ansi. Give a prototype
- for an inline too, so as to correctly specify "dllimport" on windows, in
- case the function is called rather than inlined.
- GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
- inline semantics, unless -fgnu89-inline is used. */
-#ifdef __GNUC__
-#ifdef __GNUC_STDC_INLINE__
-#define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
-#else
-#define __GMP_EXTERN_INLINE extern __inline__
-#endif
-#define __GMP_INLINE_PROTOTYPES 1
-#endif
-
-/* DEC C (eg. version 5.9) supports "static __inline foo()", even in -std1
- strict ANSI mode. Inlining is done even when not optimizing (ie. -O0
- mode, which is the default), but an unnecessary local copy of foo is
- emitted unless -O is used. "extern __inline" is accepted, but the
- "extern" appears to be ignored, ie. it becomes a plain global function
- but which is inlined within its file. Don't know if all old versions of
- DEC C supported __inline, but as a start let's do the right thing for
- current versions. */
-#ifdef __DECC
-#define __GMP_EXTERN_INLINE static __inline
-#endif
-
-/* SCO OpenUNIX 8 cc supports "static inline foo()" but not in -Xc strict
- ANSI mode (__STDC__ is 1 in that mode). Inlining only actually takes
- place under -O. Without -O "foo" seems to be emitted whether it's used
- or not, which is wasteful. "extern inline foo()" isn't useful, the
- "extern" is apparently ignored, so foo is inlined if possible but also
- emitted as a global, which causes multiple definition errors when
- building a shared libgmp. */
-#ifdef __SCO_VERSION__
-#if __SCO_VERSION__ > 400000000 && __STDC__ != 1 \
- && ! defined (__GMP_EXTERN_INLINE)
-#define __GMP_EXTERN_INLINE static inline
-#endif
-#endif
-
-/* C++ always has "inline" and since it's a normal feature the linker should
- discard duplicate non-inlined copies, or if it doesn't then that's a
- problem for everyone, not just GMP. */
-#if defined (__cplusplus) && ! defined (__GMP_EXTERN_INLINE)
-#define __GMP_EXTERN_INLINE inline
-#endif
-
-/* Don't do any inlining within a configure run, since if the compiler ends
- up emitting copies of the code into the object file it can end up
- demanding the various support routines (like mpn_popcount) for linking,
- making the "alloca" test and perhaps others fail. And on hppa ia64 a
- pre-release gcc 3.2 was seen not respecting the "extern" in "extern
- __inline__", triggering this problem too. */
-#if defined (__GMP_WITHIN_CONFIGURE) && ! __GMP_WITHIN_CONFIGURE_INLINE
-#undef __GMP_EXTERN_INLINE
-#endif
-
-/* By default, don't give a prototype when there's going to be an inline
- version. Note in particular that Cray C++ objects to the combination of
- prototype and inline. */
-#ifdef __GMP_EXTERN_INLINE
-#ifndef __GMP_INLINE_PROTOTYPES
-#define __GMP_INLINE_PROTOTYPES 0
-#endif
-#else
-#define __GMP_INLINE_PROTOTYPES 1
-#endif
-
-
-#define __GMP_ABS(x) ((x) >= 0 ? (x) : -(x))
-#define __GMP_MAX(h,i) ((h) > (i) ? (h) : (i))
-
-/* __GMP_USHRT_MAX is not "~ (unsigned short) 0" because short is promoted
- to int by "~". */
-#define __GMP_UINT_MAX (~ (unsigned) 0)
-#define __GMP_ULONG_MAX (~ (unsigned long) 0)
-#define __GMP_USHRT_MAX ((unsigned short) ~0)
-
-
-/* __builtin_expect is in gcc 3.0, and not in 2.95. */
-#if __GMP_GNUC_PREREQ (3,0)
-#define __GMP_LIKELY(cond) __builtin_expect ((cond) != 0, 1)
-#define __GMP_UNLIKELY(cond) __builtin_expect ((cond) != 0, 0)
-#else
-#define __GMP_LIKELY(cond) (cond)
-#define __GMP_UNLIKELY(cond) (cond)
-#endif
-
-#ifdef _CRAY
-#define __GMP_CRAY_Pragma(str) _Pragma (str)
-#else
-#define __GMP_CRAY_Pragma(str)
-#endif
-
-
-/* Allow direct user access to numerator and denominator of a mpq_t object. */
-#define mpq_numref(Q) (&((Q)->_mp_num))
-#define mpq_denref(Q) (&((Q)->_mp_den))
-
-
-#if defined (__cplusplus)
-extern "C" {
-#ifdef _GMP_H_HAVE_FILE
-using std::FILE;
-#endif
-#endif
-
-#define mp_set_memory_functions __gmp_set_memory_functions
-__GMP_DECLSPEC void mp_set_memory_functions __GMP_PROTO ((void *(*) (size_t),
- void *(*) (void *, size_t, size_t),
- void (*) (void *, size_t))) __GMP_NOTHROW;
-
-#define mp_get_memory_functions __gmp_get_memory_functions
-__GMP_DECLSPEC void mp_get_memory_functions __GMP_PROTO ((void *(**) (size_t),
- void *(**) (void *, size_t, size_t),
- void (**) (void *, size_t))) __GMP_NOTHROW;
-
-#define mp_bits_per_limb __gmp_bits_per_limb
-__GMP_DECLSPEC extern __gmp_const int mp_bits_per_limb;
-
-#define gmp_errno __gmp_errno
-__GMP_DECLSPEC extern int gmp_errno;
-
-#define gmp_version __gmp_version
-__GMP_DECLSPEC extern __gmp_const char * __gmp_const gmp_version;
-
-
-/**************** Random number routines. ****************/
-
-/* obsolete */
-#define gmp_randinit __gmp_randinit
-__GMP_DECLSPEC void gmp_randinit __GMP_PROTO ((gmp_randstate_t, gmp_randalg_t, ...));
-
-#define gmp_randinit_default __gmp_randinit_default
-__GMP_DECLSPEC void gmp_randinit_default __GMP_PROTO ((gmp_randstate_t));
-
-#define gmp_randinit_lc_2exp __gmp_randinit_lc_2exp
-__GMP_DECLSPEC void gmp_randinit_lc_2exp __GMP_PROTO ((gmp_randstate_t,
- mpz_srcptr, unsigned long int,
- unsigned long int));
-
-#define gmp_randinit_lc_2exp_size __gmp_randinit_lc_2exp_size
-__GMP_DECLSPEC int gmp_randinit_lc_2exp_size __GMP_PROTO ((gmp_randstate_t, unsigned long));
-
-#define gmp_randinit_mt __gmp_randinit_mt
-__GMP_DECLSPEC void gmp_randinit_mt __GMP_PROTO ((gmp_randstate_t));
-
-#define gmp_randinit_set __gmp_randinit_set
-void gmp_randinit_set __GMP_PROTO ((gmp_randstate_t, __gmp_const __gmp_randstate_struct *));
-
-#define gmp_randseed __gmp_randseed
-__GMP_DECLSPEC void gmp_randseed __GMP_PROTO ((gmp_randstate_t, mpz_srcptr));
-
-#define gmp_randseed_ui __gmp_randseed_ui
-__GMP_DECLSPEC void gmp_randseed_ui __GMP_PROTO ((gmp_randstate_t, unsigned long int));
-
-#define gmp_randclear __gmp_randclear
-__GMP_DECLSPEC void gmp_randclear __GMP_PROTO ((gmp_randstate_t));
-
-#define gmp_urandomb_ui __gmp_urandomb_ui
-unsigned long gmp_urandomb_ui __GMP_PROTO ((gmp_randstate_t, unsigned long));
-
-#define gmp_urandomm_ui __gmp_urandomm_ui
-unsigned long gmp_urandomm_ui __GMP_PROTO ((gmp_randstate_t, unsigned long));
-
-
-/**************** Formatted output routines. ****************/
-
-#define gmp_asprintf __gmp_asprintf
-__GMP_DECLSPEC int gmp_asprintf __GMP_PROTO ((char **, __gmp_const char *, ...));
-
-#define gmp_fprintf __gmp_fprintf
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC int gmp_fprintf __GMP_PROTO ((FILE *, __gmp_const char *, ...));
-#endif
-
-#define gmp_obstack_printf __gmp_obstack_printf
-#if defined (_GMP_H_HAVE_OBSTACK)
-__GMP_DECLSPEC int gmp_obstack_printf __GMP_PROTO ((struct obstack *, __gmp_const char *, ...));
-#endif
-
-#define gmp_obstack_vprintf __gmp_obstack_vprintf
-#if defined (_GMP_H_HAVE_OBSTACK) && defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_obstack_vprintf __GMP_PROTO ((struct obstack *, __gmp_const char *, va_list));
-#endif
-
-#define gmp_printf __gmp_printf
-__GMP_DECLSPEC int gmp_printf __GMP_PROTO ((__gmp_const char *, ...));
-
-#define gmp_snprintf __gmp_snprintf
-__GMP_DECLSPEC int gmp_snprintf __GMP_PROTO ((char *, size_t, __gmp_const char *, ...));
-
-#define gmp_sprintf __gmp_sprintf
-__GMP_DECLSPEC int gmp_sprintf __GMP_PROTO ((char *, __gmp_const char *, ...));
-
-#define gmp_vasprintf __gmp_vasprintf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vasprintf __GMP_PROTO ((char **, __gmp_const char *, va_list));
-#endif
-
-#define gmp_vfprintf __gmp_vfprintf
-#if defined (_GMP_H_HAVE_FILE) && defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vfprintf __GMP_PROTO ((FILE *, __gmp_const char *, va_list));
-#endif
-
-#define gmp_vprintf __gmp_vprintf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vprintf __GMP_PROTO ((__gmp_const char *, va_list));
-#endif
-
-#define gmp_vsnprintf __gmp_vsnprintf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vsnprintf __GMP_PROTO ((char *, size_t, __gmp_const char *, va_list));
-#endif
-
-#define gmp_vsprintf __gmp_vsprintf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vsprintf __GMP_PROTO ((char *, __gmp_const char *, va_list));
-#endif
-
-
-/**************** Formatted input routines. ****************/
-
-#define gmp_fscanf __gmp_fscanf
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC int gmp_fscanf __GMP_PROTO ((FILE *, __gmp_const char *, ...));
-#endif
-
-#define gmp_scanf __gmp_scanf
-__GMP_DECLSPEC int gmp_scanf __GMP_PROTO ((__gmp_const char *, ...));
-
-#define gmp_sscanf __gmp_sscanf
-__GMP_DECLSPEC int gmp_sscanf __GMP_PROTO ((__gmp_const char *, __gmp_const char *, ...));
-
-#define gmp_vfscanf __gmp_vfscanf
-#if defined (_GMP_H_HAVE_FILE) && defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vfscanf __GMP_PROTO ((FILE *, __gmp_const char *, va_list));
-#endif
-
-#define gmp_vscanf __gmp_vscanf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vscanf __GMP_PROTO ((__gmp_const char *, va_list));
-#endif
-
-#define gmp_vsscanf __gmp_vsscanf
-#if defined (_GMP_H_HAVE_VA_LIST)
-__GMP_DECLSPEC int gmp_vsscanf __GMP_PROTO ((__gmp_const char *, __gmp_const char *, va_list));
-#endif
-
-
-/**************** Integer (i.e. Z) routines. ****************/
-
-#define _mpz_realloc __gmpz_realloc
-#define mpz_realloc __gmpz_realloc
-__GMP_DECLSPEC void *_mpz_realloc __GMP_PROTO ((mpz_ptr, mp_size_t));
-
-#define mpz_abs __gmpz_abs
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_abs)
-__GMP_DECLSPEC void mpz_abs __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-#endif
-
-#define mpz_add __gmpz_add
-__GMP_DECLSPEC void mpz_add __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_add_ui __gmpz_add_ui
-__GMP_DECLSPEC void mpz_add_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_addmul __gmpz_addmul
-__GMP_DECLSPEC void mpz_addmul __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_addmul_ui __gmpz_addmul_ui
-__GMP_DECLSPEC void mpz_addmul_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_and __gmpz_and
-__GMP_DECLSPEC void mpz_and __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_array_init __gmpz_array_init
-__GMP_DECLSPEC void mpz_array_init __GMP_PROTO ((mpz_ptr, mp_size_t, mp_size_t));
-
-#define mpz_bin_ui __gmpz_bin_ui
-__GMP_DECLSPEC void mpz_bin_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_bin_uiui __gmpz_bin_uiui
-__GMP_DECLSPEC void mpz_bin_uiui __GMP_PROTO ((mpz_ptr, unsigned long int, unsigned long int));
-
-#define mpz_cdiv_q __gmpz_cdiv_q
-__GMP_DECLSPEC void mpz_cdiv_q __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_cdiv_q_2exp __gmpz_cdiv_q_2exp
-__GMP_DECLSPEC void mpz_cdiv_q_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long));
-
-#define mpz_cdiv_q_ui __gmpz_cdiv_q_ui
-__GMP_DECLSPEC unsigned long int mpz_cdiv_q_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_cdiv_qr __gmpz_cdiv_qr
-__GMP_DECLSPEC void mpz_cdiv_qr __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_cdiv_qr_ui __gmpz_cdiv_qr_ui
-__GMP_DECLSPEC unsigned long int mpz_cdiv_qr_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_cdiv_r __gmpz_cdiv_r
-__GMP_DECLSPEC void mpz_cdiv_r __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_cdiv_r_2exp __gmpz_cdiv_r_2exp
-__GMP_DECLSPEC void mpz_cdiv_r_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long));
-
-#define mpz_cdiv_r_ui __gmpz_cdiv_r_ui
-__GMP_DECLSPEC unsigned long int mpz_cdiv_r_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_cdiv_ui __gmpz_cdiv_ui
-__GMP_DECLSPEC unsigned long int mpz_cdiv_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_clear __gmpz_clear
-__GMP_DECLSPEC void mpz_clear __GMP_PROTO ((mpz_ptr));
-
-#define mpz_clrbit __gmpz_clrbit
-__GMP_DECLSPEC void mpz_clrbit __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_cmp __gmpz_cmp
-__GMP_DECLSPEC int mpz_cmp __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_cmp_d __gmpz_cmp_d
-__GMP_DECLSPEC int mpz_cmp_d __GMP_PROTO ((mpz_srcptr, double)) __GMP_ATTRIBUTE_PURE;
-
-#define _mpz_cmp_si __gmpz_cmp_si
-__GMP_DECLSPEC int _mpz_cmp_si __GMP_PROTO ((mpz_srcptr, signed long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define _mpz_cmp_ui __gmpz_cmp_ui
-__GMP_DECLSPEC int _mpz_cmp_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_cmpabs __gmpz_cmpabs
-__GMP_DECLSPEC int mpz_cmpabs __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_cmpabs_d __gmpz_cmpabs_d
-__GMP_DECLSPEC int mpz_cmpabs_d __GMP_PROTO ((mpz_srcptr, double)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_cmpabs_ui __gmpz_cmpabs_ui
-__GMP_DECLSPEC int mpz_cmpabs_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_com __gmpz_com
-__GMP_DECLSPEC void mpz_com __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_combit __gmpz_combit
-__GMP_DECLSPEC void mpz_combit __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_congruent_p __gmpz_congruent_p
-__GMP_DECLSPEC int mpz_congruent_p __GMP_PROTO ((mpz_srcptr, mpz_srcptr, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_congruent_2exp_p __gmpz_congruent_2exp_p
-__GMP_DECLSPEC int mpz_congruent_2exp_p __GMP_PROTO ((mpz_srcptr, mpz_srcptr, unsigned long)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_congruent_ui_p __gmpz_congruent_ui_p
-__GMP_DECLSPEC int mpz_congruent_ui_p __GMP_PROTO ((mpz_srcptr, unsigned long, unsigned long)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_divexact __gmpz_divexact
-__GMP_DECLSPEC void mpz_divexact __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_divexact_ui __gmpz_divexact_ui
-__GMP_DECLSPEC void mpz_divexact_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long));
-
-#define mpz_divisible_p __gmpz_divisible_p
-__GMP_DECLSPEC int mpz_divisible_p __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_divisible_ui_p __gmpz_divisible_ui_p
-__GMP_DECLSPEC int mpz_divisible_ui_p __GMP_PROTO ((mpz_srcptr, unsigned long)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_divisible_2exp_p __gmpz_divisible_2exp_p
-__GMP_DECLSPEC int mpz_divisible_2exp_p __GMP_PROTO ((mpz_srcptr, unsigned long)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_dump __gmpz_dump
-__GMP_DECLSPEC void mpz_dump __GMP_PROTO ((mpz_srcptr));
-
-#define mpz_export __gmpz_export
-__GMP_DECLSPEC void *mpz_export __GMP_PROTO ((void *, size_t *, int, size_t, int, size_t, mpz_srcptr));
-
-#define mpz_fac_ui __gmpz_fac_ui
-__GMP_DECLSPEC void mpz_fac_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_fdiv_q __gmpz_fdiv_q
-__GMP_DECLSPEC void mpz_fdiv_q __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_fdiv_q_2exp __gmpz_fdiv_q_2exp
-__GMP_DECLSPEC void mpz_fdiv_q_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_q_ui __gmpz_fdiv_q_ui
-__GMP_DECLSPEC unsigned long int mpz_fdiv_q_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_qr __gmpz_fdiv_qr
-__GMP_DECLSPEC void mpz_fdiv_qr __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_fdiv_qr_ui __gmpz_fdiv_qr_ui
-__GMP_DECLSPEC unsigned long int mpz_fdiv_qr_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_r __gmpz_fdiv_r
-__GMP_DECLSPEC void mpz_fdiv_r __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_fdiv_r_2exp __gmpz_fdiv_r_2exp
-__GMP_DECLSPEC void mpz_fdiv_r_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_r_ui __gmpz_fdiv_r_ui
-__GMP_DECLSPEC unsigned long int mpz_fdiv_r_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_fdiv_ui __gmpz_fdiv_ui
-__GMP_DECLSPEC unsigned long int mpz_fdiv_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_fib_ui __gmpz_fib_ui
-__GMP_DECLSPEC void mpz_fib_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_fib2_ui __gmpz_fib2_ui
-__GMP_DECLSPEC void mpz_fib2_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, unsigned long int));
-
-#define mpz_fits_sint_p __gmpz_fits_sint_p
-__GMP_DECLSPEC int mpz_fits_sint_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_fits_slong_p __gmpz_fits_slong_p
-__GMP_DECLSPEC int mpz_fits_slong_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_fits_sshort_p __gmpz_fits_sshort_p
-__GMP_DECLSPEC int mpz_fits_sshort_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_fits_uint_p __gmpz_fits_uint_p
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_fits_uint_p)
-__GMP_DECLSPEC int mpz_fits_uint_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_fits_ulong_p __gmpz_fits_ulong_p
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_fits_ulong_p)
-__GMP_DECLSPEC int mpz_fits_ulong_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_fits_ushort_p __gmpz_fits_ushort_p
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_fits_ushort_p)
-__GMP_DECLSPEC int mpz_fits_ushort_p __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_gcd __gmpz_gcd
-__GMP_DECLSPEC void mpz_gcd __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_gcd_ui __gmpz_gcd_ui
-__GMP_DECLSPEC unsigned long int mpz_gcd_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_gcdext __gmpz_gcdext
-__GMP_DECLSPEC void mpz_gcdext __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_get_d __gmpz_get_d
-__GMP_DECLSPEC double mpz_get_d __GMP_PROTO ((mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_get_d_2exp __gmpz_get_d_2exp
-__GMP_DECLSPEC double mpz_get_d_2exp __GMP_PROTO ((signed long int *, mpz_srcptr));
-
-#define mpz_get_si __gmpz_get_si
-__GMP_DECLSPEC /* signed */ long int mpz_get_si __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_get_str __gmpz_get_str
-__GMP_DECLSPEC char *mpz_get_str __GMP_PROTO ((char *, int, mpz_srcptr));
-
-#define mpz_get_ui __gmpz_get_ui
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_get_ui)
-__GMP_DECLSPEC unsigned long int mpz_get_ui __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_getlimbn __gmpz_getlimbn
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_getlimbn)
-__GMP_DECLSPEC mp_limb_t mpz_getlimbn __GMP_PROTO ((mpz_srcptr, mp_size_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_hamdist __gmpz_hamdist
-__GMP_DECLSPEC unsigned long int mpz_hamdist __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_import __gmpz_import
-__GMP_DECLSPEC void mpz_import __GMP_PROTO ((mpz_ptr, size_t, int, size_t, int, size_t, __gmp_const void *));
-
-#define mpz_init __gmpz_init
-__GMP_DECLSPEC void mpz_init __GMP_PROTO ((mpz_ptr));
-
-#define mpz_init2 __gmpz_init2
-__GMP_DECLSPEC void mpz_init2 __GMP_PROTO ((mpz_ptr, unsigned long));
-
-#define mpz_init_set __gmpz_init_set
-__GMP_DECLSPEC void mpz_init_set __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_init_set_d __gmpz_init_set_d
-__GMP_DECLSPEC void mpz_init_set_d __GMP_PROTO ((mpz_ptr, double));
-
-#define mpz_init_set_si __gmpz_init_set_si
-__GMP_DECLSPEC void mpz_init_set_si __GMP_PROTO ((mpz_ptr, signed long int));
-
-#define mpz_init_set_str __gmpz_init_set_str
-__GMP_DECLSPEC int mpz_init_set_str __GMP_PROTO ((mpz_ptr, __gmp_const char *, int));
-
-#define mpz_init_set_ui __gmpz_init_set_ui
-__GMP_DECLSPEC void mpz_init_set_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_inp_raw __gmpz_inp_raw
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpz_inp_raw __GMP_PROTO ((mpz_ptr, FILE *));
-#endif
-
-#define mpz_inp_str __gmpz_inp_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpz_inp_str __GMP_PROTO ((mpz_ptr, FILE *, int));
-#endif
-
-#define mpz_invert __gmpz_invert
-__GMP_DECLSPEC int mpz_invert __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_ior __gmpz_ior
-__GMP_DECLSPEC void mpz_ior __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_jacobi __gmpz_jacobi
-__GMP_DECLSPEC int mpz_jacobi __GMP_PROTO ((mpz_srcptr, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_kronecker mpz_jacobi /* alias */
-
-#define mpz_kronecker_si __gmpz_kronecker_si
-__GMP_DECLSPEC int mpz_kronecker_si __GMP_PROTO ((mpz_srcptr, long)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_kronecker_ui __gmpz_kronecker_ui
-__GMP_DECLSPEC int mpz_kronecker_ui __GMP_PROTO ((mpz_srcptr, unsigned long)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_si_kronecker __gmpz_si_kronecker
-__GMP_DECLSPEC int mpz_si_kronecker __GMP_PROTO ((long, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_ui_kronecker __gmpz_ui_kronecker
-__GMP_DECLSPEC int mpz_ui_kronecker __GMP_PROTO ((unsigned long, mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_lcm __gmpz_lcm
-__GMP_DECLSPEC void mpz_lcm __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_lcm_ui __gmpz_lcm_ui
-__GMP_DECLSPEC void mpz_lcm_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long));
-
-#define mpz_legendre mpz_jacobi /* alias */
-
-#define mpz_lucnum_ui __gmpz_lucnum_ui
-__GMP_DECLSPEC void mpz_lucnum_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_lucnum2_ui __gmpz_lucnum2_ui
-__GMP_DECLSPEC void mpz_lucnum2_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, unsigned long int));
-
-#define mpz_millerrabin __gmpz_millerrabin
-__GMP_DECLSPEC int mpz_millerrabin __GMP_PROTO ((mpz_srcptr, int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_mod __gmpz_mod
-__GMP_DECLSPEC void mpz_mod __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_mod_ui mpz_fdiv_r_ui /* same as fdiv_r because divisor unsigned */
-
-#define mpz_mul __gmpz_mul
-__GMP_DECLSPEC void mpz_mul __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_mul_2exp __gmpz_mul_2exp
-__GMP_DECLSPEC void mpz_mul_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_mul_si __gmpz_mul_si
-__GMP_DECLSPEC void mpz_mul_si __GMP_PROTO ((mpz_ptr, mpz_srcptr, long int));
-
-#define mpz_mul_ui __gmpz_mul_ui
-__GMP_DECLSPEC void mpz_mul_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_neg __gmpz_neg
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_neg)
-__GMP_DECLSPEC void mpz_neg __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-#endif
-
-#define mpz_nextprime __gmpz_nextprime
-__GMP_DECLSPEC void mpz_nextprime __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_out_raw __gmpz_out_raw
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpz_out_raw __GMP_PROTO ((FILE *, mpz_srcptr));
-#endif
-
-#define mpz_out_str __gmpz_out_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpz_out_str __GMP_PROTO ((FILE *, int, mpz_srcptr));
-#endif
-
-#define mpz_perfect_power_p __gmpz_perfect_power_p
-__GMP_DECLSPEC int mpz_perfect_power_p __GMP_PROTO ((mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_perfect_square_p __gmpz_perfect_square_p
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_perfect_square_p)
-__GMP_DECLSPEC int mpz_perfect_square_p __GMP_PROTO ((mpz_srcptr)) __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_popcount __gmpz_popcount
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_popcount)
-__GMP_DECLSPEC unsigned long int mpz_popcount __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_pow_ui __gmpz_pow_ui
-__GMP_DECLSPEC void mpz_pow_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_powm __gmpz_powm
-__GMP_DECLSPEC void mpz_powm __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_powm_ui __gmpz_powm_ui
-__GMP_DECLSPEC void mpz_powm_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int, mpz_srcptr));
-
-#define mpz_probab_prime_p __gmpz_probab_prime_p
-__GMP_DECLSPEC int mpz_probab_prime_p __GMP_PROTO ((mpz_srcptr, int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_random __gmpz_random
-__GMP_DECLSPEC void mpz_random __GMP_PROTO ((mpz_ptr, mp_size_t));
-
-#define mpz_random2 __gmpz_random2
-__GMP_DECLSPEC void mpz_random2 __GMP_PROTO ((mpz_ptr, mp_size_t));
-
-#define mpz_realloc2 __gmpz_realloc2
-__GMP_DECLSPEC void mpz_realloc2 __GMP_PROTO ((mpz_ptr, unsigned long));
-
-#define mpz_remove __gmpz_remove
-__GMP_DECLSPEC unsigned long int mpz_remove __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_root __gmpz_root
-__GMP_DECLSPEC int mpz_root __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_rootrem __gmpz_rootrem
-__GMP_DECLSPEC void mpz_rootrem __GMP_PROTO ((mpz_ptr,mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_rrandomb __gmpz_rrandomb
-__GMP_DECLSPEC void mpz_rrandomb __GMP_PROTO ((mpz_ptr, gmp_randstate_t, unsigned long int));
-
-#define mpz_scan0 __gmpz_scan0
-__GMP_DECLSPEC unsigned long int mpz_scan0 __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_scan1 __gmpz_scan1
-__GMP_DECLSPEC unsigned long int mpz_scan1 __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_set __gmpz_set
-__GMP_DECLSPEC void mpz_set __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_set_d __gmpz_set_d
-__GMP_DECLSPEC void mpz_set_d __GMP_PROTO ((mpz_ptr, double));
-
-#define mpz_set_f __gmpz_set_f
-__GMP_DECLSPEC void mpz_set_f __GMP_PROTO ((mpz_ptr, mpf_srcptr));
-
-#define mpz_set_q __gmpz_set_q
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_set_q)
-__GMP_DECLSPEC void mpz_set_q __GMP_PROTO ((mpz_ptr, mpq_srcptr));
-#endif
-
-#define mpz_set_si __gmpz_set_si
-__GMP_DECLSPEC void mpz_set_si __GMP_PROTO ((mpz_ptr, signed long int));
-
-#define mpz_set_str __gmpz_set_str
-__GMP_DECLSPEC int mpz_set_str __GMP_PROTO ((mpz_ptr, __gmp_const char *, int));
-
-#define mpz_set_ui __gmpz_set_ui
-__GMP_DECLSPEC void mpz_set_ui __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_setbit __gmpz_setbit
-__GMP_DECLSPEC void mpz_setbit __GMP_PROTO ((mpz_ptr, unsigned long int));
-
-#define mpz_size __gmpz_size
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpz_size)
-__GMP_DECLSPEC size_t mpz_size __GMP_PROTO ((mpz_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpz_sizeinbase __gmpz_sizeinbase
-__GMP_DECLSPEC size_t mpz_sizeinbase __GMP_PROTO ((mpz_srcptr, int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_sqrt __gmpz_sqrt
-__GMP_DECLSPEC void mpz_sqrt __GMP_PROTO ((mpz_ptr, mpz_srcptr));
-
-#define mpz_sqrtrem __gmpz_sqrtrem
-__GMP_DECLSPEC void mpz_sqrtrem __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr));
-
-#define mpz_sub __gmpz_sub
-__GMP_DECLSPEC void mpz_sub __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_sub_ui __gmpz_sub_ui
-__GMP_DECLSPEC void mpz_sub_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_ui_sub __gmpz_ui_sub
-__GMP_DECLSPEC void mpz_ui_sub __GMP_PROTO ((mpz_ptr, unsigned long int, mpz_srcptr));
-
-#define mpz_submul __gmpz_submul
-__GMP_DECLSPEC void mpz_submul __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_submul_ui __gmpz_submul_ui
-__GMP_DECLSPEC void mpz_submul_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_swap __gmpz_swap
-__GMP_DECLSPEC void mpz_swap __GMP_PROTO ((mpz_ptr, mpz_ptr)) __GMP_NOTHROW;
-
-#define mpz_tdiv_ui __gmpz_tdiv_ui
-__GMP_DECLSPEC unsigned long int mpz_tdiv_ui __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpz_tdiv_q __gmpz_tdiv_q
-__GMP_DECLSPEC void mpz_tdiv_q __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_tdiv_q_2exp __gmpz_tdiv_q_2exp
-__GMP_DECLSPEC void mpz_tdiv_q_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tdiv_q_ui __gmpz_tdiv_q_ui
-__GMP_DECLSPEC unsigned long int mpz_tdiv_q_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tdiv_qr __gmpz_tdiv_qr
-__GMP_DECLSPEC void mpz_tdiv_qr __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_tdiv_qr_ui __gmpz_tdiv_qr_ui
-__GMP_DECLSPEC unsigned long int mpz_tdiv_qr_ui __GMP_PROTO ((mpz_ptr, mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tdiv_r __gmpz_tdiv_r
-__GMP_DECLSPEC void mpz_tdiv_r __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-#define mpz_tdiv_r_2exp __gmpz_tdiv_r_2exp
-__GMP_DECLSPEC void mpz_tdiv_r_2exp __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tdiv_r_ui __gmpz_tdiv_r_ui
-__GMP_DECLSPEC unsigned long int mpz_tdiv_r_ui __GMP_PROTO ((mpz_ptr, mpz_srcptr, unsigned long int));
-
-#define mpz_tstbit __gmpz_tstbit
-__GMP_DECLSPEC int mpz_tstbit __GMP_PROTO ((mpz_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpz_ui_pow_ui __gmpz_ui_pow_ui
-__GMP_DECLSPEC void mpz_ui_pow_ui __GMP_PROTO ((mpz_ptr, unsigned long int, unsigned long int));
-
-#define mpz_urandomb __gmpz_urandomb
-__GMP_DECLSPEC void mpz_urandomb __GMP_PROTO ((mpz_ptr, gmp_randstate_t, unsigned long int));
-
-#define mpz_urandomm __gmpz_urandomm
-__GMP_DECLSPEC void mpz_urandomm __GMP_PROTO ((mpz_ptr, gmp_randstate_t, mpz_srcptr));
-
-#define mpz_xor __gmpz_xor
-#define mpz_eor __gmpz_xor
-__GMP_DECLSPEC void mpz_xor __GMP_PROTO ((mpz_ptr, mpz_srcptr, mpz_srcptr));
-
-
-/**************** Rational (i.e. Q) routines. ****************/
-
-#define mpq_abs __gmpq_abs
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpq_abs)
-__GMP_DECLSPEC void mpq_abs __GMP_PROTO ((mpq_ptr, mpq_srcptr));
-#endif
-
-#define mpq_add __gmpq_add
-__GMP_DECLSPEC void mpq_add __GMP_PROTO ((mpq_ptr, mpq_srcptr, mpq_srcptr));
-
-#define mpq_canonicalize __gmpq_canonicalize
-__GMP_DECLSPEC void mpq_canonicalize __GMP_PROTO ((mpq_ptr));
-
-#define mpq_clear __gmpq_clear
-__GMP_DECLSPEC void mpq_clear __GMP_PROTO ((mpq_ptr));
-
-#define mpq_cmp __gmpq_cmp
-__GMP_DECLSPEC int mpq_cmp __GMP_PROTO ((mpq_srcptr, mpq_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define _mpq_cmp_si __gmpq_cmp_si
-__GMP_DECLSPEC int _mpq_cmp_si __GMP_PROTO ((mpq_srcptr, long, unsigned long)) __GMP_ATTRIBUTE_PURE;
-
-#define _mpq_cmp_ui __gmpq_cmp_ui
-__GMP_DECLSPEC int _mpq_cmp_ui __GMP_PROTO ((mpq_srcptr, unsigned long int, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpq_div __gmpq_div
-__GMP_DECLSPEC void mpq_div __GMP_PROTO ((mpq_ptr, mpq_srcptr, mpq_srcptr));
-
-#define mpq_div_2exp __gmpq_div_2exp
-__GMP_DECLSPEC void mpq_div_2exp __GMP_PROTO ((mpq_ptr, mpq_srcptr, unsigned long));
-
-#define mpq_equal __gmpq_equal
-__GMP_DECLSPEC int mpq_equal __GMP_PROTO ((mpq_srcptr, mpq_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpq_get_num __gmpq_get_num
-__GMP_DECLSPEC void mpq_get_num __GMP_PROTO ((mpz_ptr, mpq_srcptr));
-
-#define mpq_get_den __gmpq_get_den
-__GMP_DECLSPEC void mpq_get_den __GMP_PROTO ((mpz_ptr, mpq_srcptr));
-
-#define mpq_get_d __gmpq_get_d
-__GMP_DECLSPEC double mpq_get_d __GMP_PROTO ((mpq_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpq_get_str __gmpq_get_str
-__GMP_DECLSPEC char *mpq_get_str __GMP_PROTO ((char *, int, mpq_srcptr));
-
-#define mpq_init __gmpq_init
-__GMP_DECLSPEC void mpq_init __GMP_PROTO ((mpq_ptr));
-
-#define mpq_inp_str __gmpq_inp_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpq_inp_str __GMP_PROTO ((mpq_ptr, FILE *, int));
-#endif
-
-#define mpq_inv __gmpq_inv
-__GMP_DECLSPEC void mpq_inv __GMP_PROTO ((mpq_ptr, mpq_srcptr));
-
-#define mpq_mul __gmpq_mul
-__GMP_DECLSPEC void mpq_mul __GMP_PROTO ((mpq_ptr, mpq_srcptr, mpq_srcptr));
-
-#define mpq_mul_2exp __gmpq_mul_2exp
-__GMP_DECLSPEC void mpq_mul_2exp __GMP_PROTO ((mpq_ptr, mpq_srcptr, unsigned long));
-
-#define mpq_neg __gmpq_neg
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpq_neg)
-__GMP_DECLSPEC void mpq_neg __GMP_PROTO ((mpq_ptr, mpq_srcptr));
-#endif
-
-#define mpq_out_str __gmpq_out_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpq_out_str __GMP_PROTO ((FILE *, int, mpq_srcptr));
-#endif
-
-#define mpq_set __gmpq_set
-__GMP_DECLSPEC void mpq_set __GMP_PROTO ((mpq_ptr, mpq_srcptr));
-
-#define mpq_set_d __gmpq_set_d
-__GMP_DECLSPEC void mpq_set_d __GMP_PROTO ((mpq_ptr, double));
-
-#define mpq_set_den __gmpq_set_den
-__GMP_DECLSPEC void mpq_set_den __GMP_PROTO ((mpq_ptr, mpz_srcptr));
-
-#define mpq_set_f __gmpq_set_f
-__GMP_DECLSPEC void mpq_set_f __GMP_PROTO ((mpq_ptr, mpf_srcptr));
-
-#define mpq_set_num __gmpq_set_num
-__GMP_DECLSPEC void mpq_set_num __GMP_PROTO ((mpq_ptr, mpz_srcptr));
-
-#define mpq_set_si __gmpq_set_si
-__GMP_DECLSPEC void mpq_set_si __GMP_PROTO ((mpq_ptr, signed long int, unsigned long int));
-
-#define mpq_set_str __gmpq_set_str
-__GMP_DECLSPEC int mpq_set_str __GMP_PROTO ((mpq_ptr, __gmp_const char *, int));
-
-#define mpq_set_ui __gmpq_set_ui
-__GMP_DECLSPEC void mpq_set_ui __GMP_PROTO ((mpq_ptr, unsigned long int, unsigned long int));
-
-#define mpq_set_z __gmpq_set_z
-__GMP_DECLSPEC void mpq_set_z __GMP_PROTO ((mpq_ptr, mpz_srcptr));
-
-#define mpq_sub __gmpq_sub
-__GMP_DECLSPEC void mpq_sub __GMP_PROTO ((mpq_ptr, mpq_srcptr, mpq_srcptr));
-
-#define mpq_swap __gmpq_swap
-__GMP_DECLSPEC void mpq_swap __GMP_PROTO ((mpq_ptr, mpq_ptr)) __GMP_NOTHROW;
-
-
-/**************** Float (i.e. F) routines. ****************/
-
-#define mpf_abs __gmpf_abs
-__GMP_DECLSPEC void mpf_abs __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_add __gmpf_add
-__GMP_DECLSPEC void mpf_add __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_add_ui __gmpf_add_ui
-__GMP_DECLSPEC void mpf_add_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-#define mpf_ceil __gmpf_ceil
-__GMP_DECLSPEC void mpf_ceil __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_clear __gmpf_clear
-__GMP_DECLSPEC void mpf_clear __GMP_PROTO ((mpf_ptr));
-
-#define mpf_cmp __gmpf_cmp
-__GMP_DECLSPEC int mpf_cmp __GMP_PROTO ((mpf_srcptr, mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_cmp_d __gmpf_cmp_d
-__GMP_DECLSPEC int mpf_cmp_d __GMP_PROTO ((mpf_srcptr, double)) __GMP_ATTRIBUTE_PURE;
-
-#define mpf_cmp_si __gmpf_cmp_si
-__GMP_DECLSPEC int mpf_cmp_si __GMP_PROTO ((mpf_srcptr, signed long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_cmp_ui __gmpf_cmp_ui
-__GMP_DECLSPEC int mpf_cmp_ui __GMP_PROTO ((mpf_srcptr, unsigned long int)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_div __gmpf_div
-__GMP_DECLSPEC void mpf_div __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_div_2exp __gmpf_div_2exp
-__GMP_DECLSPEC void mpf_div_2exp __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_div_ui __gmpf_div_ui
-__GMP_DECLSPEC void mpf_div_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_dump __gmpf_dump
-__GMP_DECLSPEC void mpf_dump __GMP_PROTO ((mpf_srcptr));
-
-#define mpf_eq __gmpf_eq
-__GMP_DECLSPEC int mpf_eq __GMP_PROTO ((mpf_srcptr, mpf_srcptr, unsigned long int)) __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_sint_p __gmpf_fits_sint_p
-__GMP_DECLSPEC int mpf_fits_sint_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_slong_p __gmpf_fits_slong_p
-__GMP_DECLSPEC int mpf_fits_slong_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_sshort_p __gmpf_fits_sshort_p
-__GMP_DECLSPEC int mpf_fits_sshort_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_uint_p __gmpf_fits_uint_p
-__GMP_DECLSPEC int mpf_fits_uint_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_ulong_p __gmpf_fits_ulong_p
-__GMP_DECLSPEC int mpf_fits_ulong_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_fits_ushort_p __gmpf_fits_ushort_p
-__GMP_DECLSPEC int mpf_fits_ushort_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_floor __gmpf_floor
-__GMP_DECLSPEC void mpf_floor __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_get_d __gmpf_get_d
-__GMP_DECLSPEC double mpf_get_d __GMP_PROTO ((mpf_srcptr)) __GMP_ATTRIBUTE_PURE;
-
-#define mpf_get_d_2exp __gmpf_get_d_2exp
-__GMP_DECLSPEC double mpf_get_d_2exp __GMP_PROTO ((signed long int *, mpf_srcptr));
-
-#define mpf_get_default_prec __gmpf_get_default_prec
-__GMP_DECLSPEC unsigned long int mpf_get_default_prec __GMP_PROTO ((void)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_get_prec __gmpf_get_prec
-__GMP_DECLSPEC unsigned long int mpf_get_prec __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_get_si __gmpf_get_si
-__GMP_DECLSPEC long mpf_get_si __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_get_str __gmpf_get_str
-__GMP_DECLSPEC char *mpf_get_str __GMP_PROTO ((char *, mp_exp_t *, int, size_t, mpf_srcptr));
-
-#define mpf_get_ui __gmpf_get_ui
-__GMP_DECLSPEC unsigned long mpf_get_ui __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_init __gmpf_init
-__GMP_DECLSPEC void mpf_init __GMP_PROTO ((mpf_ptr));
-
-#define mpf_init2 __gmpf_init2
-__GMP_DECLSPEC void mpf_init2 __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_init_set __gmpf_init_set
-__GMP_DECLSPEC void mpf_init_set __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_init_set_d __gmpf_init_set_d
-__GMP_DECLSPEC void mpf_init_set_d __GMP_PROTO ((mpf_ptr, double));
-
-#define mpf_init_set_si __gmpf_init_set_si
-__GMP_DECLSPEC void mpf_init_set_si __GMP_PROTO ((mpf_ptr, signed long int));
-
-#define mpf_init_set_str __gmpf_init_set_str
-__GMP_DECLSPEC int mpf_init_set_str __GMP_PROTO ((mpf_ptr, __gmp_const char *, int));
-
-#define mpf_init_set_ui __gmpf_init_set_ui
-__GMP_DECLSPEC void mpf_init_set_ui __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_inp_str __gmpf_inp_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpf_inp_str __GMP_PROTO ((mpf_ptr, FILE *, int));
-#endif
-
-#define mpf_integer_p __gmpf_integer_p
-__GMP_DECLSPEC int mpf_integer_p __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_mul __gmpf_mul
-__GMP_DECLSPEC void mpf_mul __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_mul_2exp __gmpf_mul_2exp
-__GMP_DECLSPEC void mpf_mul_2exp __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_mul_ui __gmpf_mul_ui
-__GMP_DECLSPEC void mpf_mul_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_neg __gmpf_neg
-__GMP_DECLSPEC void mpf_neg __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_out_str __gmpf_out_str
-#ifdef _GMP_H_HAVE_FILE
-__GMP_DECLSPEC size_t mpf_out_str __GMP_PROTO ((FILE *, int, size_t, mpf_srcptr));
-#endif
-
-#define mpf_pow_ui __gmpf_pow_ui
-__GMP_DECLSPEC void mpf_pow_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_random2 __gmpf_random2
-__GMP_DECLSPEC void mpf_random2 __GMP_PROTO ((mpf_ptr, mp_size_t, mp_exp_t));
-
-#define mpf_reldiff __gmpf_reldiff
-__GMP_DECLSPEC void mpf_reldiff __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_set __gmpf_set
-__GMP_DECLSPEC void mpf_set __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_set_d __gmpf_set_d
-__GMP_DECLSPEC void mpf_set_d __GMP_PROTO ((mpf_ptr, double));
-
-#define mpf_set_default_prec __gmpf_set_default_prec
-__GMP_DECLSPEC void mpf_set_default_prec __GMP_PROTO ((unsigned long int)) __GMP_NOTHROW;
-
-#define mpf_set_prec __gmpf_set_prec
-__GMP_DECLSPEC void mpf_set_prec __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_set_prec_raw __gmpf_set_prec_raw
-__GMP_DECLSPEC void mpf_set_prec_raw __GMP_PROTO ((mpf_ptr, unsigned long int)) __GMP_NOTHROW;
-
-#define mpf_set_q __gmpf_set_q
-__GMP_DECLSPEC void mpf_set_q __GMP_PROTO ((mpf_ptr, mpq_srcptr));
-
-#define mpf_set_si __gmpf_set_si
-__GMP_DECLSPEC void mpf_set_si __GMP_PROTO ((mpf_ptr, signed long int));
-
-#define mpf_set_str __gmpf_set_str
-__GMP_DECLSPEC int mpf_set_str __GMP_PROTO ((mpf_ptr, __gmp_const char *, int));
-
-#define mpf_set_ui __gmpf_set_ui
-__GMP_DECLSPEC void mpf_set_ui __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_set_z __gmpf_set_z
-__GMP_DECLSPEC void mpf_set_z __GMP_PROTO ((mpf_ptr, mpz_srcptr));
-
-#define mpf_size __gmpf_size
-__GMP_DECLSPEC size_t mpf_size __GMP_PROTO ((mpf_srcptr)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpf_sqrt __gmpf_sqrt
-__GMP_DECLSPEC void mpf_sqrt __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_sqrt_ui __gmpf_sqrt_ui
-__GMP_DECLSPEC void mpf_sqrt_ui __GMP_PROTO ((mpf_ptr, unsigned long int));
-
-#define mpf_sub __gmpf_sub
-__GMP_DECLSPEC void mpf_sub __GMP_PROTO ((mpf_ptr, mpf_srcptr, mpf_srcptr));
-
-#define mpf_sub_ui __gmpf_sub_ui
-__GMP_DECLSPEC void mpf_sub_ui __GMP_PROTO ((mpf_ptr, mpf_srcptr, unsigned long int));
-
-#define mpf_swap __gmpf_swap
-__GMP_DECLSPEC void mpf_swap __GMP_PROTO ((mpf_ptr, mpf_ptr)) __GMP_NOTHROW;
-
-#define mpf_trunc __gmpf_trunc
-__GMP_DECLSPEC void mpf_trunc __GMP_PROTO ((mpf_ptr, mpf_srcptr));
-
-#define mpf_ui_div __gmpf_ui_div
-__GMP_DECLSPEC void mpf_ui_div __GMP_PROTO ((mpf_ptr, unsigned long int, mpf_srcptr));
-
-#define mpf_ui_sub __gmpf_ui_sub
-__GMP_DECLSPEC void mpf_ui_sub __GMP_PROTO ((mpf_ptr, unsigned long int, mpf_srcptr));
-
-#define mpf_urandomb __gmpf_urandomb
-__GMP_DECLSPEC void mpf_urandomb __GMP_PROTO ((mpf_t, gmp_randstate_t, unsigned long int));
-
-
-/************ Low level positive-integer (i.e. N) routines. ************/
-
-/* This is ugly, but we need to make user calls reach the prefixed function. */
-
-#define mpn_add __MPN(add)
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_add)
-__GMP_DECLSPEC mp_limb_t mpn_add __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr,mp_size_t));
-#endif
-
-#define mpn_add_1 __MPN(add_1)
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_add_1)
-__GMP_DECLSPEC mp_limb_t mpn_add_1 __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t)) __GMP_NOTHROW;
-#endif
-
-#define mpn_add_n __MPN(add_n)
-__GMP_DECLSPEC mp_limb_t mpn_add_n __GMP_PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t));
-
-#define mpn_addmul_1 __MPN(addmul_1)
-__GMP_DECLSPEC mp_limb_t mpn_addmul_1 __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t));
-
-#define mpn_bdivmod __MPN(bdivmod)
-__GMP_DECLSPEC mp_limb_t mpn_bdivmod __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t, mp_srcptr, mp_size_t, unsigned long int));
-
-#define mpn_cmp __MPN(cmp)
-#if __GMP_INLINE_PROTOTYPES || defined (__GMP_FORCE_mpn_cmp)
-__GMP_DECLSPEC int mpn_cmp __GMP_PROTO ((mp_srcptr, mp_srcptr, mp_size_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-#endif
-
-#define mpn_divexact_by3(dst,src,size) \
- mpn_divexact_by3c (dst, src, size, __GMP_CAST (mp_limb_t, 0))
-
-#define mpn_divexact_by3c __MPN(divexact_by3c)
-__GMP_DECLSPEC mp_limb_t mpn_divexact_by3c __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t));
-
-#define mpn_divmod_1(qp,np,nsize,dlimb) \
- mpn_divrem_1 (qp, __GMP_CAST (mp_size_t, 0), np, nsize, dlimb)
-
-#define mpn_divrem __MPN(divrem)
-__GMP_DECLSPEC mp_limb_t mpn_divrem __GMP_PROTO ((mp_ptr, mp_size_t, mp_ptr, mp_size_t, mp_srcptr, mp_size_t));
-
-#define mpn_divrem_1 __MPN(divrem_1)
-__GMP_DECLSPEC mp_limb_t mpn_divrem_1 __GMP_PROTO ((mp_ptr, mp_size_t, mp_srcptr, mp_size_t, mp_limb_t));
-
-#define mpn_divrem_2 __MPN(divrem_2)
-__GMP_DECLSPEC mp_limb_t mpn_divrem_2 __GMP_PROTO ((mp_ptr, mp_size_t, mp_ptr, mp_size_t, mp_srcptr));
-
-#define mpn_gcd __MPN(gcd)
-__GMP_DECLSPEC mp_size_t mpn_gcd __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t, mp_ptr, mp_size_t));
-
-#define mpn_gcd_1 __MPN(gcd_1)
-__GMP_DECLSPEC mp_limb_t mpn_gcd_1 __GMP_PROTO ((mp_srcptr, mp_size_t, mp_limb_t)) __GMP_ATTRIBUTE_PURE;
-
-#define mpn_gcdext __MPN(gcdext)
-__GMP_DECLSPEC mp_size_t mpn_gcdext __GMP_PROTO ((mp_ptr, mp_ptr, mp_size_t *, mp_ptr, mp_size_t, mp_ptr, mp_size_t));
-
-#define mpn_get_str __MPN(get_str)
-__GMP_DECLSPEC size_t mpn_get_str __GMP_PROTO ((unsigned char *, int, mp_ptr, mp_size_t));
-
-#define mpn_hamdist __MPN(hamdist)
-__GMP_DECLSPEC unsigned long int mpn_hamdist __GMP_PROTO ((mp_srcptr, mp_srcptr, mp_size_t)) __GMP_NOTHROW __GMP_ATTRIBUTE_PURE;
-
-#define mpn_lshift __MPN(lshift)
-__GMP_DECLSPEC mp_limb_t mpn_lshift __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, unsigned int));
-
-#define mpn_mod_1 __MPN(mod_1)
-__GMP_DECLSPEC mp_limb_t mpn_mod_1 __GMP_PROTO ((mp_srcptr, mp_size_t, mp_limb_t)) __GMP_ATTRIBUTE_PURE;
-
-#define mpn_mul __MPN(mul)
-__GMP_DECLSPEC mp_limb_t mpn_mul __GMP_PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t));
-
-#define mpn_mul_1 __MPN(mul_1)
-__GMP_DECLSPEC mp_limb_t mpn_m...
[truncated message content] |
|
From: <brg...@us...> - 2011-03-20 11:34:14
|
Revision: 413
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=413&view=rev
Author: brgladman
Date: 2011-03-20 11:34:07 +0000 (Sun, 20 Mar 2011)
Log Message:
-----------
update include file locations in some VC++ builds
Modified Paths:
--------------
trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
trunk/build.vc10/pol51optx/pol51optx.vcxproj
Modified: trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj 2011-02-08 08:18:14 UTC (rev 412)
+++ trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj 2011-03-20 11:34:07 UTC (rev 413)
@@ -76,7 +76,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_ASM_INTEL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -110,7 +110,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -141,7 +141,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_ASM_INTEL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
@@ -174,7 +174,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
Modified: trunk/build.vc10/pol51optx/pol51optx.vcxproj
===================================================================
--- trunk/build.vc10/pol51optx/pol51optx.vcxproj 2011-02-08 08:18:14 UTC (rev 412)
+++ trunk/build.vc10/pol51optx/pol51optx.vcxproj 2011-03-20 11:34:07 UTC (rev 413)
@@ -76,7 +76,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_ASM_INTEL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -110,7 +110,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -141,7 +141,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_ASM_INTEL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
@@ -174,7 +174,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-10-11 15:04:53
|
Revision: 415
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=415&view=rev
Author: brgladman
Date: 2011-10-11 15:04:42 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Improve Visual Studio 2010 build
Modified Paths:
--------------
trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters
trunk/build.vc10/makefb/makefb.vcxproj
trunk/build.vc10/makefb/makefb.vcxproj.filters
trunk/build.vc10/matbuild/matbuild.vcxproj
trunk/build.vc10/matbuild/matbuild.vcxproj.filters
trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters
trunk/build.vc10/matprune/matprune.vcxproj
trunk/build.vc10/matprune/matprune.vcxproj.filters
trunk/build.vc10/matsolve/matsolve.vcxproj
trunk/build.vc10/matsolve/matsolve.vcxproj.filters
trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters
trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters
trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters
trunk/build.vc10/pol51opt/pol51opt.vcxproj
trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters
trunk/build.vc10/pol51optx/pol51optx.vcxproj
trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters
trunk/build.vc10/polyselect/polyselect.vcxproj
trunk/build.vc10/polyselect/polyselect.vcxproj.filters
trunk/build.vc10/procrels/procrels.vcxproj
trunk/build.vc10/procrels/procrels.vcxproj.filters
trunk/build.vc10/sieve/sieve.vcxproj
trunk/build.vc10/sieve/sieve.vcxproj.filters
trunk/build.vc10/sqrt/sqrt.vcxproj
trunk/build.vc10/sqrt/sqrt.vcxproj.filters
Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -253,16 +253,25 @@
<ClCompile Include="..\..\src\squfof.c" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\include\ggnfs.h" />
- <ClInclude Include="..\..\..\include\prand.h" />
- <ClInclude Include="..\..\..\include\version.h" />
- </ItemGroup>
- <ItemGroup>
<YASM Include="..\mulmod32.asm">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</YASM>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\config.h" />
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\prand.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\lasieve.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\vsyasm.targets" />
Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -79,19 +79,46 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\include\ggnfs.h">
+ <YASM Include="..\mulmod32.asm">
+ <Filter>Assembler Files</Filter>
+ </YASM>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\include\prand.h">
+ <ClInclude Include="..\..\include\prand.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\include\version.h">
+ <ClInclude Include="..\..\include\version.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\lasieve.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
- <ItemGroup>
- <YASM Include="..\mulmod32.asm">
- <Filter>Assembler Files</Filter>
- </YASM>
- </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -334,9 +334,19 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
<ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
<ClInclude Include="..\..\src\lasieve4\lasieve.h" />
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -89,6 +89,36 @@
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -334,9 +334,19 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
<ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
<ClInclude Include="..\..\src\lasieve4\lasieve.h" />
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -89,6 +89,36 @@
<ClInclude Include="..\..\src\lasieve4\lasieve.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -298,10 +298,21 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
<ClInclude Include="..\..\src\lasieve4\generic\32bit.h" />
<ClInclude Include="..\..\if.h" />
<ClInclude Include="..\..\src\lasieve4\lasieve.h" />
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -92,6 +92,39 @@
<ClInclude Include="..\..\src\lasieve4\generic\32bit.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -298,10 +298,21 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
<ClInclude Include="..\..\src\lasieve4\generic\32bit.h" />
<ClInclude Include="..\..\if.h" />
<ClInclude Include="..\..\src\lasieve4\lasieve.h" />
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -92,6 +92,39 @@
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -298,10 +298,21 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
<ClInclude Include="..\..\src\lasieve4\generic\32bit.h" />
<ClInclude Include="..\..\if.h" />
<ClInclude Include="..\..\src\lasieve4\lasieve.h" />
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -92,6 +92,39 @@
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -303,10 +303,21 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
<ClInclude Include="..\..\src\lasieve4\generic\32bit.h" />
<ClInclude Include="..\..\if.h" />
<ClInclude Include="..\..\src\lasieve4\lasieve.h" />
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h" />
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h" />
+ <ClInclude Include="..\fnmatch.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -92,6 +92,39 @@
<ClInclude Include="..\..\src\lasieve4\piii\siever-config.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\32bit.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\ppc32\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm">
Modified: trunk/build.vc10/makefb/makefb.vcxproj
===================================================================
--- trunk/build.vc10/makefb/makefb.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/makefb/makefb.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -212,6 +212,11 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\vsyasm.targets" />
Modified: trunk/build.vc10/makefb/makefb.vcxproj.filters
===================================================================
--- trunk/build.vc10/makefb/makefb.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/makefb/makefb.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -18,4 +18,15 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/matbuild/matbuild.vcxproj
===================================================================
--- trunk/build.vc10/matbuild/matbuild.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matbuild/matbuild.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -218,8 +218,16 @@
<ClCompile Include="..\..\src\rellist.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\limits.h" />
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\prand.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
<ClInclude Include="..\..\src\intutils.h" />
<ClInclude Include="..\..\src\rellist.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ggnfslib\ggnfslib.vcxproj">
Modified: trunk/build.vc10/matbuild/matbuild.vcxproj.filters
===================================================================
--- trunk/build.vc10/matbuild/matbuild.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matbuild/matbuild.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -46,5 +46,29 @@
<ClInclude Include="..\..\src\rellist.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\limits.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\prand.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
===================================================================
--- trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -221,8 +221,26 @@
<ClCompile Include="..\..\src\rellist.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\ammintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\emmintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\immintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\mm3dnow.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\mmintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\nmmintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\pmmintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\smmintrin.h" />
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\tmmintrin.h" />
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\prand.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\experimental\app_config.h" />
+ <ClInclude Include="..\..\src\experimental\llist_tpie.h" />
+ <ClInclude Include="..\..\src\if.h" />
<ClInclude Include="..\..\src\intutils.h" />
<ClInclude Include="..\..\src\rellist.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ggnfslib\ggnfslib.vcxproj">
Modified: trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters
===================================================================
--- trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -49,5 +49,59 @@
<ClInclude Include="..\..\src\rellist.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\experimental\app_config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\ammintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\emmintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\immintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\experimental\llist_tpie.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\nmmintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\pmmintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\prand.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\mm3dnow.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\mmintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\smmintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\..\..\..\..\program files (x86)\microsoft visual studio 10.0\vc\include\tmmintrin.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/matprune/matprune.vcxproj
===================================================================
--- trunk/build.vc10/matprune/matprune.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matprune/matprune.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -213,6 +213,8 @@
<ClCompile Include="..\..\src\misc.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
<ClInclude Include="..\..\src\intutils.h" />
<ClInclude Include="..\..\src\rellist.h" />
</ItemGroup>
Modified: trunk/build.vc10/matprune/matprune.vcxproj.filters
===================================================================
--- trunk/build.vc10/matprune/matprune.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matprune/matprune.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -31,5 +31,11 @@
<ClInclude Include="..\..\src\rellist.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/matsolve/matsolve.vcxproj
===================================================================
--- trunk/build.vc10/matsolve/matsolve.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matsolve/matsolve.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -221,6 +221,15 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\prand.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\vsyasm.targets" />
Modified: trunk/build.vc10/matsolve/matsolve.vcxproj.filters
===================================================================
--- trunk/build.vc10/matsolve/matsolve.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/matsolve/matsolve.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -27,4 +27,27 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\prand.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0b/pol51m0b.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51m0b/pol51m0b.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -208,7 +208,14 @@
<ClCompile Include="..\..\src\pol5\zeit.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\pol5\fnmatch.h" />
<ClInclude Include="..\..\src\pol5\if.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\pol5\asm_hash5.asm">
Modified: trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -34,6 +34,27 @@
<ClInclude Include="..\..\src\pol5\if.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\pol5\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\pol5\asm_hash5.asm">
Modified: trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -211,12 +211,17 @@
<ClCompile Include="..\..\src\experimental\pol5\stage1\struct.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
<ClInclude Include="..\getopt.h" />
<ClInclude Include="..\..\src\pol5\if.h" />
<ClInclude Include="..\..\src\experimental\pol5\include\poly_stage1.h" />
<ClInclude Include="..\..\src\experimental\pol5\include\profile.h" />
<ClInclude Include="..\..\src\experimental\pol5\stage1\stage1_impl.h" />
<ClInclude Include="..\..\src\experimental\pol5\stage1\stage1_inline.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\experimental\pol5\stage1\asm_hash5.asm">
Modified: trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -58,6 +58,21 @@
<ClInclude Include="..\..\src\experimental\pol5\stage1\stage1_inline.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\experimental\pol5\stage1\asm_hash5.asm">
Modified: trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0n/pol51m0n.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51m0n/pol51m0n.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -208,7 +208,14 @@
<ClCompile Include="..\..\src\pol5\zeit.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\pol5\fnmatch.h" />
<ClInclude Include="..\..\src\pol5\if.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\pol5\asm_hash5n.asm">
Modified: trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -34,6 +34,27 @@
<ClInclude Include="..\..\src\pol5\if.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\pol5\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\pol5\asm_hash5n.asm">
Modified: trunk/build.vc10/pol51opt/pol51opt.vcxproj
===================================================================
--- trunk/build.vc10/pol51opt/pol51opt.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51opt/pol51opt.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -209,7 +209,16 @@
<ClCompile Include="..\..\src\pol5\zeit.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h" />
+ <ClInclude Include="..\..\src\lasieve4\lasieve.h" />
+ <ClInclude Include="..\..\src\pol5\fnmatch.h" />
<ClInclude Include="..\..\src\pol5\if.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\pol5\asm_rs.asm">
Modified: trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -37,6 +37,33 @@
<ClInclude Include="..\..\src\pol5\if.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\pol5\fnmatch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\lasieve.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\pol5\asm_rs.asm">
Modified: trunk/build.vc10/pol51optx/pol51optx.vcxproj
===================================================================
--- trunk/build.vc10/pol51optx/pol51optx.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51optx/pol51optx.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -213,11 +213,17 @@
<ClCompile Include="..\..\src\experimental\pol5\stage2\translate.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
<ClInclude Include="..\..\src\pol5\if.h" />
<ClInclude Include="..\..\src\experimental\pol5\include\poly_stage2.h" />
<ClInclude Include="..\..\src\experimental\pol5\include\profile.h" />
<ClInclude Include="..\..\src\experimental\pol5\stage2\stage2_impl.h" />
<ClInclude Include="..\..\src\experimental\pol5\stage2\stage2_inline.h" />
+ <ClInclude Include="..\getopt.h" />
+ <ClInclude Include="..\unistd.h" />
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\experimental\pol5\stage2\asm_rs.asm">
Modified: trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -61,6 +61,24 @@
<ClInclude Include="..\..\src\experimental\pol5\stage2\stage2_inline.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\unistd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<YASM Include="..\..\src\experimental\pol5\stage2\asm_rs.asm">
Modified: trunk/build.vc10/polyselect/polyselect.vcxproj
===================================================================
--- trunk/build.vc10/polyselect/polyselect.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/polyselect/polyselect.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -211,6 +211,12 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\prand.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\vsyasm.targets" />
Modified: trunk/build.vc10/polyselect/polyselect.vcxproj.filters
===================================================================
--- trunk/build.vc10/polyselect/polyselect.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/polyselect/polyselect.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -15,4 +15,18 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\prand.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/procrels/procrels.vcxproj
===================================================================
--- trunk/build.vc10/procrels/procrels.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/procrels/procrels.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -209,6 +209,11 @@
<ClCompile Include="..\..\src\rellist.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\prand.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ <ClInclude Include="..\..\src\if.h" />
<ClInclude Include="..\..\src\intutils.h" />
<ClInclude Include="..\..\src\rellist.h" />
</ItemGroup>
Modified: trunk/build.vc10/procrels/procrels.vcxproj.filters
===================================================================
--- trunk/build.vc10/procrels/procrels.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/procrels/procrels.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -31,5 +31,20 @@
<ClInclude Include="..\..\src\rellist.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\src\if.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\prand.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/sieve/sieve.vcxproj
===================================================================
--- trunk/build.vc10/sieve/sieve.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/sieve/sieve.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -214,6 +214,11 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\vsyasm.targets" />
Modified: trunk/build.vc10/sieve/sieve.vcxproj.filters
===================================================================
--- trunk/build.vc10/sieve/sieve.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/sieve/sieve.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -24,4 +24,15 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/sqrt/sqrt.vcxproj
===================================================================
--- trunk/build.vc10/sqrt/sqrt.vcxproj 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/sqrt/sqrt.vcxproj 2011-10-11 15:04:42 UTC (rev 415)
@@ -212,6 +212,11 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\include\ggnfs.h" />
+ <ClInclude Include="..\..\include\version.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\vsyasm.targets" />
Modified: trunk/build.vc10/sqrt/sqrt.vcxproj.filters
===================================================================
--- trunk/build.vc10/sqrt/sqrt.vcxproj.filters 2011-04-16 07:13:51 UTC (rev 414)
+++ trunk/build.vc10/sqrt/sqrt.vcxproj.filters 2011-10-11 15:04:42 UTC (rev 415)
@@ -18,4 +18,15 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\include\ggnfs.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\include\version.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-10-22 07:34:33
|
Revision: 417
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=417&view=rev
Author: brgladman
Date: 2011-10-22 07:34:27 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
add files needed for the experimental siever
Added Paths:
-----------
trunk/build.vc10/alloca.h
trunk/build.vc10/asprintf.c
trunk/build.vc10/asprintf.h
trunk/build.vc10/vasprintf.c
Added: trunk/build.vc10/alloca.h
===================================================================
--- trunk/build.vc10/alloca.h (rev 0)
+++ trunk/build.vc10/alloca.h 2011-10-22 07:34:27 UTC (rev 417)
@@ -0,0 +1,7 @@
+
+#ifndef ALLOCA_H
+#define ALLOCA_H
+
+#define alloca _alloca
+
+#endif
\ No newline at end of file
Added: trunk/build.vc10/asprintf.c
===================================================================
--- trunk/build.vc10/asprintf.c (rev 0)
+++ trunk/build.vc10/asprintf.c 2011-10-22 07:34:27 UTC (rev 417)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2007, The xFTPd Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the xFTPd Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * * Redistributions of this project or parts of this project in any form
+ * must retain the following aknowledgment:
+ * "This product includes software developed by the xFTPd Project.
+ * http://www.xftpd.com/ - http://www.xftpd.org/"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE xFTPd PROJECT ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE xFTPd PROJECT BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+/* MinGW lacks asprintf */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+int vasprintf(char **strp, const char *fmt, va_list ap)
+{
+ FILE *dev_null;
+ int arg_len;
+
+ dev_null = fopen("nul", "w");
+ arg_len = vfprintf(dev_null, fmt, ap);
+ if(arg_len != -1) {
+ *strp = (char *)malloc((size_t)arg_len + 1);
+ arg_len = vsprintf(*strp, fmt, ap);
+ } else *strp = NULL;
+ fclose(dev_null);
+ return arg_len;
+}
+
+int asprintf(char **strp, const char *fmt, ...)
+{
+ int result;
+
+ va_list args;
+ va_start(args, fmt);
+ result = vasprintf(strp, fmt, args);
+ va_end(args);
+ return result;
+}
Added: trunk/build.vc10/asprintf.h
===================================================================
--- trunk/build.vc10/asprintf.h (rev 0)
+++ trunk/build.vc10/asprintf.h 2011-10-22 07:34:27 UTC (rev 417)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2007, The xFTPd Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the xFTPd Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * * Redistributions of this project or parts of this project in any form
+ * must retain the following aknowledgment:
+ * "This product includes software developed by the xFTPd Project.
+ * http://www.xftpd.com/ - http://www.xftpd.org/"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE xFTPd PROJECT ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE xFTPd PROJECT BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* MinGW lacks asprintf */
+
+#ifndef __ASPRINTF_H
+#define __ASPRINTF_H
+
+#include <windows.h>
+
+int asprintf(char **ret, const char *fmt, ...);
+int vasprintf(char **strp, const char *fmt, va_list ap);
+
+char *bprintf(const char *fmt, ...);
+
+#endif /* __ASPRINTF_H */
Added: trunk/build.vc10/vasprintf.c
===================================================================
--- trunk/build.vc10/vasprintf.c (rev 0)
+++ trunk/build.vc10/vasprintf.c 2011-10-22 07:34:27 UTC (rev 417)
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2004 Darren Tucker.
+ *
+ * Based originally on asprintf.c from OpenBSD:
+ * Copyright (c) 1997 Todd C. Miller <Tod...@co...>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef HAVE_VASPRINTF
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
+#ifndef VA_COPY
+# ifdef HAVE_VA_COPY
+# define VA_COPY(dest, src) va_copy(dest, src)
+# else
+# ifdef HAVE___VA_COPY
+# define VA_COPY(dest, src) __va_copy(dest, src)
+# else
+# define VA_COPY(dest, src) (dest) = (src)
+# endif
+# endif
+#endif
+
+#define INIT_SZ 128
+
+int vasprintf(char **str, const char *fmt, va_list ap)
+{
+ int ret = -1;
+ va_list ap2;
+ char *string, *newstr;
+ size_t len;
+
+ VA_COPY(ap2, ap);
+ if ((string = malloc(INIT_SZ)) == NULL)
+ goto fail;
+
+ ret = vsnprintf(string, INIT_SZ, fmt, ap2);
+ if (ret >= 0 && ret < INIT_SZ) { /* succeeded with initial alloc */
+ *str = string;
+ } else if (ret == INT_MAX) { /* shouldn't happen */
+ goto fail;
+ } else { /* bigger than initial, realloc allowing for nul */
+ len = (size_t)ret + 1;
+ if ((newstr = realloc(string, len)) == NULL) {
+ free(string);
+ goto fail;
+ } else {
+ va_end(ap2);
+ VA_COPY(ap2, ap);
+ ret = vsnprintf(newstr, len, fmt, ap2);
+ if (ret >= 0 && (size_t)ret < len) {
+ *str = newstr;
+ } else { /* failed with realloc'ed string, give up */
+ free(newstr);
+ goto fail;
+ }
+ }
+ }
+ va_end(ap2);
+ return (ret);
+
+fail:
+ *str = NULL;
+ errno = ENOMEM;
+ va_end(ap2);
+ return (-1);
+}
+#endif
+
+#ifndef HAVE_ASPRINTF
+int asprintf(char **str, const char *fmt, ...)
+{
+ va_list ap;
+ int ret;
+
+ *str = NULL;
+ va_start(ap, fmt);
+ ret = vasprintf(str, fmt, ap);
+ va_end(ap);
+
+ return ret;
+}
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-11-21 21:36:53
|
Revision: 423
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=423&view=rev
Author: brgladman
Date: 2011-11-21 21:36:46 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
Add the _WIN64 define to the compiler command line for x64 builds
Modified Paths:
--------------
trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
trunk/build.vc10/makefb/makefb.vcxproj
trunk/build.vc10/matbuild/matbuild.vcxproj
trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
trunk/build.vc10/matprune/matprune.vcxproj
trunk/build.vc10/matsolve/matsolve.vcxproj
trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
trunk/build.vc10/pol51opt/pol51opt.vcxproj
trunk/build.vc10/pol51optx/pol51optx.vcxproj
trunk/build.vc10/polyselect/polyselect.vcxproj
trunk/build.vc10/procrels/procrels.vcxproj
trunk/build.vc10/sieve/sieve.vcxproj
trunk/build.vc10/sqrt/sqrt.vcxproj
Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -114,7 +114,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -180,7 +180,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -131,7 +131,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<SmallerTypeCheck>false</SmallerTypeCheck>
@@ -217,7 +217,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -131,7 +131,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<SmallerTypeCheck>false</SmallerTypeCheck>
@@ -217,7 +217,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -127,7 +127,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -211,7 +211,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -127,7 +127,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -211,7 +211,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
Modified: trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -127,7 +127,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=15;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=15;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -211,7 +211,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=15;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=15;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -127,7 +127,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=16;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=16;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -211,7 +211,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=16;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=16;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
Modified: trunk/build.vc10/makefb/makefb.vcxproj
===================================================================
--- trunk/build.vc10/makefb/makefb.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/makefb/makefb.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;_MAKEFB_STANDALONE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;_MAKEFB_STANDALONE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -176,7 +176,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;_MAKEFB_STANDALONE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;_MAKEFB_STANDALONE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
Modified: trunk/build.vc10/matbuild/matbuild.vcxproj
===================================================================
--- trunk/build.vc10/matbuild/matbuild.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/matbuild/matbuild.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
Modified: trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
===================================================================
--- trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;GGNFS_TPIE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;WIN32;_DEBUG;_CONSOLE;GGNFS_TPIE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
Modified: trunk/build.vc10/matprune/matprune.vcxproj
===================================================================
--- trunk/build.vc10/matprune/matprune.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/matprune/matprune.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
Modified: trunk/build.vc10/matsolve/matsolve.vcxproj
===================================================================
--- trunk/build.vc10/matsolve/matsolve.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/matsolve/matsolve.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -176,7 +176,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
Modified: trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0b/pol51m0b.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/pol51m0b/pol51m0b.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
Modified: trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
Modified: trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
===================================================================
--- trunk/build.vc10/pol51m0n/pol51m0n.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/pol51m0n/pol51m0n.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
Modified: trunk/build.vc10/pol51opt/pol51opt.vcxproj
===================================================================
--- trunk/build.vc10/pol51opt/pol51opt.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/pol51opt/pol51opt.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
Modified: trunk/build.vc10/pol51optx/pol51optx.vcxproj
===================================================================
--- trunk/build.vc10/pol51optx/pol51optx.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/pol51optx/pol51optx.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -175,7 +175,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\src\experimental\pol5\include;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
Modified: trunk/build.vc10/polyselect/polyselect.vcxproj
===================================================================
--- trunk/build.vc10/polyselect/polyselect.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/polyselect/polyselect.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -176,7 +176,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
Modified: trunk/build.vc10/procrels/procrels.vcxproj
===================================================================
--- trunk/build.vc10/procrels/procrels.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/procrels/procrels.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -176,7 +176,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
Modified: trunk/build.vc10/sieve/sieve.vcxproj
===================================================================
--- trunk/build.vc10/sieve/sieve.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/sieve/sieve.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -176,7 +176,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
Modified: trunk/build.vc10/sqrt/sqrt.vcxproj
===================================================================
--- trunk/build.vc10/sqrt/sqrt.vcxproj 2011-10-23 19:58:39 UTC (rev 422)
+++ trunk/build.vc10/sqrt/sqrt.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
@@ -111,7 +111,7 @@
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -176,7 +176,7 @@
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<PrecompiledHeader>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <brg...@us...> - 2011-12-20 09:14:42
|
Revision: 424
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=424&view=rev
Author: brgladman
Date: 2011-12-20 09:14:29 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
set Visual Studio output directories to ggnfs\lib and ggnfs\bin
Modified Paths:
--------------
trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
trunk/build.vc10/makefb/makefb.vcxproj
trunk/build.vc10/matbuild/matbuild.vcxproj
trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
trunk/build.vc10/matprune/matprune.vcxproj
trunk/build.vc10/matsolve/matsolve.vcxproj
trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
trunk/build.vc10/pol51opt/pol51opt.vcxproj
trunk/build.vc10/pol51optx/pol51optx.vcxproj
trunk/build.vc10/polyselect/polyselect.vcxproj
trunk/build.vc10/procrels/procrels.vcxproj
trunk/build.vc10/sieve/sieve.vcxproj
trunk/build.vc10/sqrt/sqrt.vcxproj
Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2011-12-20 09:14:29 UTC (rev 424)
@@ -61,10 +61,12 @@
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\lib\$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\lib\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\lib\$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\lib\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
@@ -78,7 +80,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -92,7 +94,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Lib>
- <AdditionalDependencies>..\..\..\mpir\build.vc10\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\mpir\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
<PostBuildEvent>
<Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
@@ -113,7 +115,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -127,7 +129,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Lib>
- <AdditionalDependencies>..\..\..\mpir\build.vc10\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\mpir\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
<PostBuildEvent>
<Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
@@ -145,7 +147,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -158,7 +160,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Lib>
- <AdditionalDependencies>..\..\..\mpir\build.vc10\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\mpir\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
<PostBuildEvent>
<Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
@@ -179,7 +181,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -192,7 +194,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Lib>
- <AdditionalDependencies>..\..\..\mpir\build.vc10\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\mpir\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
<PostBuildEvent>
<Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2011-12-20 09:14:29 UTC (rev 424)
@@ -59,22 +59,22 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -84,7 +84,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -101,7 +101,7 @@
<EnablePREfast>true</EnablePREfast>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
@@ -112,12 +112,13 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -130,7 +131,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -145,7 +146,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -155,12 +156,13 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -174,7 +176,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -187,7 +189,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -198,12 +200,13 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -216,7 +219,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -229,7 +232,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -240,7 +243,8 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2011-12-20 09:14:29 UTC (rev 424)
@@ -59,22 +59,22 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -84,7 +84,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=12;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -101,7 +101,7 @@
<EnablePREfast>true</EnablePREfast>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
@@ -112,12 +112,13 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -130,7 +131,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -145,7 +146,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -155,12 +156,13 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -174,7 +176,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=12;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -187,7 +189,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -198,12 +200,13 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -216,7 +219,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -229,7 +232,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -240,7 +243,8 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2011-12-20 09:14:29 UTC (rev 424)
@@ -59,22 +59,22 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -84,7 +84,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=13;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -98,7 +98,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve13.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -108,12 +108,13 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -126,7 +127,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -140,7 +141,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve13.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -150,12 +151,13 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -168,7 +170,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=13;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -181,7 +183,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -192,12 +194,13 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -210,7 +213,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -223,7 +226,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -234,7 +237,8 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2011-12-20 09:14:29 UTC (rev 424)
@@ -59,22 +59,22 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -84,7 +84,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=14;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -98,7 +98,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve14.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -108,12 +108,13 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -126,7 +127,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -140,7 +141,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve14.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -150,12 +151,13 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -168,7 +170,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=14;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -181,7 +183,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -192,12 +194,13 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -210,7 +213,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -223,7 +226,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -234,7 +237,8 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj 2011-12-20 09:14:29 UTC (rev 424)
@@ -59,22 +59,22 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -84,7 +84,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=15;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -98,7 +98,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve15.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -108,12 +108,13 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -126,7 +127,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;I_bits=15;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -140,7 +141,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)latsieve15.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -150,12 +151,13 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\piii\siever-config.h %Wd%\asm\siever-config.h
@@ -168,7 +170,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=15;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -181,7 +183,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -192,12 +194,13 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC8(%DATE%)" >..\..\include\version.h)
+ <Command>if not exist ..\..\include\version.h (echo #define GGNFS_VERSION "0.77.1-VC10(%DATE%)" >..\..\include\version.h)
set Wd=..\..\src\lasieve4
if not exist %Wd%\asm (echo creating %Wd%\asm && md %Wd%\asm)
call ..\file_copy %Wd%\ppc32\siever-config.h %Wd%\asm\siever-config.h
@@ -210,7 +213,7 @@
<ClCompile>
<Optimization>Full</Optimization>
<WholeProgramOptimization>false</WholeProgramOptimization>
- <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\lib\$(IntDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;I_bits=15;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -223,7 +226,7 @@
<CompileAs>Default</CompileAs>
</ClCompile>
<Link>
- <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
+ <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\lib\$(IntDir)\mpir.lib</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -234,7 +237,8 @@
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
- <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj 2011-11-21 21:36:46 UTC (rev 423)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj 2011-12-20 09:14:29 UTC (rev 424)
@@ -59,22 +59,22 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+ <OutDir Condition="'$(Conf...
[truncated message content] |
|
From: <brg...@us...> - 2012-12-07 10:53:54
|
Revision: 431
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=431&view=rev
Author: brgladman
Date: 2012-12-07 10:53:42 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
update Visual Studio experimental sieve build
Modified Paths:
--------------
trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters
trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters
trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters
trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters
trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj
trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj.filters
trunk/build.vc10/makefb/makefb.vcxproj
trunk/build.vc10/matbuild/matbuild.vcxproj
trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj
trunk/build.vc10/matprune/matprune.vcxproj
trunk/build.vc10/matsolve/matsolve.vcxproj
trunk/build.vc10/pol51m0b/pol51m0b.vcxproj
trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj
trunk/build.vc10/pol51m0n/pol51m0n.vcxproj
trunk/build.vc10/pol51opt/pol51opt.vcxproj
trunk/build.vc10/pol51optx/pol51optx.vcxproj
trunk/build.vc10/polyselect/polyselect.vcxproj
trunk/build.vc10/procrels/procrels.vcxproj
trunk/build.vc10/sieve/sieve.vcxproj
trunk/build.vc10/sqrt/sqrt.vcxproj
Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -261,8 +261,8 @@
</YASM>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\config.h" />
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\config.h" />
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\include\ggnfs.h" />
<ClInclude Include="..\..\include\prand.h" />
<ClInclude Include="..\..\include\version.h" />
Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -338,7 +338,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\include\ggnfs.h" />
<ClInclude Include="..\..\include\version.h" />
<ClInclude Include="..\..\src\if.h" />
Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -338,7 +338,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\include\ggnfs.h" />
<ClInclude Include="..\..\include\version.h" />
<ClInclude Include="..\..\src\if.h" />
Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -302,7 +302,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\include\ggnfs.h" />
<ClInclude Include="..\..\include\version.h" />
<ClInclude Include="..\..\src\if.h" />
Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -302,7 +302,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\include\ggnfs.h" />
<ClInclude Include="..\..\include\version.h" />
<ClInclude Include="..\..\src\if.h" />
Modified: trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -302,7 +302,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\include\ggnfs.h" />
<ClInclude Include="..\..\include\version.h" />
<ClInclude Include="..\..\src\if.h" />
Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -307,7 +307,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\include\ggnfs.h" />
<ClInclude Include="..\..\include\version.h" />
<ClInclude Include="..\..\src\if.h" />
Modified: trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -50,13 +52,13 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_bits=11;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI11.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -68,7 +70,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;I_bits=11;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -76,7 +78,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI11.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI11.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -98,8 +100,8 @@
<ClCompile Include="..\..\getopt.c" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />
Modified: trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters 2012-12-07 10:53:42 UTC (rev 431)
@@ -106,10 +106,10 @@
<ClInclude Include="..\..\unistd.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Modified: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -28,23 +28,27 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -81,12 +85,12 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_bits=12;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -96,13 +100,13 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_bits=12;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI12.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI12.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -114,7 +118,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;I_bits=12;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -122,7 +126,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -134,7 +138,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;I_bits=12;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -142,7 +146,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI12.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI12.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -164,8 +168,8 @@
<ClCompile Include="..\..\getopt.c" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />
Modified: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -28,23 +28,27 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -81,12 +85,12 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_bits=13;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -96,13 +100,13 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_bits=13;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI13.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI13.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -114,7 +118,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;I_bits=13;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -122,7 +126,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -134,7 +138,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;I_bits=13;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -142,7 +146,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI13.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI13.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -164,8 +168,8 @@
<ClCompile Include="..\..\getopt.c" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />
Modified: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters 2012-12-07 10:53:42 UTC (rev 431)
@@ -106,10 +106,10 @@
<ClInclude Include="..\..\unistd.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Modified: trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -28,23 +28,27 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -81,12 +85,12 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_bits=14;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -96,13 +100,13 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_bits=14;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI14.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI14.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -114,7 +118,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;I_bits=14;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -122,7 +126,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -134,7 +138,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;I_bits=14;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -142,7 +146,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI14.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI14.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -164,8 +168,8 @@
<ClCompile Include="..\..\getopt.c" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />
Modified: trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters 2012-12-07 10:53:42 UTC (rev 431)
@@ -106,10 +106,10 @@
<ClInclude Include="..\..\unistd.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Modified: trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -28,23 +28,27 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -81,12 +85,12 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_bits=15;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -96,13 +100,13 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_bits=15;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI15.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI15.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -114,7 +118,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;I_bits=15;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -122,7 +126,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -134,7 +138,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;I_bits=15;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -142,7 +146,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI15.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI15.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -164,8 +168,8 @@
<ClCompile Include="..\..\getopt.c" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />
Modified: trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters 2012-12-07 10:53:42 UTC (rev 431)
@@ -106,10 +106,10 @@
<ClInclude Include="..\..\unistd.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Modified: trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -28,23 +28,27 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -81,12 +85,12 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_bits=16;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -96,13 +100,13 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_bits=16;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI16.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI16.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -114,7 +118,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;I_bits=16;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -122,7 +126,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -134,7 +138,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;I_bits=16;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -142,7 +146,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI16.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI16.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -164,8 +168,8 @@
<ClCompile Include="..\..\getopt.c" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" />
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />
Modified: trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters 2012-12-07 10:53:42 UTC (rev 431)
@@ -106,10 +106,10 @@
<ClInclude Include="..\..\unistd.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h">
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Modified: trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -20,12 +20,14 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -55,7 +57,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;n_i_bits=11;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>.\;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\;..\..\..\src\experimental\lasieve4_64\x64</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\;..\..\..\..\mpir\lib\$(IntDir);..\..\;..\..\..\src\experimental\lasieve4_64\x64</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
@@ -72,7 +74,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;n_i_bits=11;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
@@ -80,7 +82,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -149,7 +151,7 @@
<ClCompile Include="..\..\..\src\experimental\lasieve4_64\asm\zeit.c" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\if.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h" />
Modified: trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters 2012-12-07 10:53:42 UTC (rev 431)
@@ -55,7 +55,7 @@
<ClInclude Include="..\..\unistd.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Modified: trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -20,12 +20,14 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -51,7 +53,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;I_bits=11;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
@@ -72,7 +74,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;I_bits=11;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -127,7 +129,7 @@
</YASM>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\mpir.h" />
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\mpir.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\if.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h" />
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h" />
Modified: trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters 2012-12-07 10:53:42 UTC (rev 431)
@@ -69,7 +69,7 @@
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\mpir.h">
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\mpir.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Modified: trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj 2012-08-26 20:19:45 UTC (rev 430)
+++ trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj 2012-12-07 10:53:42 UTC (rev 431)
@@ -28,23 +28,27 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
...
[truncated message content] |
|
From: <brg...@us...> - 2012-12-07 21:04:46
|
Revision: 434
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=434&view=rev
Author: brgladman
Date: 2012-12-07 21:04:37 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
update Visual Studio experimental sieve build
Modified Paths:
--------------
trunk/build.vc10/ggnfs.sln
trunk/build.vc10/lasieve.exp/lasieve.exp.sln
trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj
trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj
Modified: trunk/build.vc10/ggnfs.sln
===================================================================
--- trunk/build.vc10/ggnfs.sln 2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/ggnfs.sln 2012-12-07 21:04:37 UTC (rev 434)
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C5B2EA76-3258-4716-BA00-8F75BF8A7839}"
ProjectSection(SolutionItems) = preProject
file_copy.bat = file_copy.bat
@@ -56,169 +56,127 @@
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Debug|Win32.ActiveCfg = Debug|Win32
- {1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Debug|Win32.Build.0 = Debug|Win32
{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Debug|x64.ActiveCfg = Debug|x64
- {1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Debug|x64.Build.0 = Debug|x64
{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Release|Win32.ActiveCfg = Release|Win32
{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Release|Win32.Build.0 = Release|Win32
{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Release|x64.ActiveCfg = Release|x64
{1BD758C0-741C-4E0A-AEBB-FE57A7882AB7}.Release|x64.Build.0 = Release|x64
{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Debug|Win32.ActiveCfg = Debug|Win32
- {4C204C23-29AA-4987-977C-ECD1F6C399DD}.Debug|Win32.Build.0 = Debug|Win32
{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Debug|x64.ActiveCfg = Debug|x64
- {4C204C23-29AA-4987-977C-ECD1F6C399DD}.Debug|x64.Build.0 = Debug|x64
{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Release|Win32.ActiveCfg = Release|Win32
{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Release|Win32.Build.0 = Release|Win32
{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Release|x64.ActiveCfg = Release|x64
{4C204C23-29AA-4987-977C-ECD1F6C399DD}.Release|x64.Build.0 = Release|x64
{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Debug|Win32.ActiveCfg = Debug|Win32
- {41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Debug|Win32.Build.0 = Debug|Win32
{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Debug|x64.ActiveCfg = Debug|x64
- {41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Debug|x64.Build.0 = Debug|x64
{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Release|Win32.ActiveCfg = Release|Win32
{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Release|Win32.Build.0 = Release|Win32
{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Release|x64.ActiveCfg = Release|x64
{41DDD9A9-2E07-47F6-9AFC-6083470E8CFB}.Release|x64.Build.0 = Release|x64
{97029F18-F90E-4FD4-96E4-22335BD04347}.Debug|Win32.ActiveCfg = Debug|Win32
- {97029F18-F90E-4FD4-96E4-22335BD04347}.Debug|Win32.Build.0 = Debug|Win32
{97029F18-F90E-4FD4-96E4-22335BD04347}.Debug|x64.ActiveCfg = Debug|x64
- {97029F18-F90E-4FD4-96E4-22335BD04347}.Debug|x64.Build.0 = Debug|x64
{97029F18-F90E-4FD4-96E4-22335BD04347}.Release|Win32.ActiveCfg = Release|Win32
{97029F18-F90E-4FD4-96E4-22335BD04347}.Release|Win32.Build.0 = Release|Win32
{97029F18-F90E-4FD4-96E4-22335BD04347}.Release|x64.ActiveCfg = Release|x64
{97029F18-F90E-4FD4-96E4-22335BD04347}.Release|x64.Build.0 = Release|x64
{A9BA6180-15F7-421C-8268-C0A1D3773551}.Debug|Win32.ActiveCfg = Debug|Win32
- {A9BA6180-15F7-421C-8268-C0A1D3773551}.Debug|Win32.Build.0 = Debug|Win32
{A9BA6180-15F7-421C-8268-C0A1D3773551}.Debug|x64.ActiveCfg = Debug|x64
- {A9BA6180-15F7-421C-8268-C0A1D3773551}.Debug|x64.Build.0 = Debug|x64
{A9BA6180-15F7-421C-8268-C0A1D3773551}.Release|Win32.ActiveCfg = Release|Win32
{A9BA6180-15F7-421C-8268-C0A1D3773551}.Release|Win32.Build.0 = Release|Win32
{A9BA6180-15F7-421C-8268-C0A1D3773551}.Release|x64.ActiveCfg = Release|x64
{A9BA6180-15F7-421C-8268-C0A1D3773551}.Release|x64.Build.0 = Release|x64
{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Debug|Win32.ActiveCfg = Debug|Win32
- {49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Debug|Win32.Build.0 = Debug|Win32
{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Debug|x64.ActiveCfg = Debug|x64
- {49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Debug|x64.Build.0 = Debug|x64
{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Release|Win32.ActiveCfg = Release|Win32
{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Release|Win32.Build.0 = Release|Win32
{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Release|x64.ActiveCfg = Release|x64
{49612660-5FAB-4EED-BC9E-BFB57FB1AFC5}.Release|x64.Build.0 = Release|x64
{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Debug|Win32.ActiveCfg = Debug|Win32
- {4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Debug|Win32.Build.0 = Debug|Win32
{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Debug|x64.ActiveCfg = Debug|x64
- {4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Debug|x64.Build.0 = Debug|x64
{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Release|Win32.ActiveCfg = Release|Win32
{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Release|Win32.Build.0 = Release|Win32
{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Release|x64.ActiveCfg = Release|x64
{4A6552E6-519B-411A-8FB1-CD04BBDA0A3A}.Release|x64.Build.0 = Release|x64
{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Debug|Win32.ActiveCfg = Debug|Win32
- {B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Debug|Win32.Build.0 = Debug|Win32
{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Debug|x64.ActiveCfg = Debug|x64
- {B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Debug|x64.Build.0 = Debug|x64
{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Release|Win32.ActiveCfg = Release|Win32
{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Release|Win32.Build.0 = Release|Win32
{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Release|x64.ActiveCfg = Release|x64
{B99E3A0A-1071-41D5-8FC7-FD3F784493BF}.Release|x64.Build.0 = Release|x64
{7E52286B-67E8-4C69-8015-EEF595657674}.Debug|Win32.ActiveCfg = Debug|Win32
- {7E52286B-67E8-4C69-8015-EEF595657674}.Debug|Win32.Build.0 = Debug|Win32
{7E52286B-67E8-4C69-8015-EEF595657674}.Debug|x64.ActiveCfg = Debug|x64
- {7E52286B-67E8-4C69-8015-EEF595657674}.Debug|x64.Build.0 = Debug|x64
{7E52286B-67E8-4C69-8015-EEF595657674}.Release|Win32.ActiveCfg = Release|Win32
{7E52286B-67E8-4C69-8015-EEF595657674}.Release|Win32.Build.0 = Release|Win32
{7E52286B-67E8-4C69-8015-EEF595657674}.Release|x64.ActiveCfg = Release|x64
{7E52286B-67E8-4C69-8015-EEF595657674}.Release|x64.Build.0 = Release|x64
{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Debug|Win32.ActiveCfg = Debug|Win32
- {CD9957B8-A62F-4005-A62B-3DD37E66836A}.Debug|Win32.Build.0 = Debug|Win32
{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Debug|x64.ActiveCfg = Debug|x64
- {CD9957B8-A62F-4005-A62B-3DD37E66836A}.Debug|x64.Build.0 = Debug|x64
{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Release|Win32.ActiveCfg = Release|Win32
{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Release|Win32.Build.0 = Release|Win32
{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Release|x64.ActiveCfg = Release|x64
{CD9957B8-A62F-4005-A62B-3DD37E66836A}.Release|x64.Build.0 = Release|x64
{5312A2AE-53B6-43FE-BF45-0F4102944537}.Debug|Win32.ActiveCfg = Debug|Win32
- {5312A2AE-53B6-43FE-BF45-0F4102944537}.Debug|Win32.Build.0 = Debug|Win32
{5312A2AE-53B6-43FE-BF45-0F4102944537}.Debug|x64.ActiveCfg = Debug|x64
- {5312A2AE-53B6-43FE-BF45-0F4102944537}.Debug|x64.Build.0 = Debug|x64
{5312A2AE-53B6-43FE-BF45-0F4102944537}.Release|Win32.ActiveCfg = Release|Win32
{5312A2AE-53B6-43FE-BF45-0F4102944537}.Release|Win32.Build.0 = Release|Win32
{5312A2AE-53B6-43FE-BF45-0F4102944537}.Release|x64.ActiveCfg = Release|x64
{5312A2AE-53B6-43FE-BF45-0F4102944537}.Release|x64.Build.0 = Release|x64
{035DE163-0989-47C0-A63B-B327C5D4ED00}.Debug|Win32.ActiveCfg = Debug|Win32
- {035DE163-0989-47C0-A63B-B327C5D4ED00}.Debug|Win32.Build.0 = Debug|Win32
{035DE163-0989-47C0-A63B-B327C5D4ED00}.Debug|x64.ActiveCfg = Debug|x64
- {035DE163-0989-47C0-A63B-B327C5D4ED00}.Debug|x64.Build.0 = Debug|x64
{035DE163-0989-47C0-A63B-B327C5D4ED00}.Release|Win32.ActiveCfg = Release|Win32
{035DE163-0989-47C0-A63B-B327C5D4ED00}.Release|Win32.Build.0 = Release|Win32
{035DE163-0989-47C0-A63B-B327C5D4ED00}.Release|x64.ActiveCfg = Release|x64
{035DE163-0989-47C0-A63B-B327C5D4ED00}.Release|x64.Build.0 = Release|x64
{0B29F448-FD43-4C93-A7D4-7B305150F444}.Debug|Win32.ActiveCfg = Debug|Win32
- {0B29F448-FD43-4C93-A7D4-7B305150F444}.Debug|Win32.Build.0 = Debug|Win32
{0B29F448-FD43-4C93-A7D4-7B305150F444}.Debug|x64.ActiveCfg = Debug|x64
- {0B29F448-FD43-4C93-A7D4-7B305150F444}.Debug|x64.Build.0 = Debug|x64
{0B29F448-FD43-4C93-A7D4-7B305150F444}.Release|Win32.ActiveCfg = Release|Win32
{0B29F448-FD43-4C93-A7D4-7B305150F444}.Release|Win32.Build.0 = Release|Win32
{0B29F448-FD43-4C93-A7D4-7B305150F444}.Release|x64.ActiveCfg = Release|x64
{0B29F448-FD43-4C93-A7D4-7B305150F444}.Release|x64.Build.0 = Release|x64
{985482DC-7D29-4658-B4F4-2978C314C48D}.Debug|Win32.ActiveCfg = Debug|Win32
- {985482DC-7D29-4658-B4F4-2978C314C48D}.Debug|Win32.Build.0 = Debug|Win32
{985482DC-7D29-4658-B4F4-2978C314C48D}.Debug|x64.ActiveCfg = Debug|x64
- {985482DC-7D29-4658-B4F4-2978C314C48D}.Debug|x64.Build.0 = Debug|x64
{985482DC-7D29-4658-B4F4-2978C314C48D}.Release|Win32.ActiveCfg = Release|Win32
{985482DC-7D29-4658-B4F4-2978C314C48D}.Release|Win32.Build.0 = Release|Win32
{985482DC-7D29-4658-B4F4-2978C314C48D}.Release|x64.ActiveCfg = Release|x64
{985482DC-7D29-4658-B4F4-2978C314C48D}.Release|x64.Build.0 = Release|x64
{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Debug|Win32.ActiveCfg = Debug|Win32
- {8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Debug|Win32.Build.0 = Debug|Win32
{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Debug|x64.ActiveCfg = Debug|x64
- {8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Debug|x64.Build.0 = Debug|x64
{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Release|Win32.ActiveCfg = Release|Win32
{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Release|Win32.Build.0 = Release|Win32
{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Release|x64.ActiveCfg = Release|x64
{8BDD382D-64DF-4BBC-BA2F-C9AA904E065C}.Release|x64.Build.0 = Release|x64
{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Debug|Win32.ActiveCfg = Debug|Win32
- {09584DF7-7448-4BA9-B99A-FD65DB25A179}.Debug|Win32.Build.0 = Debug|Win32
{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Debug|x64.ActiveCfg = Debug|x64
- {09584DF7-7448-4BA9-B99A-FD65DB25A179}.Debug|x64.Build.0 = Debug|x64
{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Release|Win32.ActiveCfg = Release|Win32
{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Release|Win32.Build.0 = Release|Win32
{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Release|x64.ActiveCfg = Release|x64
{09584DF7-7448-4BA9-B99A-FD65DB25A179}.Release|x64.Build.0 = Release|x64
{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Debug|Win32.ActiveCfg = Debug|Win32
- {CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Debug|Win32.Build.0 = Debug|Win32
{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Debug|x64.ActiveCfg = Debug|x64
- {CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Debug|x64.Build.0 = Debug|x64
{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Release|Win32.ActiveCfg = Release|Win32
{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Release|Win32.Build.0 = Release|Win32
{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Release|x64.ActiveCfg = Release|x64
{CC20AECB-AF15-451C-8D78-F5DDACCECE99}.Release|x64.Build.0 = Release|x64
{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Debug|Win32.ActiveCfg = Debug|Win32
- {EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Debug|Win32.Build.0 = Debug|Win32
{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Debug|x64.ActiveCfg = Debug|x64
- {EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Debug|x64.Build.0 = Debug|x64
{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Release|Win32.ActiveCfg = Release|Win32
{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Release|Win32.Build.0 = Release|Win32
{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Release|x64.ActiveCfg = Release|x64
{EB0A520A-3AF0-4B18-A7E9-46D0E699F1DA}.Release|x64.Build.0 = Release|x64
{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Debug|Win32.ActiveCfg = Debug|Win32
- {FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Debug|Win32.Build.0 = Debug|Win32
{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Debug|x64.ActiveCfg = Debug|x64
- {FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Debug|x64.Build.0 = Debug|x64
{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Release|Win32.ActiveCfg = Release|Win32
{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Release|Win32.Build.0 = Release|Win32
{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Release|x64.ActiveCfg = Release|x64
{FB70F300-00C2-40D0-88E9-801E5E5FEF62}.Release|x64.Build.0 = Release|x64
{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Debug|Win32.ActiveCfg = Debug|Win32
- {26CDD177-12D7-4E75-92DF-CBC423F4F838}.Debug|Win32.Build.0 = Debug|Win32
{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Debug|x64.ActiveCfg = Debug|x64
- {26CDD177-12D7-4E75-92DF-CBC423F4F838}.Debug|x64.Build.0 = Debug|x64
{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Release|Win32.ActiveCfg = Release|Win32
{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Release|Win32.Build.0 = Release|Win32
{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Release|x64.ActiveCfg = Release|x64
{26CDD177-12D7-4E75-92DF-CBC423F4F838}.Release|x64.Build.0 = Release|x64
{C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Debug|Win32.ActiveCfg = Debug|Win32
- {C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Debug|Win32.Build.0 = Debug|Win32
{C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Debug|x64.ActiveCfg = Debug|x64
- {C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Debug|x64.Build.0 = Debug|x64
{C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Release|Win32.ActiveCfg = Release|Win32
{C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Release|Win32.Build.0 = Release|Win32
{C20D7F3F-FE26-40B7-BE5C-5D09C2AD35B9}.Release|x64.ActiveCfg = Release|x64
Modified: trunk/build.vc10/lasieve.exp/lasieve.exp.sln
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve.exp.sln 2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/lasieve.exp.sln 2012-12-07 21:04:37 UTC (rev 434)
@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieve", "liblasieve\liblasieve.vcxproj", "{6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI11", "liblasieveI11\liblasieveI11.vcxproj", "{BAF749BD-63E0-437A-B229-6B5A3F570E6A}"
@@ -59,30 +59,43 @@
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}.Debug|x64.ActiveCfg = Debug|x64
{6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}.Release|x64.ActiveCfg = Release|x64
+ {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}.Release|x64.Build.0 = Release|x64
{BAF749BD-63E0-437A-B229-6B5A3F570E6A}.Debug|x64.ActiveCfg = Debug|x64
{BAF749BD-63E0-437A-B229-6B5A3F570E6A}.Release|x64.ActiveCfg = Release|x64
+ {BAF749BD-63E0-437A-B229-6B5A3F570E6A}.Release|x64.Build.0 = Release|x64
{451C3388-7276-48A1-A336-B2C4DE3C588A}.Debug|x64.ActiveCfg = Debug|x64
{451C3388-7276-48A1-A336-B2C4DE3C588A}.Release|x64.ActiveCfg = Release|x64
+ {451C3388-7276-48A1-A336-B2C4DE3C588A}.Release|x64.Build.0 = Release|x64
{ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}.Debug|x64.ActiveCfg = Debug|x64
{ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}.Release|x64.ActiveCfg = Release|x64
+ {ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}.Release|x64.Build.0 = Release|x64
{9796AF90-3B2F-470F-BDFA-C8AA336594B8}.Debug|x64.ActiveCfg = Debug|x64
{9796AF90-3B2F-470F-BDFA-C8AA336594B8}.Release|x64.ActiveCfg = Release|x64
+ {9796AF90-3B2F-470F-BDFA-C8AA336594B8}.Release|x64.Build.0 = Release|x64
{36E21BAD-4C26-4C28-9829-2DA09A411FFB}.Debug|x64.ActiveCfg = Debug|x64
{36E21BAD-4C26-4C28-9829-2DA09A411FFB}.Release|x64.ActiveCfg = Release|x64
+ {36E21BAD-4C26-4C28-9829-2DA09A411FFB}.Release|x64.Build.0 = Release|x64
{0E6599B1-F8AD-4997-80C9-4E0213E7B326}.Debug|x64.ActiveCfg = Debug|x64
{0E6599B1-F8AD-4997-80C9-4E0213E7B326}.Release|x64.ActiveCfg = Release|x64
+ {0E6599B1-F8AD-4997-80C9-4E0213E7B326}.Release|x64.Build.0 = Release|x64
{C215C705-0613-4E32-ABCA-645EC7A0EF9B}.Debug|x64.ActiveCfg = Debug|x64
{C215C705-0613-4E32-ABCA-645EC7A0EF9B}.Release|x64.ActiveCfg = Release|x64
+ {C215C705-0613-4E32-ABCA-645EC7A0EF9B}.Release|x64.Build.0 = Release|x64
{BBCFB293-3606-4549-9176-0AF516F84BAC}.Debug|x64.ActiveCfg = Debug|x64
{BBCFB293-3606-4549-9176-0AF516F84BAC}.Release|x64.ActiveCfg = Release|x64
+ {BBCFB293-3606-4549-9176-0AF516F84BAC}.Release|x64.Build.0 = Release|x64
{DD4C5F19-1F05-494B-8F12-C4A70444293C}.Debug|x64.ActiveCfg = Debug|x64
{DD4C5F19-1F05-494B-8F12-C4A70444293C}.Release|x64.ActiveCfg = Release|x64
+ {DD4C5F19-1F05-494B-8F12-C4A70444293C}.Release|x64.Build.0 = Release|x64
{BA608E82-06A5-46C5-B0E2-60ED71F38DC4}.Debug|x64.ActiveCfg = Debug|x64
{BA608E82-06A5-46C5-B0E2-60ED71F38DC4}.Release|x64.ActiveCfg = Release|x64
+ {BA608E82-06A5-46C5-B0E2-60ED71F38DC4}.Release|x64.Build.0 = Release|x64
{379879A2-FB3D-4A0E-B3FD-94EFE9D035EE}.Debug|x64.ActiveCfg = Debug|x64
{379879A2-FB3D-4A0E-B3FD-94EFE9D035EE}.Release|x64.ActiveCfg = Release|x64
+ {379879A2-FB3D-4A0E-B3FD-94EFE9D035EE}.Release|x64.Build.0 = Release|x64
{3E382630-1512-4975-B165-1CC2F6E0F407}.Debug|x64.ActiveCfg = Debug|x64
{3E382630-1512-4975-B165-1CC2F6E0F407}.Release|x64.ActiveCfg = Release|x64
+ {3E382630-1512-4975-B165-1CC2F6E0F407}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj 2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj 2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
@@ -24,22 +16,11 @@
<RootNamespace>lasieve4I11e</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -49,48 +30,21 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;I_bits=12;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
@@ -107,26 +61,6 @@
<AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI12.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;I_bits=12;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Modified: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj 2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj 2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
@@ -24,22 +16,11 @@
<RootNamespace>lasieve4I11e</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -49,48 +30,21 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;I_bits=13;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
@@ -107,26 +61,6 @@
<AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI13.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;I_bits=13;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Modified: trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj 2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj 2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
@@ -24,22 +16,11 @@
<RootNamespace>lasieve4I11e</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -49,48 +30,21 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;I_bits=14;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
@@ -107,26 +61,6 @@
<AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI14.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;I_bits=14;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Modified: trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj 2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj 2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
@@ -24,22 +16,11 @@
<RootNamespace>lasieve4I11e</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -49,48 +30,21 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;I_bits=15;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
@@ -107,26 +61,6 @@
<AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI15.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;I_bits=15;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Modified: trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj 2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj 2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
@@ -24,22 +16,11 @@
<RootNamespace>lasieve4I11e</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -49,48 +30,21 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)..\..\bin\exp\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;I_bits=16;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
@@ -107,26 +61,6 @@
<AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;..\$(IntDir)\liblasieve.lib;..\$(IntDir)\liblasieveI16.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;I_bits=16;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <AdditionalDependencies>..\..\..\..\mpir\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Modified: trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj 2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj 2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
@@ -24,22 +16,11 @@
<RootNamespace>liblasieveI11</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -50,48 +31,19 @@
<ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\vsyasm.props" />
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;I_bits=13;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- <YASM>
- <Defines>I_bits=13</Defines>
- </YASM>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
@@ -110,27 +62,6 @@
<Defines>I_bits=13</Defines>
</YASM>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;I_bits=13;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- <YASM>
- <Defines>I_bits=13</Defines>
- </YASM>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Modified: trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj 2012-12-07 20:56:16 UTC (rev 433)
+++ trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj 2012-12-07 21:04:37 UTC (rev 434)
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
@@ -24,22 +16,11 @@
<RootNamespace>liblasieveI11</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- ...
[truncated message content] |
|
From: <brg...@us...> - 2012-12-08 09:36:03
|
Revision: 437
http://ggnfs.svn.sourceforge.net/ggnfs/?rev=437&view=rev
Author: brgladman
Date: 2012-12-08 09:35:54 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
correct build errors in Visual Studio 2010 experimental sieve build
Modified Paths:
--------------
trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters
trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters
trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters
trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj
trunk/build.vc10/makefb/makefb.vcxproj.filters
trunk/build.vc10/matbuild/matbuild.vcxproj.filters
trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters
trunk/build.vc10/matprune/matprune.vcxproj.filters
trunk/build.vc10/matsolve/matsolve.vcxproj.filters
trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters
trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters
trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters
trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters
trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters
trunk/build.vc10/polyselect/polyselect.vcxproj.filters
trunk/build.vc10/procrels/procrels.vcxproj.filters
trunk/build.vc10/sieve/sieve.vcxproj.filters
trunk/build.vc10/sqrt/sqrt.vcxproj.filters
Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters
===================================================================
--- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -102,7 +102,7 @@
<ClInclude Include="..\getopt.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
@@ -117,7 +117,7 @@
<ClInclude Include="..\..\src\lasieve4\lasieve.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\config.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\config.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -107,7 +107,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -107,7 +107,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\lasieve4\asm\siever-config.h">
Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -110,7 +110,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -110,7 +110,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -110,7 +110,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters
===================================================================
--- trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -110,7 +110,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters
===================================================================
--- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -64,9 +64,6 @@
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\config.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -82,9 +79,6 @@
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -112,5 +106,11 @@
<ClInclude Include="..\..\unistd.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\..\mpir\lib\x64\release\gmp.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj
===================================================================
--- trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj 2012-12-08 09:35:54 UTC (rev 437)
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
@@ -24,22 +16,11 @@
<RootNamespace>liblasieveI11</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -50,48 +31,19 @@
<ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\vsyasm.props" />
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;I_bits=12;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- <YASM>
- <Defines>I_bits=12</Defines>
- </YASM>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
@@ -110,27 +62,6 @@
<Defines>I_bits=12</Defines>
</YASM>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;I_bits=12;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\src\experimental\lasieve4_64\asm;..\..\..\..\mpir\lib\$(IntDir);..\..\</AdditionalIncludeDirectories>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- <YASM>
- <Defines>I_bits=12</Defines>
- </YASM>
- </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Modified: trunk/build.vc10/makefb/makefb.vcxproj.filters
===================================================================
--- trunk/build.vc10/makefb/makefb.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/makefb/makefb.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -19,7 +19,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\ggnfs.h">
Modified: trunk/build.vc10/matbuild/matbuild.vcxproj.filters
===================================================================
--- trunk/build.vc10/matbuild/matbuild.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/matbuild/matbuild.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -52,7 +52,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters
===================================================================
--- trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -58,7 +58,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/matprune/matprune.vcxproj.filters
===================================================================
--- trunk/build.vc10/matprune/matprune.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/matprune/matprune.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -34,7 +34,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
Modified: trunk/build.vc10/matsolve/matsolve.vcxproj.filters
===================================================================
--- trunk/build.vc10/matsolve/matsolve.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/matsolve/matsolve.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -34,7 +34,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -43,7 +43,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -61,7 +61,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -43,7 +43,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -46,7 +46,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters
===================================================================
--- trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -67,7 +67,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/polyselect/polyselect.vcxproj.filters
===================================================================
--- trunk/build.vc10/polyselect/polyselect.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/polyselect/polyselect.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -19,7 +19,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\prand.h">
Modified: trunk/build.vc10/procrels/procrels.vcxproj.filters
===================================================================
--- trunk/build.vc10/procrels/procrels.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/procrels/procrels.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -34,7 +34,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\if.h">
Modified: trunk/build.vc10/sieve/sieve.vcxproj.filters
===================================================================
--- trunk/build.vc10/sieve/sieve.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/sieve/sieve.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -28,7 +28,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\version.h">
Modified: trunk/build.vc10/sqrt/sqrt.vcxproj.filters
===================================================================
--- trunk/build.vc10/sqrt/sqrt.vcxproj.filters 2012-12-07 21:24:35 UTC (rev 436)
+++ trunk/build.vc10/sqrt/sqrt.vcxproj.filters 2012-12-08 09:35:54 UTC (rev 437)
@@ -22,7 +22,7 @@
<ClInclude Include="..\..\include\ggnfs.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\mpir\build.vc10\lib\x64\release\gmp.h">
+ <ClInclude Include="..\..\..\mpir\lib\x64\release\gmp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\version.h">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X