ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #200 from mjbudd77/master 

SDL linux desktop integration updates
This commit is contained in:
mjbudd77 2020-10-23 00:29:02 -04:00 committed by GitHub
parent 8cc4ea302a 4c4d1f9ce3
commit cb28e8d425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fceux.desktop
View File

@ -6,7 +6,7 @@ GenericName=NES/Famicom emulator
NoDisplay=false
Comment=Emulate NES ROMs
Exec=/usr/bin/fceux
Icon=/usr/share/pixmaps/fceux.png
Icon=/usr/share/pixmaps/fceux1.png
Terminal=false
MimeType=application/x-nes-rom
Categories=Game;Emulator;

BIN
fceux.icns
View File

Binary file not shown.

BIN
fceux1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 83 KiB

11
pipelines/linux_build.sh
View File

@ -89,28 +89,27 @@ echo '**************************'
echo '*** Building Project ***'
echo '**************************'
mkdir -p $INSTALL_PREFIX/usr;
#scons --clean
#scons GTK3=1 SYSTEM_LUA=1 SYSTEM_MINIZIP=1 CREATE_AVI=1 install --prefix=$INSTALL_PREFIX/usr
echo "Num CPU: `nproc`";
mkdir buildQT; cd buildQT;
cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX/usr \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
..
make -j `nproc`
make install
make install DESTDIR=$INSTALL_PREFIX
cd ..;
mkdir buildGTK; cd buildGTK;
cmake \
-DGTK=1 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX/usr \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
..
make -j `nproc`
make install
make install DESTDIR=$INSTALL_PREFIX
# Install Files
#cd .. # cd out of build

20
scripts/linux_makeIcons.sh Executable file
View File

@ -0,0 +1,20 @@
#!/bin/bash
SRC_PNG=../fceux1.png
ICON_PATH=/usr/share/icons/hicolor
convert -resize 32x32 $SRC_PNG fceux-32x32.png
convert -resize 48x48 $SRC_PNG fceux-48x48.png
convert -resize 64x64 $SRC_PNG fceux-64x64.png
convert -resize 72x72 $SRC_PNG fceux-72x72.png
convert -resize 96x96 $SRC_PNG fceux-96x96.png
convert -resize 128x128 $SRC_PNG fceux-128x128.png
convert -resize 256x256 $SRC_PNG fceux-256x256.png
#sudo cp -f fceux-32x32.png $ICON_PATH/32x32/apps/fceux.png
#sudo cp -f fceux-48x48.png $ICON_PATH/48x48/apps/fceux.png
#sudo cp -f fceux-64x64.png $ICON_PATH/64x64/apps/fceux.png
#sudo cp -f fceux-72x72.png $ICON_PATH/72x72/apps/fceux.png
#sudo cp -f fceux-96x96.png $ICON_PATH/96x96/apps/fceux.png
#sudo cp -f fceux-128x128.png $ICON_PATH/128x128/apps/fceux.png
#sudo cp -f fceux-256x256.png $ICON_PATH/256x256/apps/fceux.png

2
src/CMakeLists.txt
View File

@ -537,7 +537,7 @@ install( TARGETS ${APP_NAME}
install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/auxlib.lua DESTINATION share/fceux/luaScripts )
install( DIRECTORY ${CMAKE_SOURCE_DIR}/output/. DESTINATION share/fceux )
install( FILES ${CMAKE_SOURCE_DIR}/fceux.png DESTINATION share/pixmaps )
install( FILES ${CMAKE_SOURCE_DIR}/fceux1.png DESTINATION share/pixmaps )
install( FILES ${CMAKE_SOURCE_DIR}/fceux.desktop DESTINATION share/applications )
install( FILES ${CMAKE_SOURCE_DIR}/documentation/fceux.6 DESTINATION share/man/man6 )
install( FILES ${CMAKE_SOURCE_DIR}/documentation/fceux-net-server.6 DESTINATION share/man/man6 )