laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

OSX makefile changed to work on M1, VS project file changed to 2019 (toolset 142) and Jenkins file now builds and archives the binaries

Browse Source
This commit is contained in:
Tom Williams
2023-02-01 14:11:47 +00:00
parent 64d65afeaf
commit b18c34fb0f
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Jenkinsfile vendored
View File

@@ -106,6 +106,12 @@ pipeline {
dir("${REPO}/${REPO}/host/xmosdfu") { dir("${REPO}/${REPO}/host/xmosdfu") {
sh 'make -f Makefile.OSX64' 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 { post {
cleanup { cleanup {
@@ -141,6 +147,14 @@ pipeline {
dir("${REPO}/host/xmosdfu") { dir("${REPO}/host/xmosdfu") {
runVS('nmake /f Makefile.Win32') 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 { post {

1
host_usb_mixer_control/Makefile.OSX
View File

@@ -1,2 +1,3 @@
all: all:
g++ -g -o xmos_mixer OSX/usb_mixer.cpp mixer_app.cpp -I. -IOSX OSX/libusb-1.0.0.dylib -arch x86_64 g++ -g -o xmos_mixer OSX/usb_mixer.cpp mixer_app.cpp -I. -IOSX OSX/libusb-1.0.0.dylib -arch x86_64

4
host_usb_mixer_control/host_usb_mixer_control.vcxproj
View File

@@ -44,13 +44,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>false</WholeProgramOptimization> <WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>