Merge pull request #122 from PaulCombal/dev

Fix build (#121)
This commit is contained in:
PaulCombal 2022-01-24 21:24:36 +00:00 committed by GitHub
commit be64ba67b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions

View File

@ -5,7 +5,7 @@ name: Build CI
on: on:
push: push:
branches: [master] branches: [master, fix-*, feat-*]
tags: [v*] tags: [v*]
pull_request: pull_request:
types: [opened] types: [opened]
@ -25,5 +25,6 @@ jobs:
- run: sudo apt-get install -y libgtkmm-3.0-dev libcurl4-gnutls-dev libyajl-dev valgrind - run: sudo apt-get install -y libgtkmm-3.0-dev libcurl4-gnutls-dev libyajl-dev valgrind
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: make - run: make
- run: sudo make install
- run: make clean - run: make clean
- run: make dev - run: which samrewritten

View File

@ -28,13 +28,15 @@ clean:
.PHONY: install .PHONY: install
install: bin/launch.sh bin/samrewritten bin/libsteam_api.so install: bin/launch.sh bin/samrewritten bin/libsteam_api.so
# TODO: use install for all of these? mkdir -p ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/bin
mkdir -p ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/{bin,glade,assets} mkdir -p ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/glade
mkdir -p ${DESTDIR}${PREFIX}/share/icons/hicolor/{64x64,256x256}/apps mkdir -p ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/assets
mkdir -p ${DESTDIR}${PREFIX}/share/icons/hicolor/64x64/apps
mkdir -p ${DESTDIR}${PREFIX}/share/icons/hicolor/256x256/apps
mkdir -p ${DESTDIR}${PREFIX}/share/applications mkdir -p ${DESTDIR}${PREFIX}/share/applications
mkdir -p ${DESTDIR}${PREFIX}/bin mkdir -p ${DESTDIR}${PREFIX}/bin
cp $^ ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/bin/ cp $^ ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/bin/
ln -s ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/bin/launch.sh ${DESTDIR}${PREFIX}/bin/samrewritten ln -s ${PREFIX}/${LIBDIR}/SamRewritten/bin/launch.sh ${DESTDIR}${PREFIX}/bin/samrewritten
cp glade/main_window.glade ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/glade/main_window.glade cp glade/main_window.glade ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/glade/main_window.glade
cp assets/icon_64.png ${DESTDIR}${PREFIX}/share/icons/hicolor/64x64/apps/samrewritten.png cp assets/icon_64.png ${DESTDIR}${PREFIX}/share/icons/hicolor/64x64/apps/samrewritten.png
cp assets/icon_256.png ${DESTDIR}${PREFIX}/share/icons/hicolor/256x256/apps/samrewritten.png cp assets/icon_256.png ${DESTDIR}${PREFIX}/share/icons/hicolor/256x256/apps/samrewritten.png