diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..1261b645d --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,46 @@ +jobs: +- job: Linux + pool: + vmImage: 'Ubuntu 16.04' + + steps: + - script: sudo apt-get install libjack-dev libasound2-dev ninja-build + displayName: 'Install dependencies' + + - script: cmake -G Ninja . + displayName: 'Generate build system with cmake' + + - script: ninja + displayName: 'Build' + +- job: Windows + pool: + vmImage: 'vs2017-win2016' + + steps: + - script: choco install -y jom + displayName: 'Install dependencies' + + - script: | + call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/Common7/Tools/VsDevCmd.bat" + cmake -G "NMake Makefiles JOM" . + displayName: 'Generate build system with cmake' + + - script: | + call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/Common7/Tools/VsDevCmd.bat" + jom + displayName: 'Build' + +- job: macOS + pool: + vmImage: 'macOS-10.13' + + steps: + - script: brew install ninja + displayName: 'Install dependencies' + + - script: cmake -G Ninja . + displayName: 'Generate build system with cmake' + + - script: ninja + displayName: 'Build' \ No newline at end of file diff --git a/cmake-modules/FindDirectX.cmake b/cmake-modules/FindDirectX.cmake index d0e64ebe8..e7be26f4b 100644 --- a/cmake-modules/FindDirectX.cmake +++ b/cmake-modules/FindDirectX.cmake @@ -12,6 +12,7 @@ find_path(DSOUND_INCLUDE_DIR dsound.h "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include" + "$ENV{WINDOWSSDKDIR}/Include/$ENV{WINDOWSSDKLIBVERSION}/um" DOC "The directory where dsound.h resides" ) mark_as_advanced(DSOUND_INCLUDE_DIR) @@ -22,6 +23,7 @@ find_library(DSOUND_LIBRARY dsound "$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86" "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Lib/x86" + "$ENV{WINDOWSSDKDIR}/Lib/$ENV{WINDOWSSDKLIBVERSION}/um/x86" DOC "The directory where the dsound library resides" ) mark_as_advanced(DSOUND_LIBRARY)