| @@ -45,7 +45,7 @@ jobs: | |||||
| pushd PawPaw && source local.env macos && popd | pushd PawPaw && source local.env macos && popd | ||||
| python ./waf configure --platform=darwin --prefix=/usr/local | python ./waf configure --platform=darwin --prefix=/usr/local | ||||
| python ./waf build -j $(sysctl -n hw.logicalcpu) | python ./waf build -j $(sysctl -n hw.logicalcpu) | ||||
| python ./waf install --destdir="$(pwd)/destdir" | |||||
| python ./waf install --destdir=$(pwd)/destdir | |||||
| - name: Generate macOS package | - name: Generate macOS package | ||||
| shell: bash | shell: bash | ||||
| run: | | run: | | ||||
| @@ -79,7 +79,7 @@ jobs: | |||||
| - name: Fix up Xcode | - name: Fix up Xcode | ||||
| run: | | run: | | ||||
| sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* | sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/* | ||||
| sudo xcode-select -s "/Applications/Xcode_12.3.app" | |||||
| sudo xcode-select -s /Applications/Xcode_12.3.app | |||||
| - name: Bootstrap macOS universal | - name: Bootstrap macOS universal | ||||
| shell: bash | shell: bash | ||||
| run: | | run: | | ||||
| @@ -159,7 +159,7 @@ jobs: | |||||
| shell: bash | shell: bash | ||||
| run: | | run: | | ||||
| pushd PawPaw && source local.env win32 && popd | pushd PawPaw && source local.env win32 && popd | ||||
| ./waf configure --platform=win32 --prefix="$(pwd)/destdir" --static | |||||
| ./waf configure --platform=win32 --prefix=$(pwd)/destdir --static | |||||
| ./waf build -j $(nproc) | ./waf build -j $(nproc) | ||||
| ./waf install | ./waf install | ||||
| - name: Generate MSVC lib files | - name: Generate MSVC lib files | ||||
| @@ -215,19 +215,18 @@ jobs: | |||||
| shell: bash | shell: bash | ||||
| run: | | run: | | ||||
| pushd PawPaw && source local.env win64 && popd | pushd PawPaw && source local.env win64 && popd | ||||
| #export PATH+=":/usr/i686-w64-mingw32/bin" | |||||
| #export LDFLAGS+="-L~/PawPawBuilds/targets/win64/lib32" | |||||
| #--mixed | |||||
| ./waf configure --platform=win32 --prefix="$(pwd)/destdir" --static | |||||
| export PATH+=":/usr/i686-w64-mingw32/bin" | |||||
| export LDFLAGS+="-L~/PawPawBuilds/targets/win64/lib32" | |||||
| ./waf configure --platform=win32 --prefix=$(pwd)/destdir --static --mixed | |||||
| ./waf build -j $(nproc) | ./waf build -j $(nproc) | ||||
| ./waf install | ./waf install | ||||
| - name: Generate MSVC lib files | - name: Generate MSVC lib files | ||||
| shell: bash | shell: bash | ||||
| run: | | run: | | ||||
| # 32bit | # 32bit | ||||
| #pushd $(pwd)/destdir/lib32 | |||||
| #llvm-dlltool -m i386 -D libjack.dll -d libjack.def -l libjack.lib | |||||
| #popd | |||||
| pushd $(pwd)/destdir/lib32 | |||||
| llvm-dlltool -m i386 -D libjack.dll -d libjack.def -l libjack.lib | |||||
| popd | |||||
| # 64bit | # 64bit | ||||
| pushd $(pwd)/destdir/lib | pushd $(pwd)/destdir/lib | ||||
| llvm-dlltool -m i386:x86-64 -D libjack64.dll -d libjack64.def -l libjack64.lib | llvm-dlltool -m i386:x86-64 -D libjack64.dll -d libjack64.def -l libjack64.lib | ||||