diff --git a/engine/code/q3_ui/ui_menu.c b/engine/code/q3_ui/ui_menu.c index e5661be1..80a84f75 100644 --- a/engine/code/q3_ui/ui_menu.c +++ b/engine/code/q3_ui/ui_menu.c @@ -428,14 +428,14 @@ static void Main_MenuDraw( void ) { // STONELANCE UI_DrawProportionalString( 320, 432, "DEMO FOR MATURE AUDIENCES DEMO", UI_CENTER|UI_SMALLFONT, text_color_normal ); //UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2009 New Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); - UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2016 Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); + UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2018 | 16 Years of Q3R | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal ); // UI_DrawProportionalString( 320, 372, "DEMO FOR MATURE AUDIENCES DEMO", UI_CENTER|UI_SMALLFONT, color ); // UI_DrawString( 320, 400, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color ); // END } else { // STONELANCE //UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2009 New Team Q3Rally | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); - UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2017 | 15 Years of Q3R | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal ); + UI_DrawString( 320, 460, Q3_VERSION " (c) 2002 - 2018 | 16 Years of Q3R | www.q3rally.com | It's damn fast baby!", UI_CENTER|UI_SMALLFONT, text_color_normal ); // UI_DrawString( 320, 450, "Quake III Arena(c) 1999-2000, Id Software, Inc. All Rights Reserved", UI_CENTER|UI_SMALLFONT, color ); // END } diff --git a/engine/code/q3_ui/ui_rally_credits.c b/engine/code/q3_ui/ui_rally_credits.c index b024560d..0fbba101 100644 --- a/engine/code/q3_ui/ui_rally_credits.c +++ b/engine/code/q3_ui/ui_rally_credits.c @@ -99,7 +99,7 @@ static void UI_Rally_CreditMenu_Draw( void ) { UI_DrawProportionalString( 320, y, "Cyberdemon, Killaz and skw|d", UI_CENTER|UI_SMALLFONT, color_white ); y += 2.0 * PROP_HEIGHT * PROP_SMALL_SIZE_SCALE; - UI_DrawString( 320, y, Q3_VERSION " (c) 2002 - 2017 | 15 Years of Q3R | www.q3rally.com", UI_CENTER|UI_SMALLFONT, text_color_normal ); + UI_DrawString( 320, y, Q3_VERSION " (c) 2002 - 2018 | 16 Years of Q3R | www.q3rally.com | It's damn fast baby!, UI_CENTER|UI_SMALLFONT, text_color_normal ); } diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index e72d5358..dcf8cd06 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define BASETA "missionpack" #ifndef PRODUCT_VERSION -#define PRODUCT_VERSION "v0.0.1.0 r214" +#define PRODUCT_VERSION "v0.0.1.0 r215" #endif #ifndef PRODUCT_DATE diff --git a/engine/make-linux-portable.sh b/engine/make-linux-portable.sh new file mode 100644 index 00000000..2ada74cb --- /dev/null +++ b/engine/make-linux-portable.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +if [ -z "$1" ]; then + echo "Usage: $0 [make options]" + echo " arch can be x86 or x86_64" + exit 0 +fi + +ARCH=$1 +SDL_PREFIX=/home/zack/Local/SDL-2.0.4/build-$ARCH + +if [ ! -d $SDL_PREFIX ] ; then + echo "Change SDL_PREFIX in $0 to point to SDL build output" + exit 0 +fi + +SDL_CFLAGS="`$SDL_PREFIX/bin/sdl2-config --cflags`" +SDL_LIBS="`$SDL_PREFIX/bin/sdl2-config --libs`" + +# Don't pass arch ($1) to make in $* +shift 1 + +make ARCH=$ARCH USE_PORTABLE_RPATH=1 SDL_CFLAGS="$SDL_CFLAGS" SDL_LIBS="$SDL_LIBS" $* + +# Copy SDL lib to where spearmint will read it from +#mkdir -p build/release-linux-$ARCH/lib/$ARCH/ +#cp $SDL_PREFIX/lib/libSDL2-2.0.so.0 build/release-linux-$ARCH/lib/$ARCH/ \ No newline at end of file diff --git a/q3rallycode.ppr b/q3rallycode.ppr index 9cf25d51..508017de 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -859,9 +859,17 @@ q3rallycode engine\cross-make-mingw64.sh [Open project files] 0=engine\code\qcommon\q_shared.h +1=engine\code\q3_ui\ui_menu.c +2=engine\code\q3_ui\ui_rally_credits.c [Selected Project Files] Main= Selected=engine\code\qcommon\q_shared.h [engine\code\qcommon\q_shared.h] -TopLine=51 +TopLine=47 Caret=39,70 +[engine\code\q3_ui\ui_menu.c] +TopLine=422 +Caret=63,431 +[engine\code\q3_ui\ui_rally_credits.c] +TopLine=84 +Caret=65,102