ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2025-01-06 08:50:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'misc/lilium_common' into game/eliteforce

Browse source 
Conflicts:
	code/qcommon/common.c
	code/qcommon/q_shared.h
This commit is contained in:
Zack Middleton 2018-03-04 05:10:01 -06:00
commit 4a063679f8
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -46,6 +46,9 @@ endif
ifndef BUILD_RENDERER_OPENGL2 ifndef BUILD_RENDERER_OPENGL2
BUILD_RENDERER_OPENGL2= BUILD_RENDERER_OPENGL2=
endif endif
ifndef BUILD_FINAL
BUILD_FINAL =0
endif
ifndef BUILD_AUTOUPDATER # DON'T build unless you mean to! ifndef BUILD_AUTOUPDATER # DON'T build unless you mean to!
BUILD_AUTOUPDATER=0 BUILD_AUTOUPDATER=0
endif endif
@ -350,6 +353,8 @@ ifeq ($(SDL_CFLAGS),)
endif endif
endif endif
ifneq ($(BUILD_FINAL),1)
# Add git version info # Add git version info
USE_GIT= USE_GIT=
ifeq ($(wildcard .git),.git) ifeq ($(wildcard .git),.git)
@ -360,6 +365,8 @@ ifeq ($(wildcard .git),.git)
endif endif
endif endif
endif
############################################################################# #############################################################################
# SETUP AND BUILD -- LINUX # SETUP AND BUILD -- LINUX

3
code/qcommon/common.c
View file

@ -2788,9 +2788,6 @@ void Com_Init( char *commandLine ) {
if ( !com_homepath->string[0] ) { if ( !com_homepath->string[0] ) {
Cvar_ForceReset( "com_homepath" ); Cvar_ForceReset( "com_homepath" );
} }
if(!com_basegame->string[0])
Cvar_ForceReset("com_basegame");
FS_InitFilesystem (); FS_InitFilesystem ();

24
code/qcommon/q_shared.h
View file

@ -27,10 +27,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// A user mod should never modify this file // A user mod should never modify this file
#ifdef STANDALONE #ifdef STANDALONE
#define PRODUCT_NAME "iofoo3" #define PRODUCT_NAME "iofoo3"
#define BASEGAME "foobar" #define BASEGAME "foobar"
#define CLIENT_WINDOW_TITLE "changeme" #define CLIENT_WINDOW_TITLE "changeme"
#define CLIENT_WINDOW_MIN_TITLE "changeme2" #define CLIENT_WINDOW_MIN_TITLE "changeme2"
// GNU/Linux: $HOME/.local/share/homepath-name (lower case and spaces replaced with hyphens) // GNU/Linux: $HOME/.local/share/homepath-name (lower case and spaces replaced with hyphens)
// MacOS: $HOME/Library/Application Support/Homepath Name // MacOS: $HOME/Library/Application Support/Homepath Name
@ -44,10 +44,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define CINEMATICS_INTRO "intro.roq" #define CINEMATICS_INTRO "intro.roq"
// #define LEGACY_PROTOCOL // You probably don't need this for your standalone game // #define LEGACY_PROTOCOL // You probably don't need this for your standalone game
#elif defined ELITEFORCE #elif defined ELITEFORCE
#define PRODUCT_NAME "Lilium Voyager HM" #define PRODUCT_NAME "Lilium Voyager HM"
#define BASEGAME "baseEF" #define BASEGAME "baseEF"
#define CLIENT_WINDOW_TITLE "Lilium Voyager Holomatch" #define CLIENT_WINDOW_TITLE "Lilium Voyager Holomatch"
#define CLIENT_WINDOW_MIN_TITLE "liliumvoy" #define CLIENT_WINDOW_MIN_TITLE "liliumvoy"
// GNU/Linux: $HOME/.local/share/homepath-name (lower case and spaces replaced with hyphens) // GNU/Linux: $HOME/.local/share/homepath-name (lower case and spaces replaced with hyphens)
// MacOS: $HOME/Library/Application Support/Homepath Name // MacOS: $HOME/Library/Application Support/Homepath Name
@ -62,10 +62,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//#define CINEMATICS_INTRO "intro.bik" //#define CINEMATICS_INTRO "intro.bik"
#define LEGACY_PROTOCOL #define LEGACY_PROTOCOL
#else #else
#define PRODUCT_NAME "ioq3" #define PRODUCT_NAME "ioq3"
#define BASEGAME "baseq3" #define BASEGAME "baseq3"
#define CLIENT_WINDOW_TITLE "ioquake3" #define CLIENT_WINDOW_TITLE "ioquake3"
#define CLIENT_WINDOW_MIN_TITLE "ioq3" #define CLIENT_WINDOW_MIN_TITLE "ioq3"
// GNU/Linux: $HOME/.local/share/homepath-name (lower case and spaces replaced with hyphens) // GNU/Linux: $HOME/.local/share/homepath-name (lower case and spaces replaced with hyphens)
// MacOS: $HOME/Library/Application Support/Homepath Name // MacOS: $HOME/Library/Application Support/Homepath Name