From: <Dig...@us...> - 2009-01-17 23:54:07
|
Revision: 336 http://ggnfs.svn.sourceforge.net/ggnfs/?rev=336&view=rev Author: DigitalParasite Date: 2009-01-17 23:53:54 +0000 (Sat, 17 Jan 2009) Log Message: ----------- Fix suggested by Sergey Miklin for 64bit pol51 Windows code compiled by Visual Studio. This prevents the "aux_factor_phi" error. Modified Paths: -------------- trunk/src/pol5/pol51m0b.c trunk/src/pol5/pol51m0n.c trunk/src/pol5/pol51opt.c Added Paths: ----------- trunk/build.vc/vc7/rint.h trunk/build.vc/vc8/rint.h trunk/build.vc/vc9/rint.h Added: trunk/build.vc/vc7/rint.h =================================================================== --- trunk/build.vc/vc7/rint.h (rev 0) +++ trunk/build.vc/vc7/rint.h 2009-01-17 23:53:54 UTC (rev 336) @@ -0,0 +1,7 @@ +#ifndef __RINT_H__ +#define __RINT_H__ + +double rint(double); +float rintf(float); + +#endif Added: trunk/build.vc/vc8/rint.h =================================================================== --- trunk/build.vc/vc8/rint.h (rev 0) +++ trunk/build.vc/vc8/rint.h 2009-01-17 23:53:54 UTC (rev 336) @@ -0,0 +1,7 @@ +#ifndef __RINT_H__ +#define __RINT_H__ + +double rint(double); +float rintf(float); + +#endif Added: trunk/build.vc/vc9/rint.h =================================================================== --- trunk/build.vc/vc9/rint.h (rev 0) +++ trunk/build.vc/vc9/rint.h 2009-01-17 23:53:54 UTC (rev 336) @@ -0,0 +1,7 @@ +#ifndef __RINT_H__ +#define __RINT_H__ + +double rint(double); +float rintf(float); + +#endif Modified: trunk/src/pol5/pol51m0b.c =================================================================== --- trunk/src/pol5/pol51m0b.c 2009-01-13 02:14:56 UTC (rev 335) +++ trunk/src/pol5/pol51m0b.c 2009-01-17 23:53:54 UTC (rev 336) @@ -51,6 +51,7 @@ #if defined (_MSC_VER) || defined (__MINGW32__) || defined (MINGW32) #include "getopt.h" +#include "rint.h" #endif #define MULTIPLIER 60 /* 2*2*3*5 */ Modified: trunk/src/pol5/pol51m0n.c =================================================================== --- trunk/src/pol5/pol51m0n.c 2009-01-13 02:14:56 UTC (rev 335) +++ trunk/src/pol5/pol51m0n.c 2009-01-17 23:53:54 UTC (rev 336) @@ -49,6 +49,7 @@ #include <string.h> #if defined (_MSC_VER) || defined (__MINGW32__) || defined (MINGW32) #include "getopt.h" +#include "rint.h" #endif #define START_MESSAGE \ Modified: trunk/src/pol5/pol51opt.c =================================================================== --- trunk/src/pol5/pol51opt.c 2009-01-13 02:14:56 UTC (rev 335) +++ trunk/src/pol5/pol51opt.c 2009-01-17 23:53:54 UTC (rev 336) @@ -34,6 +34,7 @@ #include <string.h> #if defined (_MSC_VER) || defined (__MINGW32__) || defined (MINGW32) #include "getopt.h" +#include "rint.h" #endif #define START_MESSAGE \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <brg...@us...> - 2010-05-24 09:23:32
|
Revision: 387 http://ggnfs.svn.sourceforge.net/ggnfs/?rev=387&view=rev Author: brgladman Date: 2010-05-24 09:23:25 +0000 (Mon, 24 May 2010) Log Message: ----------- Add GGNFS build files for Visual Studio 2010 Added Paths: ----------- trunk/build.vc10/ trunk/build.vc10/file_copy.bat trunk/build.vc10/fnmatch.c trunk/build.vc10/fnmatch.h trunk/build.vc10/getline.c trunk/build.vc10/getline.h trunk/build.vc10/getopt.c trunk/build.vc10/getopt.h trunk/build.vc10/ggnfs.sln trunk/build.vc10/ggnfslib/ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters trunk/build.vc10/gmp.h trunk/build.vc10/gnfs-lasieve4I11e/ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.user trunk/build.vc10/gnfs-lasieve4I12e/ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters trunk/build.vc10/gnfs-lasieve4I13e/ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters trunk/build.vc10/gnfs-lasieve4I14e/ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters trunk/build.vc10/gnfs-lasieve4I15e/ trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj trunk/build.vc10/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters trunk/build.vc10/gnfs-lasieve4I16e/ trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj trunk/build.vc10/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters trunk/build.vc10/makefb/ trunk/build.vc10/makefb/makefb.vcxproj trunk/build.vc10/makefb/makefb.vcxproj.filters trunk/build.vc10/matbuild/ trunk/build.vc10/matbuild/matbuild.vcxproj trunk/build.vc10/matbuild/matbuild.vcxproj.filters trunk/build.vc10/matbuild-tpie/ trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj trunk/build.vc10/matbuild-tpie/matbuild-tpie.vcxproj.filters trunk/build.vc10/matprune/ trunk/build.vc10/matprune/matprune.vcxproj trunk/build.vc10/matprune/matprune.vcxproj.filters trunk/build.vc10/matsolve/ trunk/build.vc10/matsolve/matsolve.vcxproj trunk/build.vc10/matsolve/matsolve.vcxproj.filters trunk/build.vc10/modinv1002.c trunk/build.vc10/mp_lib.props trunk/build.vc10/mp_lib.vsprops trunk/build.vc10/mulmod32.asm trunk/build.vc10/pol51m0b/ trunk/build.vc10/pol51m0b/pol51m0b.vcxproj trunk/build.vc10/pol51m0b/pol51m0b.vcxproj.filters trunk/build.vc10/pol51m0bx/ trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj trunk/build.vc10/pol51m0bx/pol51m0bx.vcxproj.filters trunk/build.vc10/pol51m0n/ trunk/build.vc10/pol51m0n/pol51m0n.vcxproj trunk/build.vc10/pol51m0n/pol51m0n.vcxproj.filters trunk/build.vc10/pol51opt/ trunk/build.vc10/pol51opt/pol51opt.vcxproj trunk/build.vc10/pol51opt/pol51opt.vcxproj.filters trunk/build.vc10/pol51optx/ trunk/build.vc10/pol51optx/pol51optx.vcxproj trunk/build.vc10/pol51optx/pol51optx.vcxproj.filters trunk/build.vc10/polyselect/ trunk/build.vc10/polyselect/polyselect.vcxproj trunk/build.vc10/polyselect/polyselect.vcxproj.filters trunk/build.vc10/procrels/ trunk/build.vc10/procrels/procrels.vcxproj trunk/build.vc10/procrels/procrels.vcxproj.filters trunk/build.vc10/rint.c trunk/build.vc10/rint.h trunk/build.vc10/run.bat trunk/build.vc10/sieve/ trunk/build.vc10/sieve/sieve.vcxproj trunk/build.vc10/sieve/sieve.vcxproj.filters trunk/build.vc10/sqrt/ trunk/build.vc10/sqrt/sqrt.vcxproj trunk/build.vc10/sqrt/sqrt.vcxproj.filters trunk/build.vc10/unistd.h trunk/build.vc10/vsyasm.props trunk/build.vc10/vsyasm.targets trunk/build.vc10/vsyasm.xml Added: trunk/build.vc10/file_copy.bat =================================================================== --- trunk/build.vc10/file_copy.bat (rev 0) +++ trunk/build.vc10/file_copy.bat 2010-05-24 09:23:25 UTC (rev 387) @@ -0,0 +1,8 @@ +if not exist %1 goto exit +if not exist %2 goto copy +fc %1 %2 > nul +if not %errorlevel 1 goto exit +:copy +echo copying %1 to %2 +copy %1 %2 +:exit Added: trunk/build.vc10/fnmatch.c =================================================================== --- trunk/build.vc10/fnmatch.c (rev 0) +++ trunk/build.vc10/fnmatch.c 2010-05-24 09:23:25 UTC (rev 387) @@ -0,0 +1,209 @@ +/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. + +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug...@pr.... + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +This program 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 General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifdef HAVE_CONFIG_H +#if defined (CONFIG_BROKETS) +/* We use <config.h> instead of "config.h" so that a compilation + using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h + (which it would do because it found this file in $srcdir). */ +#include <config.h> +#else +#include "config.h" +#endif +#endif + +#include <errno.h> +#include <fnmatch.h> +#include <ctype.h> + + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#if defined (_LIBC) || !defined (__GNU_LIBRARY__) + + +#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS) +extern int errno; +#endif + +/* Match STRING against the filename pattern PATTERN, returning zero if + it matches, nonzero if not. */ +int +fnmatch (pattern, string, flags) + const char *pattern; + const char *string; + int flags; +{ + register const char *p = pattern, *n = string; + register char c; + +/* Note that this evalutes C many times. */ +#define FOLD(c) ((flags & FNM_CASEFOLD) && isupper (c) ? tolower (c) : (c)) + + while ((c = *p++) != '\0') + { + c = FOLD (c); + + switch (c) + { + case '?': + if (*n == '\0') + return FNM_NOMATCH; + else if ((flags & FNM_FILE_NAME) && *n == '/') + return FNM_NOMATCH; + else if ((flags & FNM_PERIOD) && *n == '.' && + (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/'))) + return FNM_NOMATCH; + break; + + case '\\': + if (!(flags & FNM_NOESCAPE)) + { + c = *p++; + c = FOLD (c); + } + if (FOLD (*n) != c) + return FNM_NOMATCH; + break; + + case '*': + if ((flags & FNM_PERIOD) && *n == '.' && + (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/'))) + return FNM_NOMATCH; + + for (c = *p++; c == '?' || c == '*'; c = *p++, ++n) + if (((flags & FNM_FILE_NAME) && *n == '/') || + (c == '?' && *n == '\0')) + return FNM_NOMATCH; + + if (c == '\0') + return 0; + + { + char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c; + c1 = FOLD (c1); + for (--p; *n != '\0'; ++n) + if ((c == '[' || FOLD (*n) == c1) && + fnmatch (p, n, flags & ~FNM_PERIOD) == 0) + return 0; + return FNM_NOMATCH; + } + + case '[': + { + /* Nonzero if the sense of the character class is inverted. */ + register int not; + + if (*n == '\0') + return FNM_NOMATCH; + + if ((flags & FNM_PERIOD) && *n == '.' && + (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/'))) + return FNM_NOMATCH; + + not = (*p == '!' || *p == '^'); + if (not) + ++p; + + c = *p++; + for (;;) + { + register char cstart = c, cend = c; + + if (!(flags & FNM_NOESCAPE) && c == '\\') + cstart = cend = *p++; + + cstart = cend = FOLD (cstart); + + if (c == '\0') + /* [ (unterminated) loses. */ + return FNM_NOMATCH; + + c = *p++; + c = FOLD (c); + + if ((flags & FNM_FILE_NAME) && c == '/') + /* [/] can never match. */ + return FNM_NOMATCH; + + if (c == '-' && *p != ']') + { + cend = *p++; + if (!(flags & FNM_NOESCAPE) && cend == '\\') + cend = *p++; + if (cend == '\0') + return FNM_NOMATCH; + cend = FOLD (cend); + + c = *p++; + } + + if (FOLD (*n) >= cstart && FOLD (*n) <= cend) + goto matched; + + if (c == ']') + break; + } + if (!not) + return FNM_NOMATCH; + break; + + matched:; + /* Skip the rest of the [...] that already matched. */ + while (c != ']') + { + if (c == '\0') + /* [... (unterminated) loses. */ + return FNM_NOMATCH; + + c = *p++; + if (!(flags & FNM_NOESCAPE) && c == '\\') + /* XXX 1003.2d11 is unclear if this is right. */ + ++p; + } + if (not) + return FNM_NOMATCH; + } + break; + + default: + if (c != FOLD (*n)) + return FNM_NOMATCH; + } + + ++n; + } + + if (*n == '\0') + return 0; + + if ((flags & FNM_LEADING_DIR) && *n == '/') + /* The FNM_LEADING_DIR flag says that "foo*" matches "foobar/frobozz". */ + return 0; + + return FNM_NOMATCH; +} + +#endif /* _LIBC or not __GNU_LIBRARY__. */ Added: trunk/build.vc10/fnmatch.h =================================================================== --- trunk/build.vc10/fnmatch.h (rev 0) +++ trunk/build.vc10/fnmatch.h 2010-05-24 09:23:25 UTC (rev 387) @@ -0,0 +1,69 @@ +/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. + +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug...@pr.... + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +This program 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 General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef _FNMATCH_H + +#define _FNMATCH_H 1 + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined (__cplusplus) || (defined (__STDC__) && __STDC__) +#undef __P +#define __P(args) args +#else /* Not C++ or ANSI C. */ +#undef __P +#define __P(args) () +/* We can get away without defining `const' here only because in this file + it is used only inside the prototype for `fnmatch', which is elided in + non-ANSI C where `const' is problematical. */ +#endif /* C++ or ANSI C. */ + + +/* We #undef these before defining them because some losing systems + (HP-UX A.08.07 for example) define these in <unistd.h>. */ +#undef FNM_PATHNAME +#undef FNM_NOESCAPE +#undef FNM_PERIOD + +/* Bits set in the FLAGS argument to `fnmatch'. */ +#define FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */ +#define FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special chars. */ +#define FNM_PERIOD (1 << 2) /* Leading `.' is matched only explicitly. */ + +#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_GNU_SOURCE) +#define FNM_FILE_NAME FNM_PATHNAME /* Preferred GNU name. */ +#define FNM_LEADING_DIR (1 << 3) /* Ignore `/...' after a match. */ +#define FNM_CASEFOLD (1 << 4) /* Compare without regard to case. */ +#endif + +/* Value returned by `fnmatch' if STRING does not match PATTERN. */ +#define FNM_NOMATCH 1 + +/* Match STRING against the filename pattern PATTERN, + returning zero if it matches, FNM_NOMATCH if not. */ +extern int fnmatch __P ((const char *__pattern, const char *__string, + int __flags)); + +#ifdef __cplusplus +} +#endif + +#endif /* fnmatch.h */ Added: trunk/build.vc10/getline.c =================================================================== --- trunk/build.vc10/getline.c (rev 0) +++ trunk/build.vc10/getline.c 2010-05-24 09:23:25 UTC (rev 387) @@ -0,0 +1,159 @@ +/* +getline.c -- Replacement for GNU C library function getline + +Copyright (C) 1993 Free Software Foundation, Inc. + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +This program 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 +General Public License for more details. */ + +/* Written by Jan Brittenson, bs...@gn.... */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <sys/types.h> +#include <stdio.h> +#include <assert.h> +#include <errno.h> +#include "getline.h" + +#if STDC_HEADERS +#include <stdlib.h> +#else +char *malloc (), *realloc (); +#endif + +/* Always add at least this many bytes when extending the buffer. */ +#define MIN_CHUNK 64 + +/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR + + OFFSET (and null-terminate it). If LIMIT is non-negative, then + read no more than LIMIT chars. + + *LINEPTR is a pointer returned from malloc (or NULL), pointing to + *N characters of space. It is realloc'd as necessary. + + Return the number of characters read (not including the null + terminator), or -1 on error or EOF. On a -1 return, the caller + should check feof(), if not then errno has been set to indicate the + error. */ + +int getstr (char **lineptr, size_t *n, FILE *stream, int terminator, int offset, int limit) +{ + int nchars_avail; /* Allocated but unused chars in *LINEPTR. */ + char *read_pos; /* Where we're reading into *LINEPTR. */ + int ret; + + if (!lineptr || !n || !stream) + { + errno = EINVAL; + return -1; + } + + if (!*lineptr) + { + *n = MIN_CHUNK; + *lineptr = malloc (*n); + if (!*lineptr) + { + errno = ENOMEM; + return -1; + } + *lineptr[0] = '\0'; + } + + nchars_avail = *n - offset; + read_pos = *lineptr + offset; + + for (;;) + { + int save_errno; + register int c; + + if (limit == 0) + break; + else + { + c = getc (stream); + + /* If limit is negative, then we shouldn't pay attention to + it, so decrement only if positive. */ + if (limit > 0) + limit--; + } + + save_errno = errno; + + /* We always want at least one char left in the buffer, since we + always (unless we get an error while reading the first char) + NUL-terminate the line buffer. */ + + assert((*lineptr + *n) == (read_pos + nchars_avail)); + if (nchars_avail < 2) + { + if (*n > MIN_CHUNK) + *n *= 2; + else + *n += MIN_CHUNK; + + nchars_avail = *n + *lineptr - read_pos; + *lineptr = realloc (*lineptr, *n); + if (!*lineptr) + { + errno = ENOMEM; + return -1; + } + read_pos = *n - nchars_avail + *lineptr; + assert((*lineptr + *n) == (read_pos + nchars_avail)); + } + + if (ferror (stream)) + { + /* Might like to return partial line, but there is no + place for us to store errno. And we don't want to just + lose errno. */ + errno = save_errno; + return -1; + } + + if (c == EOF) + { + /* Return partial line, if any. */ + if (read_pos == *lineptr) + return -1; + else + break; + } + + *read_pos++ = c; + nchars_avail--; + + if (c == terminator) + /* Return the line. */ + break; + } + + /* Done - NUL terminate and return the number of chars read. */ + *read_pos = '\0'; + + ret = read_pos - (*lineptr + offset); + return ret; +} + +int getline (char **lineptr, size_t *n, FILE *stream) +{ + return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT); +} + +int getline_safe (char **lineptr, size_t *n, FILE *stream, int limit) +{ + return getstr (lineptr, n, stream, '\n', 0, limit); +} Added: trunk/build.vc10/getline.h =================================================================== --- trunk/build.vc10/getline.h (rev 0) +++ trunk/build.vc10/getline.h 2010-05-24 09:23:25 UTC (rev 387) @@ -0,0 +1,25 @@ + +#ifndef _getline_h_ +#define _getline_h_ 1 + +#include <stdio.h> + +#if defined (__GNUC__) || (defined (__STDC__) && __STDC__) +#define __PROTO(args) args +#else +#define __PROTO(args) () +#endif /* GCC. */ + +#define GETLINE_NO_LIMIT -1 + +int + getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); +int + getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, + int limit)); +int + getstr __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, + int _terminator, int _offset, int limit)); + +#endif /* _getline_h_ */ + Added: trunk/build.vc10/getopt.c =================================================================== --- trunk/build.vc10/getopt.c (rev 0) +++ trunk/build.vc10/getopt.c 2010-05-24 09:23:25 UTC (rev 387) @@ -0,0 +1,1281 @@ +/* Getopt for GNU. + NOTE: getopt is now part of the C library, so if you don't know what + "Keep this file name-space clean" means, talk to dr...@gn... + before changing it! + Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C 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 2.1 of the License, or (at your option) any later version. + + The GNU C 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 C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. + Ditto for AIX 3.2 and <stdlib.h>. */ + +#define HAVE_STRING_H 1 + +#ifndef _NO_PROTO +# define _NO_PROTO +#endif + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#if !defined __STDC__ || !__STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +# ifndef const +# define const +# endif +#endif + +#include <stdio.h> + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +# include <gnu-versions.h> +# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +# define ELIDE_CODE +# endif +#endif + +#ifndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +/* Don't include stdlib.h for non-GNU C libraries because some of them + contain conflicting prototypes for getopt. */ +# include <stdlib.h> +# include <unistd.h> +#endif /* GNU C library. */ + +#ifdef VMS +# include <unixlib.h> +# if HAVE_STRING_H - 0 +# include <string.h> +# endif +#endif + +#ifndef _ +/* This is for other GNU distributions with internationalized messages. */ +# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC +# include <libintl.h> +# ifndef _ +# define _(msgid) gettext (msgid) +# endif +# else +# define _(msgid) (msgid) +# endif +# if defined _LIBC && defined USE_IN_LIBIO +# include <wchar.h> +# endif +#endif + +#ifndef attribute_hidden +# define attribute_hidden +#endif + +/* This version of `getopt' appears to the caller like standard Unix `getopt' + but it behaves differently for the user, since it allows the user + to intersperse the options with the other arguments. + + As `getopt' works, it permutes the elements of ARGV so that, + when it is done, all the options precede everything else. Thus + all application programs are extended to handle flexible argument order. + + Setting the environment variable POSIXLY_CORRECT disables permutation. + Then the behavior is completely standard. + + GNU application programs can use a third alternative mode in which + they can distinguish the relative order of options and other arguments. */ + +#include "getopt.h" + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +/* 1003.2 says this must be 1 before any call. */ +int optind = 1; + +/* Formerly, initialization of getopt depended on optind==0, which + causes problems with re-calling getopt as programs generally don't + know that. */ + +int __getopt_initialized attribute_hidden; + +/* The next char to be scanned in the option-element + in which the last option character we returned was found. + This allows us to pick up the scan where we left off. + + If this is zero, or a null string, it means resume the scan + by advancing to the next ARGV-element. */ + +static char *nextchar; + +/* Callers store zero here to inhibit the error message + for unrecognized options. */ + +int opterr = 1; + +/* Set to an option character which was unrecognized. + This must be initialized on some systems to avoid linking in the + system's own getopt implementation. */ + +int optopt = '?'; + +/* Describe how to deal with options that follow non-option ARGV-elements. + + If the caller did not specify anything, + the default is REQUIRE_ORDER if the environment variable + POSIXLY_CORRECT is defined, PERMUTE otherwise. + + REQUIRE_ORDER means don't recognize them as options; + stop option processing when the first non-option is seen. + This is what Unix does. + This mode of operation is selected by either setting the environment + variable POSIXLY_CORRECT, or using `+' as the first character + of the list of option characters. + + PERMUTE is the default. We permute the contents of ARGV as we scan, + so that eventually all the non-options are at the end. This allows options + to be given in any order, even with programs that were not written to + expect this. + + RETURN_IN_ORDER is an option available to programs that were written + to expect options and other ARGV-elements in any order and that care about + the ordering of the two. We describe each non-option ARGV-element + as if it were the argument of an option with character code 1. + Using `-' as the first character of the list of option characters + selects this mode of operation. + + The special argument `--' forces an end of option-scanning regardless + of the value of `ordering'. In the case of RETURN_IN_ORDER, only + `--' can cause `getopt' to return -1 with `optind' != ARGC. */ + +static enum +{ + REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER +} ordering; + +/* Value of POSIXLY_CORRECT environment variable. */ +static char *posixly_correct; + +#ifdef __GNU_LIBRARY__ +/* We want to avoid inclusion of string.h with non-GNU libraries + because there are many ways it can cause trouble. + On some systems, it contains special magic macros that don't work + in GCC. */ +# include <string.h> +# define my_index strchr +#else + +# if HAVE_STRING_H +# include <string.h> +# else +# include <strings.h> +# endif + +/* Avoid depending on library functions or files + whose names are inconsistent. */ + +#ifndef getenv +extern char *getenv (); +#endif + +static char * +my_index (str, chr) + const char *str; + int chr; +{ + while (*str) + { + if (*str == chr) + return (char *) str; + str++; + } + return 0; +} + +/* If using GCC, we can safely declare strlen this way. + If not using GCC, it is ok not to declare it. */ +#ifdef __GNUC__ +/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. + That was relevant to code that was here before. */ +# if (!defined __STDC__ || !__STDC__) && !defined strlen +/* gcc with -traditional declares the built-in strlen to return int, + and has done so at least since version 2.4.5. -- rms. */ +extern int strlen (const char *); +# endif /* not __STDC__ */ +#endif /* __GNUC__ */ + +#endif /* not __GNU_LIBRARY__ */ + +/* Handle permutation of arguments. */ + +/* Describe the part of ARGV that contains non-options that have + been skipped. `first_nonopt' is the index in ARGV of the first of them; + `last_nonopt' is the index after the last of them. */ + +static int first_nonopt; +static int last_nonopt; + +#ifdef _LIBC +/* Stored original parameters. + XXX This is no good solution. We should rather copy the args so + that we can compare them later. But we must not use malloc(3). */ +extern int __libc_argc; +extern char **__libc_argv; + +/* Bash 2.0 gives us an environment variable containing flags + indicating ARGV elements that should not be considered arguments. */ + +# ifdef USE_NONOPTION_FLAGS +/* Defined in getopt_init.c */ +extern char *__getopt_nonoption_flags; + +static int nonoption_flags_max_len; +static int nonoption_flags_len; +# endif + +# ifdef USE_NONOPTION_FLAGS +# define SWAP_FLAGS(ch1, ch2) \ + if (nonoption_flags_len > 0) \ + { \ + char __tmp = __getopt_nonoption_flags[ch1]; \ + __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ + __getopt_nonoption_flags[ch2] = __tmp; \ + } +# else +# define SWAP_FLAGS(ch1, ch2) +# endif +#else /* !_LIBC */ +# define SWAP_FLAGS(ch1, ch2) +#endif /* _LIBC */ + +/* Exchange two adjacent subsequences of ARGV. + One subsequence is elements [first_nonopt,last_nonopt) + which contains all the non-options that have been skipped so far. + The other is elements [last_nonopt,optind), which contains all + the options processed since those non-options were skipped. + + `first_nonopt' and `last_nonopt' are relocated so that they describe + the new indices of the non-options in ARGV after they are moved. */ + +#if defined __STDC__ && __STDC__ +static void exchange (char **); +#endif + +static void +exchange (argv) + char **argv; +{ + int bottom = first_nonopt; + int middle = last_nonopt; + int top = optind; + char *tem; + + /* Exchange the shorter segment with the far end of the longer segment. + That puts the shorter segment into the right place. + It leaves the longer segment in the right place overall, + but it consists of two parts that need to be swapped next. */ + +#if defined _LIBC && defined USE_NONOPTION_FLAGS + /* First make sure the handling of the `__getopt_nonoption_flags' + string can work normally. Our top argument must be in the range + of the string. */ + if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) + { + /* We must extend the array. The user plays games with us and + presents new arguments. */ + char *new_str = malloc (top + 1); + if (new_str == NULL) + nonoption_flags_len = nonoption_flags_max_len = 0; + else + { + memset (__mempcpy (new_str, __getopt_nonoption_flags, + nonoption_flags_max_len), + '\0', top + 1 - nonoption_flags_max_len); + nonoption_flags_max_len = top + 1; + __getopt_nonoption_flags = new_str; + } + } +#endif + + while (top > middle && middle > bottom) + { + if (top - middle > middle - bottom) + { + /* Bottom segment is the short one. */ + int len = middle - bottom; + register int i; + + /* Swap it with the top part of the top segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[top - (middle - bottom) + i]; + argv[top - (middle - bottom) + i] = tem; + SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); + } + /* Exclude the moved bottom segment from further swapping. */ + top -= len; + } + else + { + /* Top segment is the short one. */ + int len = top - middle; + register int i; + + /* Swap it with the bottom part of the bottom segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[middle + i]; + argv[middle + i] = tem; + SWAP_FLAGS (bottom + i, middle + i); + } + /* Exclude the moved top segment from further swapping. */ + bottom += len; + } + } + + /* Update records for the slots the non-options now occupy. */ + + first_nonopt += (optind - last_nonopt); + last_nonopt = optind; +} + +/* Initialize the internal data when the first call is made. */ + +#if defined __STDC__ && __STDC__ +static const char *_getopt_initialize (int, char *const *, const char *); +#endif +static const char * +_getopt_initialize (argc, argv, optstring) + int argc; + char *const *argv; + const char *optstring; +{ + /* Start processing options with ARGV-element 1 (since ARGV-element 0 + is the program name); the sequence of previously skipped + non-option ARGV-elements is empty. */ + + first_nonopt = last_nonopt = optind; + + nextchar = NULL; + + posixly_correct = getenv ("POSIXLY_CORRECT"); + + /* Determine how to handle the ordering of options and nonoptions. */ + + if (optstring[0] == '-') + { + ordering = RETURN_IN_ORDER; + ++optstring; + } + else if (optstring[0] == '+') + { + ordering = REQUIRE_ORDER; + ++optstring; + } + else if (posixly_correct != NULL) + ordering = REQUIRE_ORDER; + else + ordering = PERMUTE; + +#if defined _LIBC && defined USE_NONOPTION_FLAGS + if (posixly_correct == NULL + && argc == __libc_argc && argv == __libc_argv) + { + if (nonoption_flags_max_len == 0) + { + if (__getopt_nonoption_flags == NULL + || __getopt_nonoption_flags[0] == '\0') + nonoption_flags_max_len = -1; + else + { + const char *orig_str = __getopt_nonoption_flags; + int len = nonoption_flags_max_len = strlen (orig_str); + if (nonoption_flags_max_len < argc) + nonoption_flags_max_len = argc; + __getopt_nonoption_flags = + (char *) malloc (nonoption_flags_max_len); + if (__getopt_nonoption_flags == NULL) + nonoption_flags_max_len = -1; + else + memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', nonoption_flags_max_len - len); + } + } + nonoption_flags_len = nonoption_flags_max_len; + } + else + nonoption_flags_len = 0; +#endif + + return optstring; +} + +/* Scan elements of ARGV (whose length is ARGC) for option characters + given in OPTSTRING. + + If an element of ARGV starts with '-', and is not exactly "-" or "--", + then it is an option element. The characters of this element + (aside from the initial '-') are option characters. If `getopt' + is called repeatedly, it returns successively each of the option characters + from each of the option elements. + + If `getopt' finds another option character, it returns that character, + updating `optind' and `nextchar' so that the next call to `getopt' can + resume the scan with the following option character or ARGV-element. + + If there are no more option characters, `getopt' returns -1. + Then `optind' is the index in ARGV of the first ARGV-element + that is not an option. (The ARGV-elements have been permuted + so that those that are not options now come last.) + + OPTSTRING is a string containing the legitimate option characters. + If an option character is seen that is not listed in OPTSTRING, + return '?' after printing an error message. If you set `opterr' to + zero, the error message is suppressed but we still return '?'. + + If a char in OPTSTRING is followed by a colon, that means it wants an arg, + so the following text in the same ARGV-element, or the text of the following + ARGV-element, is returned in `optarg'. Two colons mean an option that + wants an optional arg; if there is text in the current ARGV-element, + it is returned in `optarg', otherwise `optarg' is set to zero. + + If OPTSTRING starts with `-' or `+', it requests different methods of + handling the non-option ARGV-elements. + See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. + + Long-named options begin with `--' instead of `-'. + Their names may be abbreviated as long as the abbreviation is unique + or is an exact match for some defined option. If they have an + argument, it follows the option name in the same ARGV-element, separated + from the option name by a `=', or else the in next ARGV-element. + When `getopt' finds a long-named option, it returns 0 if that option's + `flag' field is nonzero, the value of the option's `val' field + if the `flag' field is zero. + + The elements of ARGV aren't really const, because we permute them. + But we pretend they're const in the prototype to be compatible + with other systems. + + LONGOPTS is a vector of `struct option' terminated by an + element containing a name which is zero. + + LONGIND returns the index in LONGOPT of the long-named option found. + It is only valid when a long-named option has been found by the most + recent call. + + If LONG_ONLY is nonzero, '-' as well as '--' can introduce + long-named options. */ + +int +_getopt_internal (argc, argv, optstring, longopts, longind, long_only) + int argc; + char *const *argv; + const char *optstring; + const struct option *longopts; + int *longind; + int long_only; +{ + int print_errors = opterr; + if (optstring[0] == ':') + print_errors = 0; + + if (argc < 1) + return -1; + + optarg = NULL; + + if (optind == 0 || !__getopt_initialized) + { + if (optind == 0) + optind = 1; /* Don't scan ARGV[0], the program name. */ + optstring = _getopt_initialize (argc, argv, optstring); + __getopt_initialized = 1; + } + + /* Test whether ARGV[optind] points to a non-option argument. + Either it does not have option syntax, or there is an environment flag + from the shell indicating it is not an option. The later information + is only used when the used in the GNU libc. */ +#if defined _LIBC && defined USE_NONOPTION_FLAGS +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ + || (optind < nonoption_flags_len \ + && __getopt_nonoption_flags[optind] == '1')) +#else +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0') +#endif + + if (nextchar == NULL || *nextchar == '\0') + { + /* Advance to the next ARGV-element. */ + + /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been + moved back by the user (who may also have changed the arguments). */ + if (last_nonopt > optind) + last_nonopt = optind; + if (first_nonopt > optind) + first_nonopt = optind; + + if (ordering == PERMUTE) + { + /* If we have just processed some options following some non-options, + exchange them so that the options come first. */ + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (last_nonopt != optind) + first_nonopt = optind; + + /* Skip any additional non-options + and extend the range of non-options previously skipped. */ + + while (optind < argc && NONOPTION_P) + optind++; + last_nonopt = optind; + } + + /* The special ARGV-element `--' means premature end of options. + Skip it like a null option, + then exchange with previous non-options as if it were an option, + then skip everything else like a non-option. */ + + if (optind != argc && !strcmp (argv[optind], "--")) + { + optind++; + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (first_nonopt == last_nonopt) + first_nonopt = optind; + last_nonopt = argc; + + optind = argc; + } + + /* If we have done all the ARGV-elements, stop the scan + and back over any non-options that we skipped and permuted. */ + + if (optind == argc) + { + /* Set the next-arg-index to point at the non-options + that we previously skipped, so the caller will digest them. */ + if (first_nonopt != last_nonopt) + optind = first_nonopt; + return -1; + } + + /* If we have come to a non-option and did not permute it, + either stop the scan or describe it to the caller and pass it by. */ + + if (NONOPTION_P) + { + if (ordering == REQUIRE_ORDER) + return -1; + optarg = argv[optind++]; + return 1; + } + + /* We have found another option-ARGV-element. + Skip the initial punctuation. */ + + nextchar = (argv[optind] + 1 + + (longopts != NULL && argv[optind][1] == '-')); + } + + /* Decode the current option-ARGV-element. */ + + /* Check whether the ARGV-element is a long option. + + If long_only and the ARGV-element has the form "-f", where f is + a valid short option, don't consider it an abbreviated form of + a long option that starts with f. Otherwise there would be no + way to give the -f short option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an abbreviation of + the long option, just like "--fu", and not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + + if (longopts != NULL + && (argv[optind][1] == '-' + || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1]))))) + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = -1; + int option_index; + + for (nameend = nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) + == (unsigned int) strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else if (long_only + || pfound->has_arg != p->has_arg + || pfound->flag != p->flag + || pfound->val != p->val) + /* Second or later nonexact match found. */ + ambig = 1; + } + + if (ambig && !exact) + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"), + argv[0], argv[optind]) >= 0) + { + + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, _("%s: option `%s' is ambiguous\n"), + argv[0], argv[optind]); +#endif + } + nextchar += strlen (nextchar); + optind++; + optopt = 0; + return '?'; + } + + if (pfound != NULL) + { + option_index = indfound; + optind++; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + int n; +#endif + + if (argv[optind - 1][1] == '-') + { + /* --option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("\ +%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); +#else + fprintf (stderr, _("\ +%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); +#endif + } + else + { + /* +option or -option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("\ +%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[optind - 1][0], + pfound->name); +#else + fprintf (stderr, _("\ +%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[optind - 1][0], pfound->name); +#endif + } + +#if defined _LIBC && defined USE_IN_LIBIO + if (n >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#endif + } + + nextchar += strlen (nextchar); + + optopt = pfound->val; + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); +#endif + } + nextchar += strlen (nextchar); + optopt = pfound->val; + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short + option, then it's an error. + Otherwise interpret it as a short option. */ + if (!long_only || argv[optind][1] == '-' + || my_index (optstring, *nextchar) == NULL) + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + int n; +#endif + + if (argv[optind][1] == '-') + { + /* --option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"), + argv[0], nextchar); +#else + fprintf (stderr, _("%s: unrecognized option `--%s'\n"), + argv[0], nextchar); +#endif + } + else + { + /* +option or -option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"), + argv[0], argv[optind][0], nextchar); +#else + fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), + argv[0], argv[optind][0], nextchar); +#endif + } + +#if defined _LIBC && defined USE_IN_LIBIO + if (n >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#endif + } + nextchar = (char *) ""; + optind++; + optopt = 0; + return '?'; + } + } + + /* Look at and handle the next short option-character. */ + + { + char c = *nextchar++; + char *temp = my_index (optstring, c); + + /* Increment `optind' when we start to process its last character. */ + if (*nextchar == '\0') + ++optind; + + if (temp == NULL || c == ':') + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + int n; +#endif + + if (posixly_correct) + { + /* 1003.2 specifies the format of this message. */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: illegal option -- %c\n"), + argv[0], c); +#else + fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); +#endif + } + else + { +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: invalid option -- %c\n"), + argv[0], c); +#else + fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c); +#endif + } + +#if defined _LIBC && defined USE_IN_LIBIO + if (n >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#endif + } + optopt = c; + return '?'; + } + /* Convenience. Treat POSIX -W foo same as long option --foo */ + if (temp[0] == 'W' && temp[1] == ';') + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = 0; + int option_index; + + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (print_errors) + { + /* 1003.2 specifies the format of this message. */ +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, + _("%s: option requires an argument -- %c\n"), + argv[0], c) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, _("%s: option requires an argument -- %c\n"), + argv[0], c); +#endif + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + return c; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + + /* optarg is now the argument, see if it's in the + table of longopts. */ + + for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + if (ambig && !exact) + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[optind]) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[optind]); +#endif + } + nextchar += strlen (nextchar); + optind++; + return '?'; + } + if (pfound != NULL) + { + option_index = indfound; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, _("\ +%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name); +#endif + } + + nextchar += strlen (nextchar); + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); +#endif + } + nextchar += strlen (nextchar); + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + nextchar = NULL; + return 'W'; /* Let the application handle it. */ + } + if (temp[1] == ':') + { + if (temp[2] == ':') + { + /* This is an option that accepts an argument optionally. */ + if (*nextchar != '\0') + { + optarg = nextchar; + optind++; + } + else + optarg = NULL; + nextchar = NULL; + } + else + { + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (print_errors) + { + /* 1003.2 specifies the format of this message. */ +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option requires an argument -- %c\n"), + argv[0], c) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, + _("%s: option requires an argument -- %c\n"), + argv[0], c); +#endif + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + nextchar = NULL; + } + } + return c; + } +} + +int +getopt (argc, argv, optstring) + int argc; + char *const *argv; + const char *optstring; +{ + return _getopt_internal (argc, argv, optstring, + (const struct option *) 0, + (int *) 0, + 0); +} + +#endif /* Not ELIDE_CODE. */ + +#ifdef TEST + +/* Compile with -DTEST to make an executable for use in testing + the above definition of `getopt'. */ + +int +main (argc, argv) + int argc; + char **argv; +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + + c = getopt (argc, argv, "abc:d:0123456789"); + if (c == -1) + break; + + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value `%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } + } + + if (optind < argc) + { + printf ("non-option ARGV-elements: "); + while (optind < argc) + printf ("%s ", argv[optind++]); + printf ("\n"); + } + + exit (0); +} + +#endif /* TEST */ + Added: trunk/build.vc10/getopt.h =================================================================== --- trunk/build.vc10/getopt.h (rev 0) +++ trunk/build.vc10/getopt.h 2010-05-24 09:23:25 UTC (rev 387) @@ -0,0 +1,182 @@ +/* Declarations for getopt. + Copyright (C) 1989-1994, 1996-1999, 2001 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C 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 2.1 of the License, or (at your option) any later version. + + The GNU C 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 C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _GETOPT_H + +#ifndef __need_getopt +# define _GETOPT_H 1 +#endif + +/* If __GNU_LIBRARY__ is not already defined, either we are being used + standalone, or this is the first header included in the source file. + If we are being used with glibc, we need to include <features.h>, but + that does not exist if we are standalone. So: if __GNU_LIBRARY__ is + not defined, include <ctype.h>, which will pull in <features.h> for us + if it's from glibc. (Why ctype.h? It's guaranteed to exist and it + doesn't flood the namespace with stuff the way some other headers do.) */ +#if !defined __GNU_LIBRARY__ +# include <ctype.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +extern char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +extern int optind; + +/* Callers store zero here to inhibit the error message `getopt' prints + for unrecognized options. */ + +extern int opterr; + +/* Set to an option character which was unrecognized. */ + +extern int optopt; + +#ifndef __need_getopt +/* Describe the long-named options requested by the application. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of `struct option' terminated by an element containing a name which is + zero. + + The field `has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field `flag' is not NULL, it points to a variable that is set + to the value given in the field `val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an `int' to + a compiled-in constant, such as set a value from `optarg', set the + option's `flag' field to zero and its `val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero `flag' field, `getopt' + returns the contents of the `val' field. */ + +struct option +{ +# if (defined __STDC__ && __STDC__) || defined __cplusplus + const char *name; +# else + char *name; +# endif + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the `has_arg' field of `struct option'. */ + +# define no_argument 0 +# define required_argument 1 +# define optional_argument 2 +#endif /* need getopt */ + + +/* Get definitions and prototypes for functions to process the + arguments in ARGV (ARGC of them, minus the program name) for + options given in OPTS. + + Return the option character from OPTS just read. Return -1 when + there are no more options. For unrecognized options, or options + missing arguments, `optopt' is set to the option letter, and '?' is + returned. + + The OPTS string is a list of characters which are recognized option + letters, optionally followed by colons, specifying that that letter + takes an argument, to be placed in `optarg'. + + If a letter in OPTS is followed by two colons, its argument is + optional. This behavior is specific to the GNU `getopt'. + + The argument `--' causes premature termination of argument + scanning, explicitly telling `getopt' that there are no more + options. + + If OPTS begins with `--', then non-option arguments are treated as + arguments to the option '\0'. This behavior is specific to the GNU + `getopt'. */ + +#if (defined __STDC__ && __STDC__) || defined __cplusplus +# ifdef __GNU_LIBRARY__ +/* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation + errors, only prototype getopt for the GNU C library. */ +extern int getopt (int ___argc, char *const *___argv, const char *__shortopts); +# else /* not __GNU_LIBRARY__ */ +extern int getopt (); +# endif /* __GNU_LIBRARY__ */ + +# ifndef __need_getopt +extern int getopt_long (int ___argc, char *const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind); +extern int getopt_long_only (int ___argc, char *const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind); + +/* Internal only. Users should not call this directly. */ +extern int _getopt... [truncated message content] |
From: <brg...@us...> - 2011-01-16 16:46:08
|
Revision: 406 http://ggnfs.svn.sourceforge.net/ggnfs/?rev=406&view=rev Author: brgladman Date: 2011-01-16 16:45:59 +0000 (Sun, 16 Jan 2011) Log Message: ----------- 1. remove bug from lattice sieve code 2. Improve Visual Studio 2010 build files 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/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 trunk/src/if.h trunk/src/lasieve4/gnfs-lasieve4e.c Removed Paths: ------------- trunk/build.vc10/mp_lib.vsprops Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj =================================================================== --- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2011-01-15 11:32:39 UTC (rev 405) +++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj 2011-01-16 16:45:59 UTC (rev 406) @@ -46,19 +46,15 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\mp_lib.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\mp_lib.props" /> </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" /> - <Import Project="..\mp_lib.props" /> </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" /> - <Import Project="..\mp_lib.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -82,8 +78,8 @@ <ClCompile> <Optimization>Disabled</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> @@ -117,8 +113,8 @@ <ClCompile> <Optimization>Disabled</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> @@ -149,8 +145,8 @@ <ClCompile> <Optimization>Full</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <PrecompiledHeader> @@ -163,7 +159,6 @@ </ClCompile> <Lib> <AdditionalDependencies>..\..\..\mpir\build.vc10\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Lib> <PostBuildEvent> <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command> @@ -184,8 +179,8 @@ <ClCompile> <Optimization>Full</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;_LIB;WIN64;__x86_64__;GGNFS_HOST_GENERIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> <PrecompiledHeader> @@ -198,7 +193,6 @@ </ClCompile> <Lib> <AdditionalDependencies>..\..\..\mpir\build.vc10\lib\$(IntDir)mpir.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Lib> <PostBuildEvent> <Command>..\run.bat "$(TargetDir)$(TargetFileName)" ..\..\bin\$(IntDir)</Command> @@ -260,10 +254,6 @@ </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\include\ggnfs.h" /> - <ClInclude Include="..\..\..\include-extra\gmp-impl.h" /> - <ClInclude Include="..\..\..\include-extra\gmp-mparam.h" /> - <ClInclude Include="..\..\..\include-extra\gmp.h" /> - <ClInclude Include="..\..\..\include-extra\longlong.h" /> <ClInclude Include="..\..\..\include\prand.h" /> <ClInclude Include="..\..\..\include\version.h" /> </ItemGroup> Modified: trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters =================================================================== --- trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters 2011-01-15 11:32:39 UTC (rev 405) +++ trunk/build.vc10/ggnfslib/ggnfslib.vcxproj.filters 2011-01-16 16:45:59 UTC (rev 406) @@ -82,18 +82,6 @@ <ClInclude Include="..\..\..\include\ggnfs.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\include-extra\gmp-impl.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include-extra\gmp-mparam.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include-extra\gmp.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\include-extra\longlong.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\include\prand.h"> <Filter>Header Files</Filter> </ClInclude> Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj =================================================================== --- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2011-01-15 11:32:39 UTC (rev 405) +++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj 2011-01-16 16:45:59 UTC (rev 406) @@ -46,19 +46,15 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\mp_lib.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\mp_lib.props" /> </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" /> - <Import Project="..\mp_lib.props" /> </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" /> - <Import Project="..\mp_lib.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -88,7 +84,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=11;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -105,7 +101,7 @@ <EnablePREfast>true</EnablePREfast> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile> <GenerateMapFile>true</GenerateMapFile> @@ -134,7 +130,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -149,7 +145,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> @@ -178,7 +174,7 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=11;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> @@ -191,7 +187,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> @@ -220,7 +216,7 @@ <ClCompile> <Optimization>Full</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=11;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> @@ -233,7 +229,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> Modified: trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters =================================================================== --- trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters 2011-01-15 11:32:39 UTC (rev 405) +++ trunk/build.vc10/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters 2011-01-16 16:45:59 UTC (rev 406) @@ -4,12 +4,6 @@ <Filter Include="Source Files"> <UniqueIdentifier>{ec509471-8a5b-42c3-8050-2dedca99eb32}</UniqueIdentifier> </Filter> - <Filter Include="Source Files\ppc32"> - <UniqueIdentifier>{d298c68b-d31f-407f-a809-9c8693466443}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\piii"> - <UniqueIdentifier>{e1867402-924e-4090-bd52-6fa539181071}</UniqueIdentifier> - </Filter> <Filter Include="Header Files"> <UniqueIdentifier>{ccb02597-f868-4449-83eb-ca1fd26969fe}</UniqueIdentifier> </Filter> @@ -18,43 +12,111 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\src\lasieve4\gmp-aux.c" /> - <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c" /> - <ClCompile Include="..\..\src\lasieve4\input-poly.c" /> - <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c" /> - <ClCompile Include="..\..\src\lasieve4\mpqs.c" /> - <ClCompile Include="..\..\src\lasieve4\prho.c" /> - <ClCompile Include="..\..\src\lasieve4\primgen32.c" /> - <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c" /> - <ClCompile Include="..\..\src\lasieve4\recurrence6.c" /> - <ClCompile Include="..\..\src\lasieve4\redu2.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\basemath.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\lasched.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\medsched.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\psp.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c" /> + <ClCompile Include="..\..\src\lasieve4\piii\basemath.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\mpqs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\gmp-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\input-poly.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\lasched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\medsched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\prho.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\primgen32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\psp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\recurrence6.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\redu2.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\src\if.h" /> - <ClInclude Include="..\..\src\lasieve4\lasieve.h" /> - <ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" /> + <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\piii\siever-config.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> - <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm" /> - <YASM Include="..\..\src\lasieve4\piii\asm_mul64.asm" /> - <YASM Include="..\..\src\lasieve4\piii\asm_mul96.asm" /> - <YASM Include="..\..\src\lasieve4\piii\modinv1002.asm" /> - <YASM Include="..\..\src\lasieve4\piii\mpqs_eval.asm" /> - <YASM Include="..\..\src\lasieve4\piii\mpqs_sieve.asm" /> - <YASM Include="..\..\src\lasieve4\piii\mpqs_td.asm" /> - <YASM Include="..\..\src\lasieve4\piii\ri-aux.asm" /> - <YASM Include="..\..\src\lasieve4\piii\sieve-from-sched.asm" /> + <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\asm_mul64.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\asm_mul96.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\modinv1002.asm"> + <Filter>Source Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\mpqs_eval.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\mpqs_sieve.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\mpqs_td.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\ri-aux.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\sieve-from-sched.asm"> + <Filter>Assembler Files</Filter> + </YASM> </ItemGroup> </Project> \ No newline at end of file Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj =================================================================== --- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2011-01-15 11:32:39 UTC (rev 405) +++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj 2011-01-16 16:45:59 UTC (rev 406) @@ -46,19 +46,15 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\mp_lib.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\mp_lib.props" /> </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" /> - <Import Project="..\mp_lib.props" /> </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" /> - <Import Project="..\mp_lib.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -88,7 +84,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=12;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -105,7 +101,7 @@ <EnablePREfast>true</EnablePREfast> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile> <GenerateMapFile>true</GenerateMapFile> @@ -134,7 +130,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -149,7 +145,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)latsieve12.pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> @@ -178,7 +174,7 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=12;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> @@ -191,7 +187,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> @@ -220,7 +216,7 @@ <ClCompile> <Optimization>Full</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=12;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> @@ -233,7 +229,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> Modified: trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters =================================================================== --- trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters 2011-01-15 11:32:39 UTC (rev 405) +++ trunk/build.vc10/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters 2011-01-16 16:45:59 UTC (rev 406) @@ -4,12 +4,6 @@ <Filter Include="Source Files"> <UniqueIdentifier>{c1bec2b5-f7a6-41fb-bac4-911efc1841cc}</UniqueIdentifier> </Filter> - <Filter Include="Source Files\ppc32"> - <UniqueIdentifier>{f8b12490-77e6-463a-9894-d728d575f1a1}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\piii"> - <UniqueIdentifier>{30a51b84-65d1-4b08-bab8-fb63d3d7435e}</UniqueIdentifier> - </Filter> <Filter Include="Header Files"> <UniqueIdentifier>{08fa945e-65aa-4759-a5d0-fcdf95326e46}</UniqueIdentifier> </Filter> @@ -18,43 +12,111 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\src\lasieve4\gmp-aux.c" /> - <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c" /> - <ClCompile Include="..\..\src\lasieve4\input-poly.c" /> - <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c" /> - <ClCompile Include="..\..\src\lasieve4\mpqs.c" /> - <ClCompile Include="..\..\src\lasieve4\prho.c" /> - <ClCompile Include="..\..\src\lasieve4\primgen32.c" /> - <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c" /> - <ClCompile Include="..\..\src\lasieve4\recurrence6.c" /> - <ClCompile Include="..\..\src\lasieve4\redu2.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\basemath.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\lasched.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\medsched.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\psp.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c" /> + <ClCompile Include="..\..\src\lasieve4\piii\basemath.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\gmp-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\input-poly.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\lasched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\medsched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\mpqs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\prho.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\primgen32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\psp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\recurrence6.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\redu2.c"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\src\if.h" /> - <ClInclude Include="..\..\src\lasieve4\lasieve.h" /> - <ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" /> + <ClInclude Include="..\..\src\if.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\src\lasieve4\piii\siever-config.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\src\lasieve4\lasieve.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> - <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm" /> - <YASM Include="..\..\src\lasieve4\piii\asm_mul64.asm" /> - <YASM Include="..\..\src\lasieve4\piii\asm_mul96.asm" /> - <YASM Include="..\..\src\lasieve4\piii\modinv1002.asm" /> - <YASM Include="..\..\src\lasieve4\piii\mpqs_eval.asm" /> - <YASM Include="..\..\src\lasieve4\piii\mpqs_sieve.asm" /> - <YASM Include="..\..\src\lasieve4\piii\mpqs_td.asm" /> - <YASM Include="..\..\src\lasieve4\piii\ri-aux.asm" /> - <YASM Include="..\..\src\lasieve4\piii\sieve-from-sched.asm" /> + <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\asm_mul64.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\asm_mul96.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\mpqs_eval.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\mpqs_sieve.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\mpqs_td.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\sieve-from-sched.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\ri-aux.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\modinv1002.asm"> + <Filter>Assembler Files</Filter> + </YASM> </ItemGroup> </Project> \ No newline at end of file Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj =================================================================== --- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2011-01-15 11:32:39 UTC (rev 405) +++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj 2011-01-16 16:45:59 UTC (rev 406) @@ -46,19 +46,15 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\mp_lib.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\mp_lib.props" /> </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" /> - <Import Project="..\mp_lib.props" /> </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" /> - <Import Project="..\mp_lib.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -88,7 +84,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=13;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -102,7 +98,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)latsieve13.pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> @@ -130,7 +126,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -144,7 +140,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)latsieve13.pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> @@ -172,7 +168,7 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=13;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> @@ -185,7 +181,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> @@ -214,7 +210,7 @@ <ClCompile> <Optimization>Full</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=13;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> @@ -227,7 +223,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> Modified: trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters =================================================================== --- trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters 2011-01-15 11:32:39 UTC (rev 405) +++ trunk/build.vc10/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters 2011-01-16 16:45:59 UTC (rev 406) @@ -4,12 +4,6 @@ <Filter Include="Source Files"> <UniqueIdentifier>{002a4ddd-08b0-4421-8390-a99379bdfa66}</UniqueIdentifier> </Filter> - <Filter Include="Source Files\ppc32"> - <UniqueIdentifier>{f44aa03d-b6e4-4247-b497-7dc30ae6c548}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\piii"> - <UniqueIdentifier>{dc7a6586-3752-4811-9e6c-fcd122ea2557}</UniqueIdentifier> - </Filter> <Filter Include="Header Files"> <UniqueIdentifier>{66c87244-cb1b-4d58-a3df-6af50512efc3}</UniqueIdentifier> </Filter> @@ -18,46 +12,114 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\src\lasieve4\gmp-aux.c" /> - <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c" /> - <ClCompile Include="..\..\src\lasieve4\input-poly.c" /> - <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c" /> - <ClCompile Include="..\..\src\lasieve4\mpqs.c" /> - <ClCompile Include="..\..\src\lasieve4\prho.c" /> - <ClCompile Include="..\..\src\lasieve4\primgen32.c" /> - <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c" /> - <ClCompile Include="..\..\src\lasieve4\recurrence6.c" /> - <ClCompile Include="..\..\src\lasieve4\redu2.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\basemath.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\lasched.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\medsched.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\psp.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c" /> + <ClCompile Include="..\..\src\lasieve4\piii\basemath.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\gmp-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\input-poly.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\lasched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\medsched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\mpqs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\prho.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\primgen32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\psp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\recurrence6.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\redu2.c"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\if.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\src\lasieve4\generic\32bit.h" /> - <ClInclude Include="..\..\src\lasieve4\lasieve.h" /> - <ClInclude Include="..\..\src\lasieve4\piii\siever-config.h" /> + <ClInclude Include="..\..\src\lasieve4\lasieve.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\src\lasieve4\piii\siever-config.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\src\lasieve4\generic\32bit.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> - <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm" /> - <YASM Include="..\..\src\lasieve4\piii\asm_mul64.asm" /> - <YASM Include="..\..\src\lasieve4\piii\asm_mul96.asm" /> - <YASM Include="..\..\src\lasieve4\piii\modinv1002.asm" /> - <YASM Include="..\..\src\lasieve4\piii\mpqs_eval.asm" /> - <YASM Include="..\..\src\lasieve4\piii\mpqs_sieve.asm" /> - <YASM Include="..\..\src\lasieve4\piii\mpqs_td.asm" /> - <YASM Include="..\..\src\lasieve4\piii\ri-aux.asm" /> - <YASM Include="..\..\src\lasieve4\piii\sieve-from-sched.asm" /> + <YASM Include="..\..\src\lasieve4\piii\asm_mul128.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\asm_mul64.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\asm_mul96.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\mpqs_eval.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\mpqs_sieve.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\mpqs_td.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\sieve-from-sched.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\ri-aux.asm"> + <Filter>Assembler Files</Filter> + </YASM> + <YASM Include="..\..\src\lasieve4\piii\modinv1002.asm"> + <Filter>Assembler Files</Filter> + </YASM> </ItemGroup> </Project> \ No newline at end of file Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj =================================================================== --- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2011-01-15 11:32:39 UTC (rev 405) +++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj 2011-01-16 16:45:59 UTC (rev 406) @@ -46,19 +46,15 @@ </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\mp_lib.props" /> </ImportGroup> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\mp_lib.props" /> </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" /> - <Import Project="..\mp_lib.props" /> </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" /> - <Import Project="..\mp_lib.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup> @@ -88,7 +84,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;I_bits=14;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -102,7 +98,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)latsieve14.pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> @@ -130,7 +126,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -144,7 +140,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>$(OutDir)latsieve14.pdb</ProgramDatabaseFile> <SubSystem>Console</SubSystem> @@ -172,7 +168,7 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <OmitFramePointers>true</OmitFramePointers> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;I_bits=14;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> @@ -185,7 +181,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> @@ -214,7 +210,7 @@ <ClCompile> <Optimization>Full</Optimization> <WholeProgramOptimization>false</WholeProgramOptimization> - <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\;..\..\include;..\..\src;..\..\..\mpir\build.vc10\lib\$(IntDir)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;_CONSOLE;I_bits=14;WIN64;__x86_64__;GGNFS_HOST_GENERIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <BufferSecurityCheck>false</BufferSecurityCheck> @@ -227,7 +223,7 @@ <CompileAs>Default</CompileAs> </ClCompile> <Link> - <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>ws2_32.lib;..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib</AdditionalDependencies> <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Console</SubSystem> <OptimizeReferences>true</OptimizeReferences> Modified: trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters =================================================================== --- trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters 2011-01-15 11:32:39 UTC (rev 405) +++ trunk/build.vc10/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters 2011-01-16 16:45:59 UTC (rev 406) @@ -4,12 +4,6 @@ <Filter Include="Source Files"> <UniqueIdentifier>{1dfb05ba-23d8-47a3-adb5-36682583afbe}</UniqueIdentifier> </Filter> - <Filter Include="Source Files\ppc32"> - <UniqueIdentifier>{4e17e032-9607-447c-9a1c-4b987946d1a3}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\piii"> - <UniqueIdentifier>{4bf812e8-51b9-42e2-8a1a-633a7ec8b209}</UniqueIdentifier> - </Filter> <Filter Include="Header Files"> <UniqueIdentifier>{119e4b34-3895-444a-a1db-9eb0709d821f}</UniqueIdentifier> </Filter> @@ -18,46 +12,114 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\..\src\lasieve4\gmp-aux.c" /> - <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c" /> - <ClCompile Include="..\..\src\lasieve4\input-poly.c" /> - <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c" /> - <ClCompile Include="..\..\src\lasieve4\mpqs.c" /> - <ClCompile Include="..\..\src\lasieve4\prho.c" /> - <ClCompile Include="..\..\src\lasieve4\primgen32.c" /> - <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c" /> - <ClCompile Include="..\..\src\lasieve4\recurrence6.c" /> - <ClCompile Include="..\..\src\lasieve4\redu2.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c" /> - <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\basemath.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\lasched.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\medsched.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\psp.c" /> - <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c" /> + <ClCompile Include="..\..\src\lasieve4\piii\basemath.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\medsched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\gcd32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\gcd32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\gmp-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\gnfs-lasieve4e.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\input-poly.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\lasched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\lasched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\lasieve-prepn.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\medsched.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\modinv32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\siever-config.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\montgomery_mul.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\mpqs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\prho.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\primgen32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\ppc32\psp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\piii\psp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\real-poly-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\src\lasieve4\recurrence6.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Inc... [truncated message content] |
From: <brg...@us...> - 2011-02-02 11:14:54
|
Revision: 407 http://ggnfs.svn.sourceforge.net/ggnfs/?rev=407&view=rev Author: brgladman Date: 2011-02-02 11:14:45 +0000 (Wed, 02 Feb 2011) Log Message: ----------- Commit Visual Studio 2010 x64 build for the experimental lattice siever code Modified Paths: -------------- trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c trunk/src/experimental/lasieve4_64/if.c trunk/src/experimental/lasieve4_64/input-poly.c trunk/src/experimental/lasieve4_64/mpqs.c Added Paths: ----------- trunk/build.vc10/lasieve.exp/ trunk/build.vc10/lasieve.exp/ipch/ trunk/build.vc10/lasieve.exp/ipch/lasieve4i16e-d52b58a1/ trunk/build.vc10/lasieve.exp/lasieve.exp.sln trunk/build.vc10/lasieve.exp/lasieve4I11e/ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters trunk/build.vc10/lasieve.exp/lasieve4I12e/ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj trunk/build.vc10/lasieve.exp/lasieve4I13e/ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters trunk/build.vc10/lasieve.exp/lasieve4I14e/ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters trunk/build.vc10/lasieve.exp/lasieve4I15e/ trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj trunk/build.vc10/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters trunk/build.vc10/lasieve.exp/lasieve4I16e/ trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj trunk/build.vc10/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters trunk/build.vc10/lasieve.exp/liblasieve/ trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj trunk/build.vc10/lasieve.exp/liblasieve/liblasieve.vcxproj.filters trunk/build.vc10/lasieve.exp/liblasieveI11/ trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj trunk/build.vc10/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters trunk/build.vc10/lasieve.exp/liblasieveI12/ trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj trunk/build.vc10/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj.filters trunk/build.vc10/lasieve.exp/liblasieveI13/ trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj trunk/build.vc10/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj.filters trunk/build.vc10/lasieve.exp/liblasieveI14/ trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj trunk/build.vc10/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj.filters trunk/build.vc10/lasieve.exp/liblasieveI15/ trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj trunk/build.vc10/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj.filters trunk/build.vc10/lasieve.exp/liblasieveI16/ trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj trunk/build.vc10/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj.filters trunk/build.vc10/lasieve.exp/readme.txt trunk/src/experimental/lasieve4_64/x64/ trunk/src/experimental/lasieve4_64/x64/32bit.h trunk/src/experimental/lasieve4_64/x64/MMX-TD.c trunk/src/experimental/lasieve4_64/x64/MMX-TD1.asm trunk/src/experimental/lasieve4_64/x64/MMX-TD2.asm trunk/src/experimental/lasieve4_64/x64/Makefile trunk/src/experimental/lasieve4_64/x64/asm-zeit.asm trunk/src/experimental/lasieve4_64/x64/gcd32.c trunk/src/experimental/lasieve4_64/x64/gmp-aux.c trunk/src/experimental/lasieve4_64/x64/gmp-aux.h trunk/src/experimental/lasieve4_64/x64/if.c trunk/src/experimental/lasieve4_64/x64/if.h trunk/src/experimental/lasieve4_64/x64/invtab.c trunk/src/experimental/lasieve4_64/x64/lasched.c trunk/src/experimental/lasieve4_64/x64/lasched.h trunk/src/experimental/lasieve4_64/x64/lasched0.asm trunk/src/experimental/lasieve4_64/x64/lasched1.asm trunk/src/experimental/lasieve4_64/x64/lasched3.asm trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn.asm trunk/src/experimental/lasieve4_64/x64/lasieve-asmprepn2.asm trunk/src/experimental/lasieve4_64/x64/ls-defs.asm trunk/src/experimental/lasieve4_64/x64/ls-defs.inc trunk/src/experimental/lasieve4_64/x64/medsched.c trunk/src/experimental/lasieve4_64/x64/medsched.h trunk/src/experimental/lasieve4_64/x64/medsched0.asm trunk/src/experimental/lasieve4_64/x64/modinv1000.asm trunk/src/experimental/lasieve4_64/x64/modinv1000b.asm trunk/src/experimental/lasieve4_64/x64/modinv32.c trunk/src/experimental/lasieve4_64/x64/mpqs-config.h trunk/src/experimental/lasieve4_64/x64/mpqs_eval.asm trunk/src/experimental/lasieve4_64/x64/mpqs_gauss.asm trunk/src/experimental/lasieve4_64/x64/mpqs_nextpol.asm trunk/src/experimental/lasieve4_64/x64/mpqs_sieve.asm trunk/src/experimental/lasieve4_64/x64/mpqs_sieveinit.asm trunk/src/experimental/lasieve4_64/x64/mpqs_td.asm trunk/src/experimental/lasieve4_64/x64/mpz-td.asm trunk/src/experimental/lasieve4_64/x64/mpz-trialdiv.c trunk/src/experimental/lasieve4_64/x64/psp.c trunk/src/experimental/lasieve4_64/x64/pt64.asm trunk/src/experimental/lasieve4_64/x64/ri-aux.asm trunk/src/experimental/lasieve4_64/x64/schedsieve.asm trunk/src/experimental/lasieve4_64/x64/search0.asm trunk/src/experimental/lasieve4_64/x64/siever-config.c trunk/src/experimental/lasieve4_64/x64/siever-config.h trunk/src/experimental/lasieve4_64/x64/slinie1A.asm trunk/src/experimental/lasieve4_64/x64/slinie2A.asm trunk/src/experimental/lasieve4_64/x64/slinie3A.asm trunk/src/experimental/lasieve4_64/x64/slinieG.asm trunk/src/experimental/lasieve4_64/x64/tdsieve-from-sched.asm trunk/src/experimental/lasieve4_64/x64/tdslinie.asm trunk/src/experimental/lasieve4_64/x64/tdslinie1.asm trunk/src/experimental/lasieve4_64/x64/tdslinie2.asm trunk/src/experimental/lasieve4_64/x64/tdslinie3.asm trunk/src/experimental/lasieve4_64/x64/zeit.c trunk/src/experimental/lasieve4_64/x64/zeit.h Added: trunk/build.vc10/lasieve.exp/lasieve.exp.sln =================================================================== --- trunk/build.vc10/lasieve.exp/lasieve.exp.sln (rev 0) +++ trunk/build.vc10/lasieve.exp/lasieve.exp.sln 2011-02-02 11:14:45 UTC (rev 407) @@ -0,0 +1,90 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +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}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasieve4I11e", "lasieve4I11e\lasieve4I11e.vcxproj", "{451C3388-7276-48A1-A336-B2C4DE3C588A}" + ProjectSection(ProjectDependencies) = postProject + {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} = {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} + {BAF749BD-63E0-437A-B229-6B5A3F570E6A} = {BAF749BD-63E0-437A-B229-6B5A3F570E6A} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI12", "liblasieveI12\liblasieveI12.vcxproj", "{ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI13", "liblasieveI13\liblasieveI13.vcxproj", "{9796AF90-3B2F-470F-BDFA-C8AA336594B8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI14", "liblasieveI14\liblasieveI14.vcxproj", "{36E21BAD-4C26-4C28-9829-2DA09A411FFB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI15", "liblasieveI15\liblasieveI15.vcxproj", "{0E6599B1-F8AD-4997-80C9-4E0213E7B326}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblasieveI16", "liblasieveI16\liblasieveI16.vcxproj", "{C215C705-0613-4E32-ABCA-645EC7A0EF9B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasieve4I12e", "lasieve4I12e\lasieve4I12e.vcxproj", "{BBCFB293-3606-4549-9176-0AF516F84BAC}" + ProjectSection(ProjectDependencies) = postProject + {ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501} = {ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501} + {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} = {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasieve4I13e", "lasieve4I13e\lasieve4I13e.vcxproj", "{DD4C5F19-1F05-494B-8F12-C4A70444293C}" + ProjectSection(ProjectDependencies) = postProject + {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} = {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} + {9796AF90-3B2F-470F-BDFA-C8AA336594B8} = {9796AF90-3B2F-470F-BDFA-C8AA336594B8} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasieve4I14e", "lasieve4I14e\lasieve4I14e.vcxproj", "{BA608E82-06A5-46C5-B0E2-60ED71F38DC4}" + ProjectSection(ProjectDependencies) = postProject + {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} = {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} + {36E21BAD-4C26-4C28-9829-2DA09A411FFB} = {36E21BAD-4C26-4C28-9829-2DA09A411FFB} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasieve4I15e", "lasieve4I15e\lasieve4I15e.vcxproj", "{379879A2-FB3D-4A0E-B3FD-94EFE9D035EE}" + ProjectSection(ProjectDependencies) = postProject + {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} = {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} + {0E6599B1-F8AD-4997-80C9-4E0213E7B326} = {0E6599B1-F8AD-4997-80C9-4E0213E7B326} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lasieve4I16e", "lasieve4I16e\lasieve4I16e.vcxproj", "{3E382630-1512-4975-B165-1CC2F6E0F407}" + ProjectSection(ProjectDependencies) = postProject + {C215C705-0613-4E32-ABCA-645EC7A0EF9B} = {C215C705-0613-4E32-ABCA-645EC7A0EF9B} + {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} = {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}.Debug|x64.ActiveCfg = Debug|x64 + {6AEFD47C-FC47-4F43-A7B2-408C5E45A6D2}.Release|x64.ActiveCfg = Release|x64 + {BAF749BD-63E0-437A-B229-6B5A3F570E6A}.Debug|x64.ActiveCfg = Debug|x64 + {BAF749BD-63E0-437A-B229-6B5A3F570E6A}.Release|x64.ActiveCfg = Release|x64 + {451C3388-7276-48A1-A336-B2C4DE3C588A}.Debug|x64.ActiveCfg = Debug|x64 + {451C3388-7276-48A1-A336-B2C4DE3C588A}.Release|x64.ActiveCfg = Release|x64 + {ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}.Debug|x64.ActiveCfg = Debug|x64 + {ECDAC80B-B64E-4B85-AD65-1B9CE8EDB501}.Release|x64.ActiveCfg = Release|x64 + {9796AF90-3B2F-470F-BDFA-C8AA336594B8}.Debug|x64.ActiveCfg = Debug|x64 + {9796AF90-3B2F-470F-BDFA-C8AA336594B8}.Release|x64.ActiveCfg = Release|x64 + {36E21BAD-4C26-4C28-9829-2DA09A411FFB}.Debug|x64.ActiveCfg = Debug|x64 + {36E21BAD-4C26-4C28-9829-2DA09A411FFB}.Release|x64.ActiveCfg = Release|x64 + {0E6599B1-F8AD-4997-80C9-4E0213E7B326}.Debug|x64.ActiveCfg = Debug|x64 + {0E6599B1-F8AD-4997-80C9-4E0213E7B326}.Release|x64.ActiveCfg = Release|x64 + {C215C705-0613-4E32-ABCA-645EC7A0EF9B}.Debug|x64.ActiveCfg = Debug|x64 + {C215C705-0613-4E32-ABCA-645EC7A0EF9B}.Release|x64.ActiveCfg = Release|x64 + {BBCFB293-3606-4549-9176-0AF516F84BAC}.Debug|x64.ActiveCfg = Debug|x64 + {BBCFB293-3606-4549-9176-0AF516F84BAC}.Release|x64.ActiveCfg = Release|x64 + {DD4C5F19-1F05-494B-8F12-C4A70444293C}.Debug|x64.ActiveCfg = Debug|x64 + {DD4C5F19-1F05-494B-8F12-C4A70444293C}.Release|x64.ActiveCfg = Release|x64 + {BA608E82-06A5-46C5-B0E2-60ED71F38DC4}.Debug|x64.ActiveCfg = Debug|x64 + {BA608E82-06A5-46C5-B0E2-60ED71F38DC4}.Release|x64.ActiveCfg = Release|x64 + {379879A2-FB3D-4A0E-B3FD-94EFE9D035EE}.Debug|x64.ActiveCfg = Debug|x64 + {379879A2-FB3D-4A0E-B3FD-94EFE9D035EE}.Release|x64.ActiveCfg = Release|x64 + {3E382630-1512-4975-B165-1CC2F6E0F407}.Debug|x64.ActiveCfg = Debug|x64 + {3E382630-1512-4975-B165-1CC2F6E0F407}.Release|x64.ActiveCfg = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Added: trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj =================================================================== --- trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj (rev 0) +++ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj 2011-02-02 11:14:45 UTC (rev 407) @@ -0,0 +1,122 @@ +<?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|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{451C3388-7276-48A1-A336-B2C4DE3C588A}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>lasieve4I11e</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </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 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|x64'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <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> + <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> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <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> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <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> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c" /> + <ClCompile Include="..\..\asprintf.c" /> + <ClCompile Include="..\..\fnmatch.c" /> + <ClCompile Include="..\..\getline.c" /> + <ClCompile Include="..\..\getopt.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" /> + <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\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" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h" /> + <ClInclude Include="..\..\fnmatch.h" /> + <ClInclude Include="..\..\getline.h" /> + <ClInclude Include="..\..\getopt.h" /> + <ClInclude Include="..\..\unistd.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters =================================================================== --- trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters (rev 0) +++ trunk/build.vc10/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters 2011-02-02 11:14:45 UTC (rev 407) @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\fnmatch.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\getline.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\getopt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\asprintf.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\fnmatch.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\getline.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\getopt.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\unistd.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> +</Project> \ No newline at end of file Added: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters =================================================================== --- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters (rev 0) +++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters 2011-02-02 11:14:45 UTC (rev 407) @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\fnmatch.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\getline.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\getopt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\asprintf.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <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> + <ClInclude Include="..\..\fnmatch.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\getline.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\getopt.h"> + <Filter>Header Files</Filter> + </ClInclude> + <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> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\unistd.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> +</Project> \ No newline at end of file Added: trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj =================================================================== --- trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj (rev 0) +++ trunk/build.vc10/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj 2011-02-02 11:14:45 UTC (rev 407) @@ -0,0 +1,188 @@ +<?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> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{BBCFB293-3606-4549-9176-0AF516F84BAC}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <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> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <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> + </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\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <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\build.vc10\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> + </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\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <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\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <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> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c" /> + <ClCompile Include="..\..\asprintf.c" /> + <ClCompile Include="..\..\fnmatch.c" /> + <ClCompile Include="..\..\getline.c" /> + <ClCompile Include="..\..\getopt.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" /> + <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\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" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h" /> + <ClInclude Include="..\..\fnmatch.h" /> + <ClInclude Include="..\..\getline.h" /> + <ClInclude Include="..\..\getopt.h" /> + <ClInclude Include="..\..\unistd.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj =================================================================== --- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj (rev 0) +++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj 2011-02-02 11:14:45 UTC (rev 407) @@ -0,0 +1,188 @@ +<?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> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{DD4C5F19-1F05-494B-8F12-C4A70444293C}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <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> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <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> + </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\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <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\build.vc10\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> + </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\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <AdditionalDependencies>..\..\..\..\mpir\build.vc10\lib\$(IntDir)\mpir.lib;%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <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\build.vc10\lib\$(IntDir);..\..\</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <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> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c" /> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c" /> + <ClCompile Include="..\..\asprintf.c" /> + <ClCompile Include="..\..\fnmatch.c" /> + <ClCompile Include="..\..\getline.c" /> + <ClCompile Include="..\..\getopt.c" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h" /> + <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\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" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h" /> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h" /> + <ClInclude Include="..\..\fnmatch.h" /> + <ClInclude Include="..\..\getline.h" /> + <ClInclude Include="..\..\getopt.h" /> + <ClInclude Include="..\..\unistd.h" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters =================================================================== --- trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters (rev 0) +++ trunk/build.vc10/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters 2011-02-02 11:14:45 UTC (rev 407) @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\fbgen.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\gnfs-lasieve4e.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\input-poly.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpqs.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\mpz-ull.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\primgen32.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\recurrence6.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\redu2.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\fnmatch.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\getline.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\getopt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\src\experimental\lasieve4_64\if.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\asprintf.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\32bit.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\fbgen.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\fnmatch.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\getline.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\getopt.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\gmp-aux.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\lasched.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\lasieve-prepn.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\medsched.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\primgen32.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\real-poly-aux.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\recurrence6.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\redu2.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\src\experimental\lasieve4_64\asm\siever-config.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\unistd.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\config.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\..\..\mpir\build.vc10\lib\asm\release\gmp.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> +</Project> \ No newline at end of file Added: trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj =================================================================== --- trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj (rev 0) +++ trunk/build.vc10/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj 2011-02-02 11:14:45 UTC (rev 407) @@ -0,0 +1,188 @@ +<?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> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{BA608E82-06A5-46C5-B0E2-60ED71F38DC4}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <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> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <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="LocalA... [truncated message content] |
From: <jay...@us...> - 2011-02-03 19:15:04
|
Revision: 409 http://ggnfs.svn.sourceforge.net/ggnfs/?rev=409&view=rev Author: jaysonking Date: 2011-02-03 19:14:54 +0000 (Thu, 03 Feb 2011) Log Message: ----------- remove executable bit from non-executable files. Property Changed: ---------------- trunk/build.vc/vc9/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcproj trunk/build.vc/vc9/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcproj trunk/src/experimental/lasieve4_64/COPYING trunk/src/experimental/lasieve4_64/INSTALL trunk/src/experimental/lasieve4_64/Makefile trunk/src/experimental/lasieve4_64/athlon/32bit.h trunk/src/experimental/lasieve4_64/athlon/MMX-TD.c trunk/src/experimental/lasieve4_64/athlon/MMX-TD1.asm trunk/src/experimental/lasieve4_64/athlon/asm_mul128.asm trunk/src/experimental/lasieve4_64/athlon/asm_mul64.asm trunk/src/experimental/lasieve4_64/athlon/asm_mul96.asm trunk/src/experimental/lasieve4_64/athlon/basemath.c trunk/src/experimental/lasieve4_64/athlon/gcd32.c trunk/src/experimental/lasieve4_64/athlon/lasched.w trunk/src/experimental/lasieve4_64/athlon/lasched0.asm trunk/src/experimental/lasieve4_64/athlon/lasched1.asm trunk/src/experimental/lasieve4_64/athlon/lasched2.asm trunk/src/experimental/lasieve4_64/athlon/lasched3.asm trunk/src/experimental/lasieve4_64/athlon/ls-defs.asm trunk/src/experimental/lasieve4_64/athlon/medsched.w trunk/src/experimental/lasieve4_64/athlon/medsched0.asm trunk/src/experimental/lasieve4_64/athlon/modinv1002.asm trunk/src/experimental/lasieve4_64/athlon/montgomery_mul.c trunk/src/experimental/lasieve4_64/athlon/montgomery_mul.h trunk/src/experimental/lasieve4_64/athlon/mpqs.c trunk/src/experimental/lasieve4_64/athlon/mpqs_eval.asm trunk/src/experimental/lasieve4_64/athlon/mpqs_sieve.asm trunk/src/experimental/lasieve4_64/athlon/mpqs_td.asm trunk/src/experimental/lasieve4_64/athlon/mpz-td.asm trunk/src/experimental/lasieve4_64/athlon/mpz-trialdiv.w trunk/src/experimental/lasieve4_64/athlon/psp.c trunk/src/experimental/lasieve4_64/athlon/ri-aux.asm trunk/src/experimental/lasieve4_64/athlon/search0.asm trunk/src/experimental/lasieve4_64/athlon/sieve-from-sched.S trunk/src/experimental/lasieve4_64/athlon/siever-config.w trunk/src/experimental/lasieve4_64/athlon/slinie1.asm trunk/src/experimental/lasieve4_64/athlon/slinie1A.asm trunk/src/experimental/lasieve4_64/athlon/slinie2.asm trunk/src/experimental/lasieve4_64/athlon/slinie2A.asm trunk/src/experimental/lasieve4_64/athlon/slinie3.asm trunk/src/experimental/lasieve4_64/athlon/slinie3A.asm trunk/src/experimental/lasieve4_64/athlon/slinieG.asm trunk/src/experimental/lasieve4_64/athlon/tdsieve-from-sched.asm trunk/src/experimental/lasieve4_64/athlon/tdslinie.asm trunk/src/experimental/lasieve4_64/athlon/tdslinie1.asm trunk/src/experimental/lasieve4_64/athlon/tdslinie2.asm trunk/src/experimental/lasieve4_64/athlon/tdslinie3.asm trunk/src/experimental/lasieve4_64/athlon64/32bit.h trunk/src/experimental/lasieve4_64/athlon64/MMX-TD.c trunk/src/experimental/lasieve4_64/athlon64/MMX-TD1.asm trunk/src/experimental/lasieve4_64/athlon64/MMX-TD2.asm trunk/src/experimental/lasieve4_64/athlon64/Makefile trunk/src/experimental/lasieve4_64/athlon64/asm-zeit.asm trunk/src/experimental/lasieve4_64/athlon64/gcd32.c trunk/src/experimental/lasieve4_64/athlon64/gmp-aux.c trunk/src/experimental/lasieve4_64/athlon64/gmp-aux.h trunk/src/experimental/lasieve4_64/athlon64/if.c trunk/src/experimental/lasieve4_64/athlon64/if.h trunk/src/experimental/lasieve4_64/athlon64/invtab.c trunk/src/experimental/lasieve4_64/athlon64/lasched.c trunk/src/experimental/lasieve4_64/athlon64/lasched.h trunk/src/experimental/lasieve4_64/athlon64/lasched0.asm trunk/src/experimental/lasieve4_64/athlon64/lasched1.asm trunk/src/experimental/lasieve4_64/athlon64/lasched3.asm trunk/src/experimental/lasieve4_64/athlon64/lasieve-asmprepn.asm trunk/src/experimental/lasieve4_64/athlon64/lasieve-asmprepn2.asm trunk/src/experimental/lasieve4_64/athlon64/ls-defs.asm trunk/src/experimental/lasieve4_64/athlon64/medsched.c trunk/src/experimental/lasieve4_64/athlon64/medsched.h trunk/src/experimental/lasieve4_64/athlon64/medsched0.asm trunk/src/experimental/lasieve4_64/athlon64/modinv1000.asm trunk/src/experimental/lasieve4_64/athlon64/modinv1000b.asm trunk/src/experimental/lasieve4_64/athlon64/modinv32.c trunk/src/experimental/lasieve4_64/athlon64/mpqs-config.h trunk/src/experimental/lasieve4_64/athlon64/mpqs_eval.asm trunk/src/experimental/lasieve4_64/athlon64/mpqs_gauss.asm trunk/src/experimental/lasieve4_64/athlon64/mpqs_nextpol.asm trunk/src/experimental/lasieve4_64/athlon64/mpqs_sieve.asm trunk/src/experimental/lasieve4_64/athlon64/mpqs_sieveinit.asm trunk/src/experimental/lasieve4_64/athlon64/mpqs_td.asm trunk/src/experimental/lasieve4_64/athlon64/mpz-td.asm trunk/src/experimental/lasieve4_64/athlon64/mpz-trialdiv.c trunk/src/experimental/lasieve4_64/athlon64/psp.c trunk/src/experimental/lasieve4_64/athlon64/pt64.asm trunk/src/experimental/lasieve4_64/athlon64/ri-aux.asm trunk/src/experimental/lasieve4_64/athlon64/schedsieve.asm trunk/src/experimental/lasieve4_64/athlon64/search0.asm trunk/src/experimental/lasieve4_64/athlon64/siever-config.c trunk/src/experimental/lasieve4_64/athlon64/siever-config.h trunk/src/experimental/lasieve4_64/athlon64/slinie1A.asm trunk/src/experimental/lasieve4_64/athlon64/slinie2A.asm trunk/src/experimental/lasieve4_64/athlon64/slinie3A.asm trunk/src/experimental/lasieve4_64/athlon64/slinieG.asm trunk/src/experimental/lasieve4_64/athlon64/tdsieve-from-sched.asm trunk/src/experimental/lasieve4_64/athlon64/tdslinie.asm trunk/src/experimental/lasieve4_64/athlon64/tdslinie1.asm trunk/src/experimental/lasieve4_64/athlon64/tdslinie2.asm trunk/src/experimental/lasieve4_64/athlon64/tdslinie3.asm trunk/src/experimental/lasieve4_64/athlon64/zeit.c trunk/src/experimental/lasieve4_64/athlon64/zeit.h trunk/src/experimental/lasieve4_64/cweb.INSTALL.and.USE trunk/src/experimental/lasieve4_64/fbgen.c trunk/src/experimental/lasieve4_64/fbgen.h trunk/src/experimental/lasieve4_64/generic/32bit.h trunk/src/experimental/lasieve4_64/generic/gcd32.c trunk/src/experimental/lasieve4_64/generic/lasched.w trunk/src/experimental/lasieve4_64/generic/medsched.w trunk/src/experimental/lasieve4_64/generic/modinv32.c trunk/src/experimental/lasieve4_64/generic/mpqs.c trunk/src/experimental/lasieve4_64/generic/psp.c trunk/src/experimental/lasieve4_64/generic/siever-config32.w trunk/src/experimental/lasieve4_64/generic/siever-config64.w trunk/src/experimental/lasieve4_64/gmp-aux.c trunk/src/experimental/lasieve4_64/gmp-aux.h trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c trunk/src/experimental/lasieve4_64/if.c trunk/src/experimental/lasieve4_64/if.h trunk/src/experimental/lasieve4_64/input-poly.c trunk/src/experimental/lasieve4_64/input-poly.h trunk/src/experimental/lasieve4_64/input-poly.orig.c trunk/src/experimental/lasieve4_64/itanium/32bit.h trunk/src/experimental/lasieve4_64/itanium/MMX-Td.c trunk/src/experimental/lasieve4_64/itanium/MMX-Td1.asm trunk/src/experimental/lasieve4_64/itanium/asmdefs.asm trunk/src/experimental/lasieve4_64/itanium/gcd32.c trunk/src/experimental/lasieve4_64/itanium/lasched.w trunk/src/experimental/lasieve4_64/itanium/lasched0.asm trunk/src/experimental/lasieve4_64/itanium/lasched1.asm trunk/src/experimental/lasieve4_64/itanium/lasched2.asm trunk/src/experimental/lasieve4_64/itanium/lasched3.asm trunk/src/experimental/lasieve4_64/itanium/lasieve-setup.asm trunk/src/experimental/lasieve4_64/itanium/ls-defs.asm trunk/src/experimental/lasieve4_64/itanium/medsched.w trunk/src/experimental/lasieve4_64/itanium/medsched0.asm trunk/src/experimental/lasieve4_64/itanium/modinv15.asm trunk/src/experimental/lasieve4_64/itanium/modinv32.c trunk/src/experimental/lasieve4_64/itanium/mpqs.c trunk/src/experimental/lasieve4_64/itanium/mpz-td.asm trunk/src/experimental/lasieve4_64/itanium/mpz-trialdiv.w trunk/src/experimental/lasieve4_64/itanium/psp.c trunk/src/experimental/lasieve4_64/itanium/ri-aux.asm trunk/src/experimental/lasieve4_64/itanium/schedsieve3.asm trunk/src/experimental/lasieve4_64/itanium/siever-config.w trunk/src/experimental/lasieve4_64/itanium/slinie.asm trunk/src/experimental/lasieve4_64/lasieve-prepn.c trunk/src/experimental/lasieve4_64/lasieve-prepn.h trunk/src/experimental/lasieve4_64/mips/32bit.h trunk/src/experimental/lasieve4_64/mips/gcd32.c trunk/src/experimental/lasieve4_64/mips/lasched.h trunk/src/experimental/lasieve4_64/mips/lasched3.asm trunk/src/experimental/lasieve4_64/mips/lasieve-prepn.asm trunk/src/experimental/lasieve4_64/mips/ls-defs.asm trunk/src/experimental/lasieve4_64/mips/medsched.h trunk/src/experimental/lasieve4_64/mips/medsched2.asm trunk/src/experimental/lasieve4_64/mips/modinv1002.asm trunk/src/experimental/lasieve4_64/mips/mpqs.c trunk/src/experimental/lasieve4_64/mips/psp.c trunk/src/experimental/lasieve4_64/mips/pt64.asm trunk/src/experimental/lasieve4_64/mips/ri-aux.asm trunk/src/experimental/lasieve4_64/mips/sieve-from-sched4p.asm trunk/src/experimental/lasieve4_64/mips/siever-config.w trunk/src/experimental/lasieve4_64/mips/slinie.asm trunk/src/experimental/lasieve4_64/mips/tdsieve-from-sched4q.asm trunk/src/experimental/lasieve4_64/mips/ula2.asm trunk/src/experimental/lasieve4_64/mpqs.c trunk/src/experimental/lasieve4_64/mpz-ull.c trunk/src/experimental/lasieve4_64/orig_gnfs-lasieve4e.c trunk/src/experimental/lasieve4_64/piii/32bit.h trunk/src/experimental/lasieve4_64/piii/MMX-TD.c trunk/src/experimental/lasieve4_64/piii/MMX-TD1.asm trunk/src/experimental/lasieve4_64/piii/asm_mul128.asm trunk/src/experimental/lasieve4_64/piii/asm_mul64.asm trunk/src/experimental/lasieve4_64/piii/asm_mul96.asm trunk/src/experimental/lasieve4_64/piii/basemath.c trunk/src/experimental/lasieve4_64/piii/gcd32.c trunk/src/experimental/lasieve4_64/piii/lasched.w trunk/src/experimental/lasieve4_64/piii/lasched0.asm trunk/src/experimental/lasieve4_64/piii/lasched1.asm trunk/src/experimental/lasieve4_64/piii/lasched2.asm trunk/src/experimental/lasieve4_64/piii/lasched3.asm trunk/src/experimental/lasieve4_64/piii/ls-defs.asm trunk/src/experimental/lasieve4_64/piii/medsched.w trunk/src/experimental/lasieve4_64/piii/medsched0.asm trunk/src/experimental/lasieve4_64/piii/modinv1002.asm trunk/src/experimental/lasieve4_64/piii/montgomery_mul.c trunk/src/experimental/lasieve4_64/piii/montgomery_mul.h trunk/src/experimental/lasieve4_64/piii/mpqs.c trunk/src/experimental/lasieve4_64/piii/mpqs_eval.asm trunk/src/experimental/lasieve4_64/piii/mpqs_sieve.asm trunk/src/experimental/lasieve4_64/piii/mpqs_td.asm trunk/src/experimental/lasieve4_64/piii/mpz-td.asm trunk/src/experimental/lasieve4_64/piii/mpz-trialdiv.w trunk/src/experimental/lasieve4_64/piii/psp.c trunk/src/experimental/lasieve4_64/piii/ri-aux.asm trunk/src/experimental/lasieve4_64/piii/search0.asm trunk/src/experimental/lasieve4_64/piii/sieve-from-sched.S trunk/src/experimental/lasieve4_64/piii/siever-config.w trunk/src/experimental/lasieve4_64/piii/slinie1.asm trunk/src/experimental/lasieve4_64/piii/slinie1A.asm trunk/src/experimental/lasieve4_64/piii/slinie2.asm trunk/src/experimental/lasieve4_64/piii/slinie2A.asm trunk/src/experimental/lasieve4_64/piii/slinie3.asm trunk/src/experimental/lasieve4_64/piii/slinie3A.asm trunk/src/experimental/lasieve4_64/piii/slinieG.asm trunk/src/experimental/lasieve4_64/piii/tdsieve-from-sched.asm trunk/src/experimental/lasieve4_64/piii/tdslinie.asm trunk/src/experimental/lasieve4_64/piii/tdslinie1.asm trunk/src/experimental/lasieve4_64/piii/tdslinie2.asm trunk/src/experimental/lasieve4_64/piii/tdslinie3.asm trunk/src/experimental/lasieve4_64/piii-win/32bit.h trunk/src/experimental/lasieve4_64/piii-win/gcd32.c trunk/src/experimental/lasieve4_64/piii-win/lasched.w trunk/src/experimental/lasieve4_64/piii-win/medsched.w trunk/src/experimental/lasieve4_64/piii-win/modinv32.c trunk/src/experimental/lasieve4_64/piii-win/mpqs.c trunk/src/experimental/lasieve4_64/piii-win/psp.c trunk/src/experimental/lasieve4_64/piii-win/siever-config.w trunk/src/experimental/lasieve4_64/primgen32.c trunk/src/experimental/lasieve4_64/primgen32.h trunk/src/experimental/lasieve4_64/real-poly-aux.c trunk/src/experimental/lasieve4_64/real-poly-aux.h trunk/src/experimental/lasieve4_64/recurrence6.c trunk/src/experimental/lasieve4_64/recurrence6.h trunk/src/experimental/lasieve4_64/redu2.c trunk/src/experimental/lasieve4_64/redu2.h trunk/src/experimental/pol5/Makefile trunk/src/experimental/pol5/common/profile.c trunk/src/experimental/pol5/include/poly_stage1.h trunk/src/experimental/pol5/include/poly_stage2.h trunk/src/experimental/pol5/include/profile.h trunk/src/experimental/pol5/pol51m0b.c trunk/src/experimental/pol5/pol51opt.c trunk/src/experimental/pol5/stage1/asm_hash5.asm trunk/src/experimental/pol5/stage1/asm_hash5.s trunk/src/experimental/pol5/stage1/check.c trunk/src/experimental/pol5/stage1/knapsack.c trunk/src/experimental/pol5/stage1/knapsack_approx.c trunk/src/experimental/pol5/stage1/stage1.c trunk/src/experimental/pol5/stage1/stage1_impl.h trunk/src/experimental/pol5/stage1/stage1_inline.h trunk/src/experimental/pol5/stage1/struct.c trunk/src/experimental/pol5/stage2/asm_rs.asm trunk/src/experimental/pol5/stage2/asm_rs.s trunk/src/experimental/pol5/stage2/assess.c trunk/src/experimental/pol5/stage2/check.c trunk/src/experimental/pol5/stage2/dickman.c trunk/src/experimental/pol5/stage2/primes.c trunk/src/experimental/pol5/stage2/root_sieve.c trunk/src/experimental/pol5/stage2/roots.c trunk/src/experimental/pol5/stage2/stage2.c trunk/src/experimental/pol5/stage2/stage2_impl.h trunk/src/experimental/pol5/stage2/stage2_inline.h trunk/src/experimental/pol5/stage2/translate.c trunk/src/experimental/pol5/test/rsa100.51.m.old trunk/src/experimental/pol5/test/rsa100.data trunk/src/experimental/pol5/test/rsa100_2.51.m trunk/src/experimental/pol5/test/rsa100_2.cand.old trunk/src/experimental/pol5/test/rsa100_2.data trunk/src/experimental/pol5/test/rsa110.51.m.old trunk/src/experimental/pol5/test/rsa110.data trunk/src/experimental/pol5/test/rsa120.51.m.old trunk/src/experimental/pol5/test/rsa120.data trunk/src/experimental/pol5/test/rsa130.51.m.old trunk/src/experimental/pol5/test/rsa130.data trunk/src/experimental/pol5/test/rsa140.51.m.old trunk/src/experimental/pol5/test/rsa140.data trunk/src/lasieve4/gnfs-lasieve4e.pdf Property changes on: trunk/build.vc/vc9/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcproj ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/build.vc/vc9/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcproj ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/COPYING ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/INSTALL ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/Makefile ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/32bit.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/MMX-TD.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/MMX-TD1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/asm_mul128.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/asm_mul64.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/asm_mul96.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/basemath.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/gcd32.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/lasched.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/lasched0.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/lasched1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/lasched2.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/lasched3.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/ls-defs.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/medsched.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/medsched0.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/modinv1002.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/montgomery_mul.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/montgomery_mul.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/mpqs.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/mpqs_eval.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/mpqs_sieve.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/mpqs_td.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/mpz-td.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/mpz-trialdiv.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/psp.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/ri-aux.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/search0.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/sieve-from-sched.S ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/siever-config.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinie1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinie1A.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinie2.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinie2A.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinie3.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinie3A.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/slinieG.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/tdsieve-from-sched.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/tdslinie.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/tdslinie1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/tdslinie2.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon/tdslinie3.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/32bit.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/MMX-TD.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/MMX-TD1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/MMX-TD2.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/Makefile ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/asm-zeit.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/gcd32.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/gmp-aux.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/gmp-aux.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/if.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/if.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/invtab.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasched.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasched.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasched0.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasched1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasched3.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasieve-asmprepn.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/lasieve-asmprepn2.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/ls-defs.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/medsched.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/medsched.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/medsched0.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/modinv1000.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/modinv1000b.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/modinv32.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs-config.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs_eval.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs_gauss.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs_nextpol.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs_sieve.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs_sieveinit.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpqs_td.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpz-td.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/mpz-trialdiv.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/psp.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/pt64.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/ri-aux.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/schedsieve.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/search0.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/siever-config.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/siever-config.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/slinie1A.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/slinie2A.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/slinie3A.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/slinieG.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/tdsieve-from-sched.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/tdslinie.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/tdslinie1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/tdslinie2.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/tdslinie3.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/zeit.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/athlon64/zeit.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/cweb.INSTALL.and.USE ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/fbgen.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/fbgen.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/generic/32bit.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/generic/gcd32.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/generic/lasched.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/generic/medsched.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/generic/modinv32.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/generic/mpqs.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/generic/psp.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/generic/siever-config32.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/generic/siever-config64.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/gmp-aux.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/gmp-aux.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/gnfs-lasieve4e.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/if.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/if.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/input-poly.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/input-poly.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/input-poly.orig.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/32bit.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/MMX-Td.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/MMX-Td1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/asmdefs.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/gcd32.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/lasched.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/lasched0.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/lasched1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/lasched2.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/lasched3.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/lasieve-setup.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/ls-defs.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/medsched.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/medsched0.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/modinv15.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/modinv32.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/mpqs.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/mpz-td.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/mpz-trialdiv.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/psp.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/ri-aux.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/schedsieve3.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/siever-config.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/itanium/slinie.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/lasieve-prepn.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/lasieve-prepn.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/32bit.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/gcd32.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/lasched.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/lasched3.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/lasieve-prepn.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/ls-defs.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/medsched.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/medsched2.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/modinv1002.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/mpqs.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/psp.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/pt64.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/ri-aux.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/sieve-from-sched4p.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/siever-config.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/slinie.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/tdsieve-from-sched4q.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mips/ula2.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mpqs.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/mpz-ull.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/orig_gnfs-lasieve4e.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/32bit.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/MMX-TD.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/MMX-TD1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/asm_mul128.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/asm_mul64.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/asm_mul96.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/basemath.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/gcd32.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/lasched.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/lasched0.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/lasched1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/lasched2.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/lasched3.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/ls-defs.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/medsched.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/medsched0.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/modinv1002.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/montgomery_mul.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/montgomery_mul.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/mpqs.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/mpqs_eval.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/mpqs_sieve.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/mpqs_td.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/mpz-td.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/mpz-trialdiv.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/psp.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/ri-aux.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/search0.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/sieve-from-sched.S ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/siever-config.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/slinie1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/slinie1A.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/slinie2.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/slinie2A.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/slinie3.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/slinie3A.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/slinieG.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/tdsieve-from-sched.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/tdslinie.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/tdslinie1.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/tdslinie2.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii/tdslinie3.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii-win/32bit.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii-win/gcd32.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii-win/lasched.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii-win/medsched.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii-win/modinv32.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii-win/mpqs.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii-win/psp.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/piii-win/siever-config.w ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/primgen32.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/primgen32.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/real-poly-aux.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/real-poly-aux.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/recurrence6.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/recurrence6.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/redu2.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/lasieve4_64/redu2.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/Makefile ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/common/profile.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/include/poly_stage1.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/include/poly_stage2.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/include/profile.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/pol51m0b.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/pol51opt.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage1/asm_hash5.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage1/asm_hash5.s ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage1/check.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage1/knapsack.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage1/knapsack_approx.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage1/stage1.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage1/stage1_impl.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage1/stage1_inline.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage1/struct.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage2/asm_rs.asm ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage2/asm_rs.s ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage2/assess.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage2/check.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage2/dickman.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage2/primes.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage2/root_sieve.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage2/roots.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage2/stage2.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage2/stage2_impl.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage2/stage2_inline.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/stage2/translate.c ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/test/rsa100.51.m.old ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/test/rsa100.data ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/test/rsa100_2.51.m ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/test/rsa100_2.cand.old ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/test/rsa100_2.data ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/test/rsa110.51.m.old ___________________________________________________________________ Deleted: svn:executable - * Property changes on: trunk/src/experimental/pol5/test/rsa110.data _______________________________________... [truncated message content] |
From: <brg...@us...> - 2012-12-07 21:22:10
|
Revision: 435 http://ggnfs.svn.sourceforge.net/ggnfs/?rev=435&view=rev Author: brgladman Date: 2012-12-07 21:21:57 +0000 (Fri, 07 Dec 2012) Log Message: ----------- Add Visual Studio 2012 build files Added Paths: ----------- trunk/build.vc11/ trunk/build.vc11/alloca.h trunk/build.vc11/asprintf.c trunk/build.vc11/asprintf.h trunk/build.vc11/file_copy.bat trunk/build.vc11/fnmatch.c trunk/build.vc11/fnmatch.h trunk/build.vc11/getline.c trunk/build.vc11/getline.h trunk/build.vc11/getopt.c trunk/build.vc11/getopt.h trunk/build.vc11/ggnfs.sdf trunk/build.vc11/ggnfs.sln trunk/build.vc11/ggnfs.v11.suo trunk/build.vc11/ggnfslib/ trunk/build.vc11/ggnfslib/ggnfslib.vcxproj trunk/build.vc11/ggnfslib/ggnfslib.vcxproj.filters trunk/build.vc11/gnfs-lasieve4I11e/ trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj trunk/build.vc11/gnfs-lasieve4I11e/gnfs-lasieve4I11e.vcxproj.filters trunk/build.vc11/gnfs-lasieve4I12e/ trunk/build.vc11/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj trunk/build.vc11/gnfs-lasieve4I12e/gnfs-lasieve4I12e.vcxproj.filters trunk/build.vc11/gnfs-lasieve4I13e/ trunk/build.vc11/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj trunk/build.vc11/gnfs-lasieve4I13e/gnfs-lasieve4I13e.vcxproj.filters trunk/build.vc11/gnfs-lasieve4I14e/ trunk/build.vc11/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj trunk/build.vc11/gnfs-lasieve4I14e/gnfs-lasieve4I14e.vcxproj.filters trunk/build.vc11/gnfs-lasieve4I15e/ trunk/build.vc11/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj trunk/build.vc11/gnfs-lasieve4I15e/gnfs-lasieve4I15e.vcxproj.filters trunk/build.vc11/gnfs-lasieve4I16e/ trunk/build.vc11/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj trunk/build.vc11/gnfs-lasieve4I16e/gnfs-lasieve4I16e.vcxproj.filters trunk/build.vc11/lasieve.exp/ trunk/build.vc11/lasieve.exp/lasieve.exp.sdf trunk/build.vc11/lasieve.exp/lasieve.exp.sln trunk/build.vc11/lasieve.exp/lasieve.exp.v11.suo trunk/build.vc11/lasieve.exp/lasieve4I11e/ trunk/build.vc11/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj trunk/build.vc11/lasieve.exp/lasieve4I11e/lasieve4I11e.vcxproj.filters trunk/build.vc11/lasieve.exp/lasieve4I12e/ trunk/build.vc11/lasieve.exp/lasieve4I12e/lasieve4I11e.vcxproj.filters trunk/build.vc11/lasieve.exp/lasieve4I12e/lasieve4I12e.vcxproj trunk/build.vc11/lasieve.exp/lasieve4I13e/ trunk/build.vc11/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj trunk/build.vc11/lasieve.exp/lasieve4I13e/lasieve4I13e.vcxproj.filters trunk/build.vc11/lasieve.exp/lasieve4I14e/ trunk/build.vc11/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj trunk/build.vc11/lasieve.exp/lasieve4I14e/lasieve4I14e.vcxproj.filters trunk/build.vc11/lasieve.exp/lasieve4I15e/ trunk/build.vc11/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj trunk/build.vc11/lasieve.exp/lasieve4I15e/lasieve4I15e.vcxproj.filters trunk/build.vc11/lasieve.exp/lasieve4I16e/ trunk/build.vc11/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj trunk/build.vc11/lasieve.exp/lasieve4I16e/lasieve4I16e.vcxproj.filters trunk/build.vc11/lasieve.exp/liblasieve/ trunk/build.vc11/lasieve.exp/liblasieve/liblasieve.vcxproj trunk/build.vc11/lasieve.exp/liblasieve/liblasieve.vcxproj.filters trunk/build.vc11/lasieve.exp/liblasieveI11/ trunk/build.vc11/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj trunk/build.vc11/lasieve.exp/liblasieveI11/liblasieveI11.vcxproj.filters trunk/build.vc11/lasieve.exp/liblasieveI12/ trunk/build.vc11/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj trunk/build.vc11/lasieve.exp/liblasieveI12/liblasieveI12.vcxproj.filters trunk/build.vc11/lasieve.exp/liblasieveI13/ trunk/build.vc11/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj trunk/build.vc11/lasieve.exp/liblasieveI13/liblasieveI13.vcxproj.filters trunk/build.vc11/lasieve.exp/liblasieveI14/ trunk/build.vc11/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj trunk/build.vc11/lasieve.exp/liblasieveI14/liblasieveI14.vcxproj.filters trunk/build.vc11/lasieve.exp/liblasieveI15/ trunk/build.vc11/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj trunk/build.vc11/lasieve.exp/liblasieveI15/liblasieveI15.vcxproj.filters trunk/build.vc11/lasieve.exp/liblasieveI16/ trunk/build.vc11/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj trunk/build.vc11/lasieve.exp/liblasieveI16/liblasieveI16.vcxproj.filters trunk/build.vc11/lasieve.exp/readme.txt trunk/build.vc11/makefb/ trunk/build.vc11/makefb/makefb.vcxproj trunk/build.vc11/makefb/makefb.vcxproj.filters trunk/build.vc11/matbuild/ trunk/build.vc11/matbuild/matbuild.vcxproj trunk/build.vc11/matbuild/matbuild.vcxproj.filters trunk/build.vc11/matbuild-tpie/ trunk/build.vc11/matbuild-tpie/matbuild-tpie.vcxproj trunk/build.vc11/matbuild-tpie/matbuild-tpie.vcxproj.filters trunk/build.vc11/matprune/ trunk/build.vc11/matprune/matprune.vcxproj trunk/build.vc11/matprune/matprune.vcxproj.filters trunk/build.vc11/matsolve/ trunk/build.vc11/matsolve/matsolve.vcxproj trunk/build.vc11/matsolve/matsolve.vcxproj.filters trunk/build.vc11/modinv1002.c trunk/build.vc11/mp_lib.props trunk/build.vc11/mulmod32.asm trunk/build.vc11/pol51m0b/ trunk/build.vc11/pol51m0b/pol51m0b.vcxproj trunk/build.vc11/pol51m0b/pol51m0b.vcxproj.filters trunk/build.vc11/pol51m0bx/ trunk/build.vc11/pol51m0bx/pol51m0bx.vcxproj trunk/build.vc11/pol51m0bx/pol51m0bx.vcxproj.filters trunk/build.vc11/pol51m0n/ trunk/build.vc11/pol51m0n/pol51m0n.vcxproj trunk/build.vc11/pol51m0n/pol51m0n.vcxproj.filters trunk/build.vc11/pol51opt/ trunk/build.vc11/pol51opt/pol51opt.vcxproj trunk/build.vc11/pol51opt/pol51opt.vcxproj.filters trunk/build.vc11/pol51optx/ trunk/build.vc11/pol51optx/pol51optx.vcxproj trunk/build.vc11/pol51optx/pol51optx.vcxproj.filters trunk/build.vc11/polyselect/ trunk/build.vc11/polyselect/polyselect.vcxproj trunk/build.vc11/polyselect/polyselect.vcxproj.filters trunk/build.vc11/procrels/ trunk/build.vc11/procrels/procrels.vcxproj trunk/build.vc11/procrels/procrels.vcxproj.filters trunk/build.vc11/rint.c trunk/build.vc11/rint.h trunk/build.vc11/run.bat trunk/build.vc11/sieve/ trunk/build.vc11/sieve/sieve.vcxproj trunk/build.vc11/sieve/sieve.vcxproj.filters trunk/build.vc11/sqrt/ trunk/build.vc11/sqrt/sqrt.vcxproj trunk/build.vc11/sqrt/sqrt.vcxproj.filters trunk/build.vc11/unistd.h trunk/build.vc11/vasprintf.c trunk/build.vc11/vsyasm.props trunk/build.vc11/vsyasm.targets trunk/build.vc11/vsyasm.xml Added: trunk/build.vc11/alloca.h =================================================================== --- trunk/build.vc11/alloca.h (rev 0) +++ trunk/build.vc11/alloca.h 2012-12-07 21:21:57 UTC (rev 435) @@ -0,0 +1,7 @@ + +#ifndef ALLOCA_H +#define ALLOCA_H + +#define alloca _alloca + +#endif \ No newline at end of file Added: trunk/build.vc11/asprintf.c =================================================================== --- trunk/build.vc11/asprintf.c (rev 0) +++ trunk/build.vc11/asprintf.c 2012-12-07 21:21:57 UTC (rev 435) @@ -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.vc11/asprintf.h =================================================================== --- trunk/build.vc11/asprintf.h (rev 0) +++ trunk/build.vc11/asprintf.h 2012-12-07 21:21:57 UTC (rev 435) @@ -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.vc11/file_copy.bat =================================================================== --- trunk/build.vc11/file_copy.bat (rev 0) +++ trunk/build.vc11/file_copy.bat 2012-12-07 21:21:57 UTC (rev 435) @@ -0,0 +1,8 @@ +if not exist %1 goto exit +if not exist %2 goto copy +fc %1 %2 > nul +if not %errorlevel 1 goto exit +:copy +echo copying %1 to %2 +copy %1 %2 +:exit Added: trunk/build.vc11/fnmatch.c =================================================================== --- trunk/build.vc11/fnmatch.c (rev 0) +++ trunk/build.vc11/fnmatch.c 2012-12-07 21:21:57 UTC (rev 435) @@ -0,0 +1,209 @@ +/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. + +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug...@pr.... + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +This program 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 General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifdef HAVE_CONFIG_H +#if defined (CONFIG_BROKETS) +/* We use <config.h> instead of "config.h" so that a compilation + using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h + (which it would do because it found this file in $srcdir). */ +#include <config.h> +#else +#include "config.h" +#endif +#endif + +#include <errno.h> +#include <fnmatch.h> +#include <ctype.h> + + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#if defined (_LIBC) || !defined (__GNU_LIBRARY__) + + +#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS) +extern int errno; +#endif + +/* Match STRING against the filename pattern PATTERN, returning zero if + it matches, nonzero if not. */ +int +fnmatch (pattern, string, flags) + const char *pattern; + const char *string; + int flags; +{ + register const char *p = pattern, *n = string; + register char c; + +/* Note that this evalutes C many times. */ +#define FOLD(c) ((flags & FNM_CASEFOLD) && isupper (c) ? tolower (c) : (c)) + + while ((c = *p++) != '\0') + { + c = FOLD (c); + + switch (c) + { + case '?': + if (*n == '\0') + return FNM_NOMATCH; + else if ((flags & FNM_FILE_NAME) && *n == '/') + return FNM_NOMATCH; + else if ((flags & FNM_PERIOD) && *n == '.' && + (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/'))) + return FNM_NOMATCH; + break; + + case '\\': + if (!(flags & FNM_NOESCAPE)) + { + c = *p++; + c = FOLD (c); + } + if (FOLD (*n) != c) + return FNM_NOMATCH; + break; + + case '*': + if ((flags & FNM_PERIOD) && *n == '.' && + (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/'))) + return FNM_NOMATCH; + + for (c = *p++; c == '?' || c == '*'; c = *p++, ++n) + if (((flags & FNM_FILE_NAME) && *n == '/') || + (c == '?' && *n == '\0')) + return FNM_NOMATCH; + + if (c == '\0') + return 0; + + { + char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c; + c1 = FOLD (c1); + for (--p; *n != '\0'; ++n) + if ((c == '[' || FOLD (*n) == c1) && + fnmatch (p, n, flags & ~FNM_PERIOD) == 0) + return 0; + return FNM_NOMATCH; + } + + case '[': + { + /* Nonzero if the sense of the character class is inverted. */ + register int not; + + if (*n == '\0') + return FNM_NOMATCH; + + if ((flags & FNM_PERIOD) && *n == '.' && + (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/'))) + return FNM_NOMATCH; + + not = (*p == '!' || *p == '^'); + if (not) + ++p; + + c = *p++; + for (;;) + { + register char cstart = c, cend = c; + + if (!(flags & FNM_NOESCAPE) && c == '\\') + cstart = cend = *p++; + + cstart = cend = FOLD (cstart); + + if (c == '\0') + /* [ (unterminated) loses. */ + return FNM_NOMATCH; + + c = *p++; + c = FOLD (c); + + if ((flags & FNM_FILE_NAME) && c == '/') + /* [/] can never match. */ + return FNM_NOMATCH; + + if (c == '-' && *p != ']') + { + cend = *p++; + if (!(flags & FNM_NOESCAPE) && cend == '\\') + cend = *p++; + if (cend == '\0') + return FNM_NOMATCH; + cend = FOLD (cend); + + c = *p++; + } + + if (FOLD (*n) >= cstart && FOLD (*n) <= cend) + goto matched; + + if (c == ']') + break; + } + if (!not) + return FNM_NOMATCH; + break; + + matched:; + /* Skip the rest of the [...] that already matched. */ + while (c != ']') + { + if (c == '\0') + /* [... (unterminated) loses. */ + return FNM_NOMATCH; + + c = *p++; + if (!(flags & FNM_NOESCAPE) && c == '\\') + /* XXX 1003.2d11 is unclear if this is right. */ + ++p; + } + if (not) + return FNM_NOMATCH; + } + break; + + default: + if (c != FOLD (*n)) + return FNM_NOMATCH; + } + + ++n; + } + + if (*n == '\0') + return 0; + + if ((flags & FNM_LEADING_DIR) && *n == '/') + /* The FNM_LEADING_DIR flag says that "foo*" matches "foobar/frobozz". */ + return 0; + + return FNM_NOMATCH; +} + +#endif /* _LIBC or not __GNU_LIBRARY__. */ Added: trunk/build.vc11/fnmatch.h =================================================================== --- trunk/build.vc11/fnmatch.h (rev 0) +++ trunk/build.vc11/fnmatch.h 2012-12-07 21:21:57 UTC (rev 435) @@ -0,0 +1,69 @@ +/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. + +NOTE: The canonical source of this file is maintained with the GNU C Library. +Bugs can be reported to bug...@pr.... + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2, or (at your option) any +later version. + +This program 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 General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef _FNMATCH_H + +#define _FNMATCH_H 1 + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined (__cplusplus) || (defined (__STDC__) && __STDC__) +#undef __P +#define __P(args) args +#else /* Not C++ or ANSI C. */ +#undef __P +#define __P(args) () +/* We can get away without defining `const' here only because in this file + it is used only inside the prototype for `fnmatch', which is elided in + non-ANSI C where `const' is problematical. */ +#endif /* C++ or ANSI C. */ + + +/* We #undef these before defining them because some losing systems + (HP-UX A.08.07 for example) define these in <unistd.h>. */ +#undef FNM_PATHNAME +#undef FNM_NOESCAPE +#undef FNM_PERIOD + +/* Bits set in the FLAGS argument to `fnmatch'. */ +#define FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */ +#define FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special chars. */ +#define FNM_PERIOD (1 << 2) /* Leading `.' is matched only explicitly. */ + +#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_GNU_SOURCE) +#define FNM_FILE_NAME FNM_PATHNAME /* Preferred GNU name. */ +#define FNM_LEADING_DIR (1 << 3) /* Ignore `/...' after a match. */ +#define FNM_CASEFOLD (1 << 4) /* Compare without regard to case. */ +#endif + +/* Value returned by `fnmatch' if STRING does not match PATTERN. */ +#define FNM_NOMATCH 1 + +/* Match STRING against the filename pattern PATTERN, + returning zero if it matches, FNM_NOMATCH if not. */ +extern int fnmatch __P ((const char *__pattern, const char *__string, + int __flags)); + +#ifdef __cplusplus +} +#endif + +#endif /* fnmatch.h */ Added: trunk/build.vc11/getline.c =================================================================== --- trunk/build.vc11/getline.c (rev 0) +++ trunk/build.vc11/getline.c 2012-12-07 21:21:57 UTC (rev 435) @@ -0,0 +1,159 @@ +/* +getline.c -- Replacement for GNU C library function getline + +Copyright (C) 1993 Free Software Foundation, Inc. + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +This program 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 +General Public License for more details. */ + +/* Written by Jan Brittenson, bs...@gn.... */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <sys/types.h> +#include <stdio.h> +#include <assert.h> +#include <errno.h> +#include "getline.h" + +#if STDC_HEADERS +#include <stdlib.h> +#else +char *malloc (), *realloc (); +#endif + +/* Always add at least this many bytes when extending the buffer. */ +#define MIN_CHUNK 64 + +/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR + + OFFSET (and null-terminate it). If LIMIT is non-negative, then + read no more than LIMIT chars. + + *LINEPTR is a pointer returned from malloc (or NULL), pointing to + *N characters of space. It is realloc'd as necessary. + + Return the number of characters read (not including the null + terminator), or -1 on error or EOF. On a -1 return, the caller + should check feof(), if not then errno has been set to indicate the + error. */ + +int getstr (char **lineptr, size_t *n, FILE *stream, int terminator, int offset, int limit) +{ + int nchars_avail; /* Allocated but unused chars in *LINEPTR. */ + char *read_pos; /* Where we're reading into *LINEPTR. */ + int ret; + + if (!lineptr || !n || !stream) + { + errno = EINVAL; + return -1; + } + + if (!*lineptr) + { + *n = MIN_CHUNK; + *lineptr = malloc (*n); + if (!*lineptr) + { + errno = ENOMEM; + return -1; + } + *lineptr[0] = '\0'; + } + + nchars_avail = *n - offset; + read_pos = *lineptr + offset; + + for (;;) + { + int save_errno; + register int c; + + if (limit == 0) + break; + else + { + c = getc (stream); + + /* If limit is negative, then we shouldn't pay attention to + it, so decrement only if positive. */ + if (limit > 0) + limit--; + } + + save_errno = errno; + + /* We always want at least one char left in the buffer, since we + always (unless we get an error while reading the first char) + NUL-terminate the line buffer. */ + + assert((*lineptr + *n) == (read_pos + nchars_avail)); + if (nchars_avail < 2) + { + if (*n > MIN_CHUNK) + *n *= 2; + else + *n += MIN_CHUNK; + + nchars_avail = *n + *lineptr - read_pos; + *lineptr = realloc (*lineptr, *n); + if (!*lineptr) + { + errno = ENOMEM; + return -1; + } + read_pos = *n - nchars_avail + *lineptr; + assert((*lineptr + *n) == (read_pos + nchars_avail)); + } + + if (ferror (stream)) + { + /* Might like to return partial line, but there is no + place for us to store errno. And we don't want to just + lose errno. */ + errno = save_errno; + return -1; + } + + if (c == EOF) + { + /* Return partial line, if any. */ + if (read_pos == *lineptr) + return -1; + else + break; + } + + *read_pos++ = c; + nchars_avail--; + + if (c == terminator) + /* Return the line. */ + break; + } + + /* Done - NUL terminate and return the number of chars read. */ + *read_pos = '\0'; + + ret = read_pos - (*lineptr + offset); + return ret; +} + +int getline (char **lineptr, size_t *n, FILE *stream) +{ + return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT); +} + +int getline_safe (char **lineptr, size_t *n, FILE *stream, int limit) +{ + return getstr (lineptr, n, stream, '\n', 0, limit); +} Added: trunk/build.vc11/getline.h =================================================================== --- trunk/build.vc11/getline.h (rev 0) +++ trunk/build.vc11/getline.h 2012-12-07 21:21:57 UTC (rev 435) @@ -0,0 +1,25 @@ + +#ifndef _getline_h_ +#define _getline_h_ 1 + +#include <stdio.h> + +#if defined (__GNUC__) || (defined (__STDC__) && __STDC__) +#define __PROTO(args) args +#else +#define __PROTO(args) () +#endif /* GCC. */ + +#define GETLINE_NO_LIMIT -1 + +int + getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); +int + getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, + int limit)); +int + getstr __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, + int _terminator, int _offset, int limit)); + +#endif /* _getline_h_ */ + Added: trunk/build.vc11/getopt.c =================================================================== --- trunk/build.vc11/getopt.c (rev 0) +++ trunk/build.vc11/getopt.c 2012-12-07 21:21:57 UTC (rev 435) @@ -0,0 +1,1281 @@ +/* Getopt for GNU. + NOTE: getopt is now part of the C library, so if you don't know what + "Keep this file name-space clean" means, talk to dr...@gn... + before changing it! + Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C 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 2.1 of the License, or (at your option) any later version. + + The GNU C 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 C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. + Ditto for AIX 3.2 and <stdlib.h>. */ + +#define HAVE_STRING_H 1 + +#ifndef _NO_PROTO +# define _NO_PROTO +#endif + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#if !defined __STDC__ || !__STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +# ifndef const +# define const +# endif +#endif + +#include <stdio.h> + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#define GETOPT_INTERFACE_VERSION 2 +#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 +# include <gnu-versions.h> +# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION +# define ELIDE_CODE +# endif +#endif + +#ifndef ELIDE_CODE + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +/* Don't include stdlib.h for non-GNU C libraries because some of them + contain conflicting prototypes for getopt. */ +# include <stdlib.h> +# include <unistd.h> +#endif /* GNU C library. */ + +#ifdef VMS +# include <unixlib.h> +# if HAVE_STRING_H - 0 +# include <string.h> +# endif +#endif + +#ifndef _ +/* This is for other GNU distributions with internationalized messages. */ +# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC +# include <libintl.h> +# ifndef _ +# define _(msgid) gettext (msgid) +# endif +# else +# define _(msgid) (msgid) +# endif +# if defined _LIBC && defined USE_IN_LIBIO +# include <wchar.h> +# endif +#endif + +#ifndef attribute_hidden +# define attribute_hidden +#endif + +/* This version of `getopt' appears to the caller like standard Unix `getopt' + but it behaves differently for the user, since it allows the user + to intersperse the options with the other arguments. + + As `getopt' works, it permutes the elements of ARGV so that, + when it is done, all the options precede everything else. Thus + all application programs are extended to handle flexible argument order. + + Setting the environment variable POSIXLY_CORRECT disables permutation. + Then the behavior is completely standard. + + GNU application programs can use a third alternative mode in which + they can distinguish the relative order of options and other arguments. */ + +#include "getopt.h" + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +/* 1003.2 says this must be 1 before any call. */ +int optind = 1; + +/* Formerly, initialization of getopt depended on optind==0, which + causes problems with re-calling getopt as programs generally don't + know that. */ + +int __getopt_initialized attribute_hidden; + +/* The next char to be scanned in the option-element + in which the last option character we returned was found. + This allows us to pick up the scan where we left off. + + If this is zero, or a null string, it means resume the scan + by advancing to the next ARGV-element. */ + +static char *nextchar; + +/* Callers store zero here to inhibit the error message + for unrecognized options. */ + +int opterr = 1; + +/* Set to an option character which was unrecognized. + This must be initialized on some systems to avoid linking in the + system's own getopt implementation. */ + +int optopt = '?'; + +/* Describe how to deal with options that follow non-option ARGV-elements. + + If the caller did not specify anything, + the default is REQUIRE_ORDER if the environment variable + POSIXLY_CORRECT is defined, PERMUTE otherwise. + + REQUIRE_ORDER means don't recognize them as options; + stop option processing when the first non-option is seen. + This is what Unix does. + This mode of operation is selected by either setting the environment + variable POSIXLY_CORRECT, or using `+' as the first character + of the list of option characters. + + PERMUTE is the default. We permute the contents of ARGV as we scan, + so that eventually all the non-options are at the end. This allows options + to be given in any order, even with programs that were not written to + expect this. + + RETURN_IN_ORDER is an option available to programs that were written + to expect options and other ARGV-elements in any order and that care about + the ordering of the two. We describe each non-option ARGV-element + as if it were the argument of an option with character code 1. + Using `-' as the first character of the list of option characters + selects this mode of operation. + + The special argument `--' forces an end of option-scanning regardless + of the value of `ordering'. In the case of RETURN_IN_ORDER, only + `--' can cause `getopt' to return -1 with `optind' != ARGC. */ + +static enum +{ + REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER +} ordering; + +/* Value of POSIXLY_CORRECT environment variable. */ +static char *posixly_correct; + +#ifdef __GNU_LIBRARY__ +/* We want to avoid inclusion of string.h with non-GNU libraries + because there are many ways it can cause trouble. + On some systems, it contains special magic macros that don't work + in GCC. */ +# include <string.h> +# define my_index strchr +#else + +# if HAVE_STRING_H +# include <string.h> +# else +# include <strings.h> +# endif + +/* Avoid depending on library functions or files + whose names are inconsistent. */ + +#ifndef getenv +extern char *getenv (); +#endif + +static char * +my_index (str, chr) + const char *str; + int chr; +{ + while (*str) + { + if (*str == chr) + return (char *) str; + str++; + } + return 0; +} + +/* If using GCC, we can safely declare strlen this way. + If not using GCC, it is ok not to declare it. */ +#ifdef __GNUC__ +/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. + That was relevant to code that was here before. */ +# if (!defined __STDC__ || !__STDC__) && !defined strlen +/* gcc with -traditional declares the built-in strlen to return int, + and has done so at least since version 2.4.5. -- rms. */ +extern int strlen (const char *); +# endif /* not __STDC__ */ +#endif /* __GNUC__ */ + +#endif /* not __GNU_LIBRARY__ */ + +/* Handle permutation of arguments. */ + +/* Describe the part of ARGV that contains non-options that have + been skipped. `first_nonopt' is the index in ARGV of the first of them; + `last_nonopt' is the index after the last of them. */ + +static int first_nonopt; +static int last_nonopt; + +#ifdef _LIBC +/* Stored original parameters. + XXX This is no good solution. We should rather copy the args so + that we can compare them later. But we must not use malloc(3). */ +extern int __libc_argc; +extern char **__libc_argv; + +/* Bash 2.0 gives us an environment variable containing flags + indicating ARGV elements that should not be considered arguments. */ + +# ifdef USE_NONOPTION_FLAGS +/* Defined in getopt_init.c */ +extern char *__getopt_nonoption_flags; + +static int nonoption_flags_max_len; +static int nonoption_flags_len; +# endif + +# ifdef USE_NONOPTION_FLAGS +# define SWAP_FLAGS(ch1, ch2) \ + if (nonoption_flags_len > 0) \ + { \ + char __tmp = __getopt_nonoption_flags[ch1]; \ + __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ + __getopt_nonoption_flags[ch2] = __tmp; \ + } +# else +# define SWAP_FLAGS(ch1, ch2) +# endif +#else /* !_LIBC */ +# define SWAP_FLAGS(ch1, ch2) +#endif /* _LIBC */ + +/* Exchange two adjacent subsequences of ARGV. + One subsequence is elements [first_nonopt,last_nonopt) + which contains all the non-options that have been skipped so far. + The other is elements [last_nonopt,optind), which contains all + the options processed since those non-options were skipped. + + `first_nonopt' and `last_nonopt' are relocated so that they describe + the new indices of the non-options in ARGV after they are moved. */ + +#if defined __STDC__ && __STDC__ +static void exchange (char **); +#endif + +static void +exchange (argv) + char **argv; +{ + int bottom = first_nonopt; + int middle = last_nonopt; + int top = optind; + char *tem; + + /* Exchange the shorter segment with the far end of the longer segment. + That puts the shorter segment into the right place. + It leaves the longer segment in the right place overall, + but it consists of two parts that need to be swapped next. */ + +#if defined _LIBC && defined USE_NONOPTION_FLAGS + /* First make sure the handling of the `__getopt_nonoption_flags' + string can work normally. Our top argument must be in the range + of the string. */ + if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) + { + /* We must extend the array. The user plays games with us and + presents new arguments. */ + char *new_str = malloc (top + 1); + if (new_str == NULL) + nonoption_flags_len = nonoption_flags_max_len = 0; + else + { + memset (__mempcpy (new_str, __getopt_nonoption_flags, + nonoption_flags_max_len), + '\0', top + 1 - nonoption_flags_max_len); + nonoption_flags_max_len = top + 1; + __getopt_nonoption_flags = new_str; + } + } +#endif + + while (top > middle && middle > bottom) + { + if (top - middle > middle - bottom) + { + /* Bottom segment is the short one. */ + int len = middle - bottom; + register int i; + + /* Swap it with the top part of the top segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[top - (middle - bottom) + i]; + argv[top - (middle - bottom) + i] = tem; + SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); + } + /* Exclude the moved bottom segment from further swapping. */ + top -= len; + } + else + { + /* Top segment is the short one. */ + int len = top - middle; + register int i; + + /* Swap it with the bottom part of the bottom segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[middle + i]; + argv[middle + i] = tem; + SWAP_FLAGS (bottom + i, middle + i); + } + /* Exclude the moved top segment from further swapping. */ + bottom += len; + } + } + + /* Update records for the slots the non-options now occupy. */ + + first_nonopt += (optind - last_nonopt); + last_nonopt = optind; +} + +/* Initialize the internal data when the first call is made. */ + +#if defined __STDC__ && __STDC__ +static const char *_getopt_initialize (int, char *const *, const char *); +#endif +static const char * +_getopt_initialize (argc, argv, optstring) + int argc; + char *const *argv; + const char *optstring; +{ + /* Start processing options with ARGV-element 1 (since ARGV-element 0 + is the program name); the sequence of previously skipped + non-option ARGV-elements is empty. */ + + first_nonopt = last_nonopt = optind; + + nextchar = NULL; + + posixly_correct = getenv ("POSIXLY_CORRECT"); + + /* Determine how to handle the ordering of options and nonoptions. */ + + if (optstring[0] == '-') + { + ordering = RETURN_IN_ORDER; + ++optstring; + } + else if (optstring[0] == '+') + { + ordering = REQUIRE_ORDER; + ++optstring; + } + else if (posixly_correct != NULL) + ordering = REQUIRE_ORDER; + else + ordering = PERMUTE; + +#if defined _LIBC && defined USE_NONOPTION_FLAGS + if (posixly_correct == NULL + && argc == __libc_argc && argv == __libc_argv) + { + if (nonoption_flags_max_len == 0) + { + if (__getopt_nonoption_flags == NULL + || __getopt_nonoption_flags[0] == '\0') + nonoption_flags_max_len = -1; + else + { + const char *orig_str = __getopt_nonoption_flags; + int len = nonoption_flags_max_len = strlen (orig_str); + if (nonoption_flags_max_len < argc) + nonoption_flags_max_len = argc; + __getopt_nonoption_flags = + (char *) malloc (nonoption_flags_max_len); + if (__getopt_nonoption_flags == NULL) + nonoption_flags_max_len = -1; + else + memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), + '\0', nonoption_flags_max_len - len); + } + } + nonoption_flags_len = nonoption_flags_max_len; + } + else + nonoption_flags_len = 0; +#endif + + return optstring; +} + +/* Scan elements of ARGV (whose length is ARGC) for option characters + given in OPTSTRING. + + If an element of ARGV starts with '-', and is not exactly "-" or "--", + then it is an option element. The characters of this element + (aside from the initial '-') are option characters. If `getopt' + is called repeatedly, it returns successively each of the option characters + from each of the option elements. + + If `getopt' finds another option character, it returns that character, + updating `optind' and `nextchar' so that the next call to `getopt' can + resume the scan with the following option character or ARGV-element. + + If there are no more option characters, `getopt' returns -1. + Then `optind' is the index in ARGV of the first ARGV-element + that is not an option. (The ARGV-elements have been permuted + so that those that are not options now come last.) + + OPTSTRING is a string containing the legitimate option characters. + If an option character is seen that is not listed in OPTSTRING, + return '?' after printing an error message. If you set `opterr' to + zero, the error message is suppressed but we still return '?'. + + If a char in OPTSTRING is followed by a colon, that means it wants an arg, + so the following text in the same ARGV-element, or the text of the following + ARGV-element, is returned in `optarg'. Two colons mean an option that + wants an optional arg; if there is text in the current ARGV-element, + it is returned in `optarg', otherwise `optarg' is set to zero. + + If OPTSTRING starts with `-' or `+', it requests different methods of + handling the non-option ARGV-elements. + See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. + + Long-named options begin with `--' instead of `-'. + Their names may be abbreviated as long as the abbreviation is unique + or is an exact match for some defined option. If they have an + argument, it follows the option name in the same ARGV-element, separated + from the option name by a `=', or else the in next ARGV-element. + When `getopt' finds a long-named option, it returns 0 if that option's + `flag' field is nonzero, the value of the option's `val' field + if the `flag' field is zero. + + The elements of ARGV aren't really const, because we permute them. + But we pretend they're const in the prototype to be compatible + with other systems. + + LONGOPTS is a vector of `struct option' terminated by an + element containing a name which is zero. + + LONGIND returns the index in LONGOPT of the long-named option found. + It is only valid when a long-named option has been found by the most + recent call. + + If LONG_ONLY is nonzero, '-' as well as '--' can introduce + long-named options. */ + +int +_getopt_internal (argc, argv, optstring, longopts, longind, long_only) + int argc; + char *const *argv; + const char *optstring; + const struct option *longopts; + int *longind; + int long_only; +{ + int print_errors = opterr; + if (optstring[0] == ':') + print_errors = 0; + + if (argc < 1) + return -1; + + optarg = NULL; + + if (optind == 0 || !__getopt_initialized) + { + if (optind == 0) + optind = 1; /* Don't scan ARGV[0], the program name. */ + optstring = _getopt_initialize (argc, argv, optstring); + __getopt_initialized = 1; + } + + /* Test whether ARGV[optind] points to a non-option argument. + Either it does not have option syntax, or there is an environment flag + from the shell indicating it is not an option. The later information + is only used when the used in the GNU libc. */ +#if defined _LIBC && defined USE_NONOPTION_FLAGS +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ + || (optind < nonoption_flags_len \ + && __getopt_nonoption_flags[optind] == '1')) +#else +# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0') +#endif + + if (nextchar == NULL || *nextchar == '\0') + { + /* Advance to the next ARGV-element. */ + + /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been + moved back by the user (who may also have changed the arguments). */ + if (last_nonopt > optind) + last_nonopt = optind; + if (first_nonopt > optind) + first_nonopt = optind; + + if (ordering == PERMUTE) + { + /* If we have just processed some options following some non-options, + exchange them so that the options come first. */ + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (last_nonopt != optind) + first_nonopt = optind; + + /* Skip any additional non-options + and extend the range of non-options previously skipped. */ + + while (optind < argc && NONOPTION_P) + optind++; + last_nonopt = optind; + } + + /* The special ARGV-element `--' means premature end of options. + Skip it like a null option, + then exchange with previous non-options as if it were an option, + then skip everything else like a non-option. */ + + if (optind != argc && !strcmp (argv[optind], "--")) + { + optind++; + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (first_nonopt == last_nonopt) + first_nonopt = optind; + last_nonopt = argc; + + optind = argc; + } + + /* If we have done all the ARGV-elements, stop the scan + and back over any non-options that we skipped and permuted. */ + + if (optind == argc) + { + /* Set the next-arg-index to point at the non-options + that we previously skipped, so the caller will digest them. */ + if (first_nonopt != last_nonopt) + optind = first_nonopt; + return -1; + } + + /* If we have come to a non-option and did not permute it, + either stop the scan or describe it to the caller and pass it by. */ + + if (NONOPTION_P) + { + if (ordering == REQUIRE_ORDER) + return -1; + optarg = argv[optind++]; + return 1; + } + + /* We have found another option-ARGV-element. + Skip the initial punctuation. */ + + nextchar = (argv[optind] + 1 + + (longopts != NULL && argv[optind][1] == '-')); + } + + /* Decode the current option-ARGV-element. */ + + /* Check whether the ARGV-element is a long option. + + If long_only and the ARGV-element has the form "-f", where f is + a valid short option, don't consider it an abbreviated form of + a long option that starts with f. Otherwise there would be no + way to give the -f short option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an abbreviation of + the long option, just like "--fu", and not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + + if (longopts != NULL + && (argv[optind][1] == '-' + || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1]))))) + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = -1; + int option_index; + + for (nameend = nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) + == (unsigned int) strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else if (long_only + || pfound->has_arg != p->has_arg + || pfound->flag != p->flag + || pfound->val != p->val) + /* Second or later nonexact match found. */ + ambig = 1; + } + + if (ambig && !exact) + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"), + argv[0], argv[optind]) >= 0) + { + + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, _("%s: option `%s' is ambiguous\n"), + argv[0], argv[optind]); +#endif + } + nextchar += strlen (nextchar); + optind++; + optopt = 0; + return '?'; + } + + if (pfound != NULL) + { + option_index = indfound; + optind++; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + int n; +#endif + + if (argv[optind - 1][1] == '-') + { + /* --option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("\ +%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); +#else + fprintf (stderr, _("\ +%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); +#endif + } + else + { + /* +option or -option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("\ +%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[optind - 1][0], + pfound->name); +#else + fprintf (stderr, _("\ +%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[optind - 1][0], pfound->name); +#endif + } + +#if defined _LIBC && defined USE_IN_LIBIO + if (n >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#endif + } + + nextchar += strlen (nextchar); + + optopt = pfound->val; + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); +#endif + } + nextchar += strlen (nextchar); + optopt = pfound->val; + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short + option, then it's an error. + Otherwise interpret it as a short option. */ + if (!long_only || argv[optind][1] == '-' + || my_index (optstring, *nextchar) == NULL) + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + int n; +#endif + + if (argv[optind][1] == '-') + { + /* --option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"), + argv[0], nextchar); +#else + fprintf (stderr, _("%s: unrecognized option `--%s'\n"), + argv[0], nextchar); +#endif + } + else + { + /* +option or -option */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"), + argv[0], argv[optind][0], nextchar); +#else + fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), + argv[0], argv[optind][0], nextchar); +#endif + } + +#if defined _LIBC && defined USE_IN_LIBIO + if (n >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#endif + } + nextchar = (char *) ""; + optind++; + optopt = 0; + return '?'; + } + } + + /* Look at and handle the next short option-character. */ + + { + char c = *nextchar++; + char *temp = my_index (optstring, c); + + /* Increment `optind' when we start to process its last character. */ + if (*nextchar == '\0') + ++optind; + + if (temp == NULL || c == ':') + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + int n; +#endif + + if (posixly_correct) + { + /* 1003.2 specifies the format of this message. */ +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: illegal option -- %c\n"), + argv[0], c); +#else + fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); +#endif + } + else + { +#if defined _LIBC && defined USE_IN_LIBIO + n = __asprintf (&buf, _("%s: invalid option -- %c\n"), + argv[0], c); +#else + fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c); +#endif + } + +#if defined _LIBC && defined USE_IN_LIBIO + if (n >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#endif + } + optopt = c; + return '?'; + } + /* Convenience. Treat POSIX -W foo same as long option --foo */ + if (temp[0] == 'W' && temp[1] == ';') + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound = 0; + int option_index; + + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (print_errors) + { + /* 1003.2 specifies the format of this message. */ +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, + _("%s: option requires an argument -- %c\n"), + argv[0], c) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, _("%s: option requires an argument -- %c\n"), + argv[0], c); +#endif + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + return c; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + + /* optarg is now the argument, see if it's in the + table of longopts. */ + + for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if ((unsigned int) (nameend - nextchar) == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + if (ambig && !exact) + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[optind]) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[optind]); +#endif + } + nextchar += strlen (nextchar); + optind++; + return '?'; + } + if (pfound != NULL) + { + option_index = indfound; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, _("\ +%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name); +#endif + } + + nextchar += strlen (nextchar); + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (print_errors) + { +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +#else + fprintf (stderr, + _("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); +#endif + } + nextchar += strlen (nextchar); + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + nextchar = NULL; + return 'W'; /* Let the application handle it. */ + } + if (temp[1] == ':') + { + if (temp[2] == ':') + { + /* This is an option that accepts an argument optionally. */ + if (*nextchar != '\0') + { + optarg = nextchar; + optind++; + } + else + optarg = NULL; + nextchar = NULL; + } + else + { + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (print_errors) + { + /* 1003.2 specifies the format of this message. */ +#if defined _LIBC && defined USE_IN_LIBIO + char *buf; + + if (__asprintf (&buf, _("\ +%s: option requires an argument -- %c\n"), + argv[0], c) >= 0) + { + if (_IO_fwide (stderr, 0) > 0) + __fwprintf (stderr, L"%s", buf); + else + fputs (buf, stderr); + + free (buf); + } +... [truncated message content] |