Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Hexen 2, condense libs, fix ogg playback on JelOS #94

Merged
merged 2 commits into from
Feb 18, 2024
Merged

Update Hexen 2, condense libs, fix ogg playback on JelOS #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4394b6
Update Hexen 2 scripts, detect devices with triggers, condense libs t…
Slayer366 Feb 14, 2024
12ad44e
Update Hexen 2 shell scripts to check for existence of interfering li…
Slayer366 Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ports/hexen2/Hexen 2 - Portal of Praevus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ get_controls

GAMEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/hexen2"

if [ $DEVICE_NAME == 'x55' ] || [ $DEVICE_NAME == 'RG353P' ]; then
GPTOKEYB_CONFIG="$GAMEDIR/hexen2triggers.gptk"
else
GPTOKEYB_CONFIG="$GAMEDIR/hexen2.gptk"
fi

$ESUDO chmod 777 -R $GAMEDIR/*

ADDLPARAMS="-conwidth 340 -lm_2 +viewsize 120 +gl_glows 1 +gl_extra_dynamic_lights 1 +gl_missile_glows 1 +gl_other_glows 1 +gl_colored_dynamic_lights 1 +gl_coloredlight 2 +r_waterwarp 0 +showfps 0"
Expand All @@ -29,8 +35,8 @@ $ESUDO chmod 666 /dev/tty1
$ESUDO chmod 666 /dev/uinput

# System (Also prepare runtime directories for User and Pulse Audio)
export LD_LIBRARY_PATH=$GAMEDIR/sdl12-compat:$GAMEDIR/gl4es:$GAMEDIR/lib

export LD_LIBRARY_PATH=$GAMEDIR/lib:$LD_LIBRARY_PATH
[ -f "$GAMEDIR/lib/libasound.so.2" ] && $ESUDO rm -f $GAMEDIR/lib/libasound.so.2 $GAMEDIR/lib/libvorbis.so.0 $GAMEDIR/lib/libvorbisenc.so.2 $GAMEDIR/lib/libvorbisfile.so.3
export SDL_GAMECONTROLLERCONFIG="$sdl_controllerconfig"

# gl4es
Expand All @@ -44,7 +50,7 @@ $ESUDO rm $GAMEDIR/log.txt
$ESUDO rm -rf ~/.hexen2
$ESUDO ln -s /$GAMEDIR/conf/.hexen2 ~/

$GPTOKEYB "glhexen2" -c "$GAMEDIR/hexen2.gptk" &
$GPTOKEYB "glhexen2" -c "$GPTOKEYB_CONFIG" &
./glhexen2 -width $DISPLAY_WIDTH -height $DISPLAY_HEIGHT $ADDLPARAMS -basedir ./ $RUNMOD 2>&1 | tee -a ./log.txt

$ESUDO kill -9 $(pidof gptokeyb)
Expand Down
12 changes: 9 additions & 3 deletions ports/hexen2/Hexen 2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ get_controls

GAMEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/hexen2"

if [ $DEVICE_NAME == 'x55' ] || [ $DEVICE_NAME == 'RG353P' ]; then
GPTOKEYB_CONFIG="$GAMEDIR/hexen2triggers.gptk"
else
GPTOKEYB_CONFIG="$GAMEDIR/hexen2.gptk"
fi

$ESUDO chmod 777 -R $GAMEDIR/*

ADDLPARAMS="-conwidth 340 -lm_2 +viewsize 120 +gl_glows 1 +gl_extra_dynamic_lights 1 +gl_missile_glows 1 +gl_other_glows 1 +gl_colored_dynamic_lights 1 +gl_coloredlight 2 +r_waterwarp 0 +showfps 0"
Expand All @@ -29,8 +35,8 @@ $ESUDO chmod 666 /dev/tty1
$ESUDO chmod 666 /dev/uinput

# System
export LD_LIBRARY_PATH=$GAMEDIR/sdl12-compat:$GAMEDIR/gl4es:$GAMEDIR/lib

export LD_LIBRARY_PATH=$GAMEDIR/lib:$LD_LIBRARY_PATH
[ -f "$GAMEDIR/lib/libasound.so.2" ] && $ESUDO rm -f $GAMEDIR/lib/libasound.so.2 $GAMEDIR/lib/libvorbis.so.0 $GAMEDIR/lib/libvorbisenc.so.2 $GAMEDIR/lib/libvorbisfile.so.3
export SDL_GAMECONTROLLERCONFIG="$sdl_controllerconfig"

# gl4es
Expand All @@ -44,7 +50,7 @@ $ESUDO rm $GAMEDIR/log.txt
$ESUDO rm -rf ~/.hexen2
$ESUDO ln -s /$GAMEDIR/conf/.hexen2 ~/

$GPTOKEYB "glhexen2" -c "$GAMEDIR/hexen2.gptk" &
$GPTOKEYB "glhexen2" -c "$GPTOKEYB_CONFIG" &
./glhexen2 -width $DISPLAY_WIDTH -height $DISPLAY_HEIGHT $ADDLPARAMS -basedir ./ $RUNMOD 2>&1 | tee -a ./log.txt

$ESUDO kill -9 $(pidof gptokeyb)
Expand Down
0 ports/hexen2/hexen2/hexen2-353p.gptk → ports/hexen2/hexen2/hexen2triggers.gptk
View file
Open in desktop
File renamed without changes.
0 ports/hexen2/hexen2/gl4es/libEGL.so.1 → ports/hexen2/hexen2/lib/libEGL.so.1
View file
Open in desktop
File renamed without changes.
0 ports/hexen2/hexen2/gl4es/libGL.so.1 → ports/hexen2/hexen2/lib/libGL.so.1
View file
Open in desktop
File renamed without changes.
0 ports/hexen2/hexen2/gl4es/libGLEW.so.2.1 → ports/hexen2/hexen2/lib/libGLEW.so.2.1
View file
Open in desktop
File renamed without changes.
0 ports/hexen2/hexen2/gl4es/libGLU.so.1 → ports/hexen2/hexen2/lib/libGLU.so.1
View file
Open in desktop
File renamed without changes.
0 .../hexen2/hexen2/sdl12-compat/libSDL-1.2.so → ports/hexen2/hexen2/lib/libSDL-1.2.so
View file
Open in desktop
File renamed without changes.
0 ...exen2/hexen2/sdl12-compat/libSDL-1.2.so.0 → ports/hexen2/hexen2/lib/libSDL-1.2.so.0
View file
Open in desktop
File renamed without changes.
0 .../hexen2/sdl12-compat/libSDL-1.2.so.1.2.68 → ports/hexen2/hexen2/lib/libSDL-1.2.so.1.2.68
View file
Open in desktop
File renamed without changes.
Binary file removed ports/hexen2/hexen2/lib/libasound.so.2
View file
Open in desktop
Binary file not shown.
Binary file removed ports/hexen2/hexen2/lib/libvorbis.so.0
View file
Open in desktop
Binary file not shown.
Binary file removed ports/hexen2/hexen2/lib/libvorbisenc.so.2
View file
Open in desktop
Binary file not shown.
Binary file removed ports/hexen2/hexen2/lib/libvorbisfile.so.3
View file
Open in desktop
Binary file not shown.
Loading