Generically use cmake for build instead of make directly
This commit is contained in:
parent
eb7199cf13
commit
08bf7c405d
3 changed files with 8 additions and 8 deletions
|
@ -23,9 +23,9 @@ build() {
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DBUILD_TESTING=OFF
|
-DBUILD_TESTING=OFF
|
||||||
|
|
||||||
make -C build
|
cmake --build build
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
make -C build DESTDIR="$pkgdir" install
|
DESTDIR="$pkgdir" cmake --install build
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@ build() {
|
||||||
-DCMAKE_INSTALL_LIBDIR=lib \
|
-DCMAKE_INSTALL_LIBDIR=lib \
|
||||||
-DCMAKE_INSTALL_DATADIR=/share \
|
-DCMAKE_INSTALL_DATADIR=/share \
|
||||||
-DCMAKE_BUILD_TYPE=Release
|
-DCMAKE_BUILD_TYPE=Release
|
||||||
make -C build
|
cmake --build build
|
||||||
|
|
||||||
export CFLAGS="-m32 ${CFLAGS}"
|
export CFLAGS="-m32 ${CFLAGS}"
|
||||||
export CXXFLAGS="-m32 ${CXXFLAGS}"
|
export CXXFLAGS="-m32 ${CXXFLAGS}"
|
||||||
|
@ -31,19 +31,19 @@ build() {
|
||||||
-DCMAKE_LIBRARY_PATH=/usr/lib32 \
|
-DCMAKE_LIBRARY_PATH=/usr/lib32 \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DBUILD_PLUGIN=OFF
|
-DBUILD_PLUGIN=OFF
|
||||||
make -C build32
|
cmake --build build32
|
||||||
}
|
}
|
||||||
|
|
||||||
package_obs-vkcapture() {
|
package_obs-vkcapture() {
|
||||||
pkgdesc='OBS Linux Vulkan/OpenGL game capture'
|
pkgdesc='OBS Linux Vulkan/OpenGL game capture'
|
||||||
|
|
||||||
make -C build DESTDIR="$pkgdir" install
|
DESTDIR="$pkgdir" cmake --install build
|
||||||
}
|
}
|
||||||
|
|
||||||
package_lib32-obs-vkcapture() {
|
package_lib32-obs-vkcapture() {
|
||||||
pkgdesc='OBS Linux Vulkan/OpenGL game capture (32-bit)'
|
pkgdesc='OBS Linux Vulkan/OpenGL game capture (32-bit)'
|
||||||
depends=('lib32-vulkan-icd-loader' 'lib32-libgl')
|
depends=('lib32-vulkan-icd-loader' 'lib32-libgl')
|
||||||
|
|
||||||
make -C build32 DESTDIR="$pkgdir" install
|
DESTDIR="$pkgdir" cmake --install build32
|
||||||
rm -r "$pkgdir/usr/bin"
|
rm -r "$pkgdir/usr/bin"
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,9 +20,9 @@ build() {
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DBUILD_TESTING=OFF
|
-DBUILD_TESTING=OFF
|
||||||
|
|
||||||
make -C build
|
cmake --build build
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
make -C build DESTDIR="$pkgdir" install
|
DESTDIR="$pkgdir" cmake --install build
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue