Changes in / [3636600:51284ab]


Ignore:
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • .appveyor.yml

    r3636600 r51284ab  
    33
    44environment:
     5
     6  global:
     7      CUSTOM64PATH: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin
    58
    69  matrix:
     
    4144
    4245install:
     46
    4347  - ECHO "Installed SDKs:"
    4448  - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
    4549
    4650  - "SET PATH=%PYTHONDIR%;%PYTHONDIR%\\Scripts;%PATH%"
     51
     52  - if [%PYTHON_ARCH%]==[64] SET PATH=%CUSTOM64PATH%;%PATH%
    4753
    4854  # Check that we have the expected version and architecture for Python
     
    6672  # clean before building python package
    6773  - python waf distclean
     74  # build python module without using libaubio
     75  - pip wheel -v -v -v --wheel-dir=dist .
    6876  # build, upload and install wheel (inspired by numpy's appveyor)
    6977  - ps: |
  • python/lib/gen_external.py

    r3636600 r51284ab  
    7575        cpp_cmd += ['-E']
    7676
    77     # On win-amd64 (py3.x), the default compiler is cross-compiling, from x86
    78     # to amd64 with %WIN_SDK_ROOT%\x86_amd64\cl.exe, but using this binary as a
    79     # pre-processor generates no output, so we use %WIN_SDK_ROOT%\cl.exe
    80     # instead.
    81     if len(cpp_cmd) > 1 and 'cl.exe' in cpp_cmd[-2]:
    82         plat = os.path.basename(os.path.dirname(cpp_cmd[-2]))
    83         if plat == 'x86_amd64':
    84             print('workaround on win64 to avoid empty pre-processor output')
    85             cpp_cmd[-2] = cpp_cmd[-2].replace('x86_amd64', '')
    86         elif True in ['amd64' in f for f in cpp_cmd]:
    87             print('warning: not using workaround for', cpp_cmd[0], plat)
    88 
    8977    if not cpp_cmd:
    9078        print("Warning: could not guess preprocessor, using env's CC")
Note: See TracChangeset for help on using the changeset viewer.