From 0409107ee2df4c7aa0db0bd30a8d85fe3ef2d542 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 12 Jan 2019 02:56:24 +0300 Subject: [PATCH] scripts: appimage: fix generating extras.pak --- engine/common/host.c | 1 - engine/common/system.h | 1 + scripts/build_appimage.sh | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/engine/common/host.c b/engine/common/host.c index 14465290..24f968cc 100644 --- a/engine/common/host.c +++ b/engine/common/host.c @@ -983,7 +983,6 @@ int EXPORT Host_Main( int argc, char **argv, const char *progname, int bChangeGa if( Host_IsDedicated() ) { #ifdef _WIN32 - void Wcon_InitConsoleCommands( void ) // con_win.c Wcon_InitConsoleCommands (); #endif diff --git a/engine/common/system.h b/engine/common/system.h index 713a6fe2..f00a4c0b 100644 --- a/engine/common/system.h +++ b/engine/common/system.h @@ -117,6 +117,7 @@ int Sys_LogFileNo( void ); // con_win.c // #ifdef _WIN32 +void Wcon_InitConsoleCommands( void ); void Wcon_ShowConsole( qboolean show ); void Wcon_Print( const char *pMsg ); void Wcon_Init( void ); diff --git a/scripts/build_appimage.sh b/scripts/build_appimage.sh index 874eb4c6..4b57b000 100755 --- a/scripts/build_appimage.sh +++ b/scripts/build_appimage.sh @@ -6,12 +6,11 @@ APPDIR=$APP-i386.AppDir mkdir -p $APPDIR # Generate extras.pak -python3 scripts/makepak.py extras.pak +python3 scripts/makepak.py xash-extras/ $APPDIR/extras.pak # Copy all needed files cp SDL2_linux/lib/libSDL2-2.0.so.0 $APPDIR/ cp vgui-dev/lib/vgui.so $APPDIR/ -cp extras.pak $APPDIR/extras.pak cp build/engine/libxash.so \ build/mainui/libmenu.so \ build/vgui_support/libvgui_support.so \