diff --git a/.gitignore b/.gitignore index 460ac632c..f30f90b3e 100644 --- a/.gitignore +++ b/.gitignore @@ -32,8 +32,6 @@ tools/amigaMXextract tools/extractpak opendune.opk -opk/libpulse.so.0 -opk/libjson-c.so.2 -opk/libpulsecommon-5.0.so opk/opendune -.vscode \ No newline at end of file +opk2 +.vscode diff --git a/build_rg350.sh b/build_rg350.sh index a2ced4e94..38a6c4fc3 100644 --- a/build_rg350.sh +++ b/build_rg350.sh @@ -3,14 +3,14 @@ # With SDL2 instead of SDL # Normal mode -./configure --with-pulse="0" --with-sdl="0" --with-sdl2="1" CC="/opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-gcc" CFLAGS="-D_POSIX_C_SOURCE -D__GCW0__" CFLAGS_BUILD="-D_POSIX_C_SOURCE -D__GCW0__" +./configure --with-sdl2 --with-asound --without-oss --without-pulse --without-munt CC="/opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-gcc" CFLAGS="-D_POSIX_C_SOURCE -D__GCW0__" CFLAGS_BUILD="-D_POSIX_C_SOURCE -D__GCW0__" # Debug mode -#./configure --with-pulse="0" --with-sdl="0" --with-sdl2="1" CC="/opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-gcc" CFLAGS="-D_POSIX_C_SOURCE -D__GCW0__ -D_DEBUG" CFLAGS_BUILD="-D_POSIX_C_SOURCE -D__GCW0__ -D_DEBUG" +#./configure --with-sdl2 --with-asound --without-oss --without-pulse --without-munt CC="/opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-gcc" CFLAGS="-D_POSIX_C_SOURCE -D__GCW0__ -D_DEBUG" CFLAGS_BUILD="-D_POSIX_C_SOURCE -D__GCW0__ -D_DEBUG" make all cp objs/release/opendune opk rm -f opendune.opk mksquashfs opk opendune.opk -# lftp -e "cd /apps;put opendune.opk;quit" 10.1.1.2 +lftp -e "cd /apps;put opendune.opk;quit" 10.1.1.2 diff --git a/opk/default.gcw0.desktop b/opk/default.gcw0.desktop index 8bf1caed0..a58342338 100644 --- a/opk/default.gcw0.desktop +++ b/opk/default.gcw0.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=OpenDune Comment=OpenDune for RG350 -Exec=opendune +Exec=./opendune.sh Terminal=false Type=games StartupNotify=true diff --git a/opk/opendune.sh b/opk/opendune.sh new file mode 100644 index 000000000..f6d3d9d33 --- /dev/null +++ b/opk/opendune.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH +cd `dirname $0` + +#mkdir -p /usr/local/share/timidity +#cp ./timidity.cfg /usr/local/share/timidity + +#./timidity -iA & +./opendune +#killall timidity