diff options
| author | Mouse <[email protected]> | 2015-08-14 16:26:10 -0400 |
|---|---|---|
| committer | Mouse <[email protected]> | 2015-08-14 16:26:10 -0400 |
| commit | 451e0be58e0611a56bfed2c2ac3315dfbc6f244c (patch) | |
| tree | 26a3189b96c1b029b06ba1d0e6980072f61fe276 /src/scripts | |
| parent | 273cd990a6f75ac44cce2ec58a59808cdbcc84c6 (diff) | |
| parent | 929905ec8a598dccaac85097a6dc9a53a151e4f6 (diff) | |
Merge pull request #1 from randombit/master
Merging mainstream updates
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/ci/appveyor.yml | 9 | ||||
| -rwxr-xr-x | src/scripts/comba.py | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/scripts/ci/appveyor.yml b/src/scripts/ci/appveyor.yml index a2fe822a8..aa0c3890c 100644 --- a/src/scripts/ci/appveyor.yml +++ b/src/scripts/ci/appveyor.yml @@ -1,10 +1,15 @@ os: Windows Server 2012 R2 +platform: + - x86 + - x86_amd64 + install: - - call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86 + - call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %PLATFORM% + - cl # check compiler version build_script: - - python configure.py --disable-shared --via-amalgamation --cpu=x86_32 --cc=msvc + - python configure.py --disable-shared --via-amalgamation --cpu=%PLATFORM% --cc=msvc - nmake - botan-test - nmake install diff --git a/src/scripts/comba.py b/src/scripts/comba.py index fe588f7bc..dcac14657 100755 --- a/src/scripts/comba.py +++ b/src/scripts/comba.py @@ -87,8 +87,6 @@ def main(args = None): #include <botan/internal/mp_asmi.h> namespace Botan { - -extern "C" { """ for n in [4,6,8,9,16]: @@ -110,7 +108,7 @@ extern "C" { print " }\n" - print "}\n\n}" + print "}" if __name__ == '__main__': sys.exit(main()) |