ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2025-01-07 17:30:50 +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

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