cheng/mpir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor changes to the Windows readme.txt and the Python Windows build generator

Browse Source
This commit is contained in:
BrianGladman 2013-12-21 18:32:07 +00:00
parent 0707164845
commit 6f884d522b
6 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.vc10/mpir_config.py
View File

@ -614,7 +614,8 @@ def gen_vcxproj(proj_name, file_name, guid, config, plat, is_dll, is_cpp, hf_lis
vcx_default_cpp_props(outf)
vcx_library_type(plat, is_dll, outf)
vcx_cpp_props(outf)
vcx_extensions(outf)
if af_list:
vcx_extensions(outf)
vcx_user_props(plat, outf)
outf.write(f2)
vcx_target_name_and_dirs(proj_name, plat, is_dll, outf)

2
build.vc10/readme.txt
View File

@ -41,7 +41,7 @@ Visual Studio 2010 Professional. The win32 build projects also work with
Microsoft Visual C++ 2010 Express.
To build the x64 libraries with VC++ Express you will need to install
the Windows 7.1 SDK and Python (2.6 or later). Once you have these
the Windows 7.1 SDK and Python 3.1 (or later). Once you have these
installed, you can run the Python program 'add.express.py' before starting
the build process to convert the build filles for use with VC++ Express.
If necessary, these changes can be removed by running the Python program

6
build.vc11/mpir_config.py
View File

@ -43,7 +43,7 @@ debug = False
# either add a prebuild step to the project files or do it here
add_prebuild = True
# output a build project for the C++ static library
add_cpp_lib = True
add_cpp_lib = False
# The path to the mpir root directory
build_vc = 'build.vc11/'
@ -51,7 +51,7 @@ mpir_dir = '../'
build_dir = mpir_dir + build_vc
# paths that might include source files(*.c, *.h, *.asm)
c_directories = ( '', 'build.vc10', 'fft', 'mpf', 'mpq', 'mpz', 'printf', 'scanf' )
c_directories = ( '', 'build.vc11', 'fft', 'mpf', 'mpq', 'mpz', 'printf', 'scanf' )
# files that are to be excluded from the build
exclude_file_list = ('config.guess', 'cfg', 'getopt', 'getrusage', 'gettimeofday', 'cpuid',
@ -949,7 +949,7 @@ if debug:
if '.svn' in dirs:
dirs.remove('.svn') # ignore SVN directories
if d == '' or root.endswith(build_vc):
for d in reversed(dirs): # don't scan build.vc10 subdirectories
for d in reversed(dirs): # don't scan build.vc11 subdirectories
dirs.remove(d)
for f in files:
if f.endswith(p):

20
build.vc11/readme.txt
View File

@ -1,12 +1,12 @@
Building MPIR with Microsoft Visual Studio 2010
Building MPIR with Microsoft Visual Studio 2012
===============================================
A Note On Licensing
===================
Files in this distribution that have been created for use in building
MPIR with Microsoft Visual Studio 2010 are provided under the terms of
MPIR with Microsoft Visual Studio 2012 are provided under the terms of
the LGPL v2.1+ license.
The MPIR library uses numerous files which are LGPL v3+ and so the
@ -18,12 +18,12 @@ Using the Assembler Based Build Projects
If you wish to use the assembler files you will need VSYASM, a version
of YASM x86/x64 assembler tailored specifically for use with Microsoft
Visual Studio 2010. You will need a recent revision of YASM from:
Visual Studio 2012. You will need a recent revision of YASM from:
http://www.tortall.net/projects/yasm/
This assembler (you need vsyasm.exe, NOT yasm.exe) should be placed
in the bin directory used by VC++, which, for Visual Stduio 2010, is
in the bin directory used by VC++, which, for Visual Stduio 2012, is
typically:
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin
@ -37,11 +37,11 @@ Compiling MPIR with the Visual Studio C/C++
===========================================
These VC++ build projects are primarily designed to work with Microsoft
Visual Studio 2010 Professional. The win32 build projects also work with
Microsoft Visual C++ 2010 Express.
Visual Studio 2012 Professional. The win32 build projects also work with
Microsoft Visual C++ 2012 Express.
To build the x64 libraries with VC++ Express you will need to install
the Windows 7.1 SDK and Python (2.6 or later). Once you have these
the Windows 7.1 SDK and Python 3.1 (or later). Once you have these
installed, you can run the Python program 'add.express.py' before starting
the build process to convert the build filles for use with VC++ Express.
If necessary, these changes can be removed by running the Python program
@ -86,7 +86,7 @@ C and the C++ functions.
================================
By default the Visual Studio solution for MPIR provides support for
x64 builds with nassembler support for Intel core2 and nehalem and
x64 builds with assembler support for Intel core2 and nehalem and
for the AMD k8.
To build MPIR versions with assembler support for other processors,
@ -171,7 +171,7 @@ The Tests
=========
There is a separate solution for the MPIR tests: mpir-tests.sln. In
Visual Studio 2010 this is in build.vc10 folder.
Visual Studio 2012 this is in build.vc10 folder.
The tests are configured to always test the last version of MPIR that
has been built. This is automatic but it can be changed by editing
@ -189,7 +189,7 @@ is also necessary to copy either:
or:
mpir\build.vc10\mpir-tests\dll-test-config.props#
mpir\build.vc10\mpir-tests\dll-test-config.props
into:

7
build.vc12/mpir_config.py
View File

@ -51,7 +51,7 @@ mpir_dir = '../'
build_dir = mpir_dir + build_vc
# paths that might include source files(*.c, *.h, *.asm)
c_directories = ( '', 'build.vc10', 'fft', 'mpf', 'mpq', 'mpz', 'printf', 'scanf' )
c_directories = ( '', 'build.vc12', 'fft', 'mpf', 'mpq', 'mpz', 'printf', 'scanf' )
# files that are to be excluded from the build
exclude_file_list = ('config.guess', 'cfg', 'getopt', 'getrusage', 'gettimeofday', 'cpuid',
@ -614,7 +614,8 @@ def gen_vcxproj(proj_name, file_name, guid, config, plat, is_dll, is_cpp, hf_lis
vcx_default_cpp_props(outf)
vcx_library_type(plat, is_dll, outf)
vcx_cpp_props(outf)
vcx_extensions(outf)
if af_list:
vcx_extensions(outf)
vcx_user_props(plat, outf)
outf.write(f2)
vcx_target_name_and_dirs(proj_name, plat, is_dll, outf)
@ -948,7 +949,7 @@ if debug:
if '.svn' in dirs:
dirs.remove('.svn') # ignore SVN directories
if d == '' or root.endswith(build_vc):
for d in reversed(dirs): # don't scan build.vc10 subdirectories
for d in reversed(dirs): # don't scan build.vc12 subdirectories
dirs.remove(d)
for f in files:
if f.endswith(p):

18
build.vc12/readme.txt
View File

@ -1,12 +1,12 @@
Building MPIR with Microsoft Visual Studio 2012
Building MPIR with Microsoft Visual Studio 2013
===============================================
A Note On Licensing
===================
Files in this distribution that have been created for use in building
MPIR with Microsoft Visual Studio 2012 are provided under the terms of
MPIR with Microsoft Visual Studio 2013 are provided under the terms of
the LGPL v2.1+ license.
The MPIR library uses numerous files which are LGPL v3+ and so the
@ -18,12 +18,12 @@ Using the Assembler Based Build Projects
If you wish to use the assembler files you will need VSYASM, a version
of YASM x86/x64 assembler tailored specifically for use with Microsoft
Visual Studio 2010. You will need a recent revision of YASM from:
Visual Studio 2013. You will need a recent revision of YASM from:
http://www.tortall.net/projects/yasm/
This assembler (you need vsyasm.exe, NOT yasm.exe) should be placed
in the bin directory used by VC++, which, for Visual Stduio 2010, is
in the bin directory used by VC++, which, for Visual Stduio 2013, is
typically:
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin
@ -37,11 +37,11 @@ Compiling MPIR with the Visual Studio C/C++
===========================================
These VC++ build projects are primarily designed to work with Microsoft
Visual Studio 2010 Professional. The win32 build projects also work with
Microsoft Visual C++ 2010 Express.
Visual Studio 2013 Professional. The win32 build projects also work with
Microsoft Visual C++ 2013 Express.
To build the x64 libraries with VC++ Express you will need to install
the Windows 7.1 SDK and Python (2.6 or later). Once you have these
the Windows 7.1 SDK and Python 3.1 (or later). Once you have these
installed, you can run the Python program 'add.express.py' before starting
the build process to convert the build filles for use with VC++ Express.
If necessary, these changes can be removed by running the Python program
@ -171,7 +171,7 @@ The Tests
=========
There is a separate solution for the MPIR tests: mpir-tests.sln. In
Visual Studio 2010 this is in build.vc10 folder.
Visual Studio 2013 this is in build.vc10 folder.
The tests are configured to always test the last version of MPIR that
has been built. This is automatic but it can be changed by editing
@ -461,4 +461,4 @@ My thanks to:
4. Jeff Gilchrist for his help in testing, debugging and
improving the readme giving the VC++ build instructions
Brian Gladman, October 2012
Brian Gladman, December 2013