diff --git a/Jenkinsfile b/Jenkinsfile index 7dc08510..95b0938e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -106,6 +106,12 @@ pipeline { dir("${REPO}/${REPO}/host/xmosdfu") { sh 'make -f Makefile.OSX64' } + dir("${REPO}/host_usb_mixer_control") { + sh 'make -f Makefile.OSX' + sh 'mkdir OSX/x86' + sh 'mv xmos_mixer OSX/x86/xmos_mixer' + archiveArtifacts artifacts: "OSX/x86/xmos_mixer", fingerprint: true + } } post { cleanup { @@ -141,6 +147,14 @@ pipeline { dir("${REPO}/host/xmosdfu") { runVS('nmake /f Makefile.Win32') } + dir("host_usb_mixer_control") { + println "Stage running on:" + println env.NODE_NAME + runVS('msbuild host_usb_mixer_control.vcxproj /property:Configuration=Release') + runVS('mkdir WIN/x86') + runVS('ren bin/Release/x64/host_usb_mixer_control.exe WIN/x64/xmos_mixer.exe') + archiveArtifacts artifacts: "WIN/x64/xmos_mixer.exe", fingerprint: true + } } } post { diff --git a/host_usb_mixer_control/Makefile.OSX b/host_usb_mixer_control/Makefile.OSX index 18074d3d..d5c39552 100644 --- a/host_usb_mixer_control/Makefile.OSX +++ b/host_usb_mixer_control/Makefile.OSX @@ -1,2 +1,3 @@ all: - g++ -g -o xmos_mixer OSX/usb_mixer.cpp mixer_app.cpp -I. -IOSX OSX/libusb-1.0.0.dylib -arch x86_64 \ No newline at end of file + g++ -g -o xmos_mixer OSX/usb_mixer.cpp mixer_app.cpp -I. -IOSX OSX/libusb-1.0.0.dylib -arch x86_64 + \ No newline at end of file diff --git a/host_usb_mixer_control/host_usb_mixer_control.vcxproj b/host_usb_mixer_control/host_usb_mixer_control.vcxproj index d53fe39c..cc895a7d 100644 --- a/host_usb_mixer_control/host_usb_mixer_control.vcxproj +++ b/host_usb_mixer_control/host_usb_mixer_control.vcxproj @@ -24,7 +24,7 @@ {84eacf4f-e405-4909-b440-a04a84a3f8c8} - C:\Program Files\XMOS\tusbaudiosdk + C:\Program Files\XMOS\tusbaudiosdk 10.0 @@ -44,13 +44,13 @@ Application true - v143 + v142 Unicode Application false - v143 + v142 false Unicode