YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-29 16:24:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3 from nekonomicon/bsd

Browse Source 
*BSD-related fixes.
This commit is contained in:
Alibek Omarov 2018-11-05 18:25:05 +03:00 committed by GitHub
commit b1db062fbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/common/system.c
View File

@ -29,7 +29,6 @@ GNU General Public License for more details.
#include <dlfcn.h> #include <dlfcn.h>
#ifndef __ANDROID__ #ifndef __ANDROID__
extern char **environ;
#include <pwd.h> #include <pwd.h>
#endif #endif
#endif #endif
@ -299,7 +298,7 @@ void Sys_ShellExecute( const char *path, const char *parms, int shouldExit )
pid_t id = fork( ); pid_t id = fork( );
if( id == 0 ) if( id == 0 )
{ {
execve( xdgOpen, (char **)argv, environ ); execv( xdgOpen, (char **)argv );
fprintf( stderr, "error opening %s %s", xdgOpen, path ); fprintf( stderr, "error opening %s %s", xdgOpen, path );
_exit( 1 ); _exit( 1 );
} }

2
engine/platform/sdl/vid_sdl.c
View File

@ -878,6 +878,8 @@ qboolean R_Init_Video( void )
} }
GL_InitExtensions(); GL_InitExtensions();
return true;
} }
#ifdef XASH_GLES #ifdef XASH_GLES

12
wscript
View File

@ -87,14 +87,18 @@ def configure(conf):
Logs.warn('WARNING: 64-bit engine may be unstable') Logs.warn('WARNING: 64-bit engine may be unstable')
if(conf.env.COMPILER_CC != 'msvc'): if(conf.env.COMPILER_CC != 'msvc'):
if(conf.env.COMPILER_CC == 'gcc'): if(conf.env.COMPILER_CC == 'gcc') or (conf.env.COMPILER_CC == 'clang'):
conf.env.append_unique('LINKFLAGS', ['-Wl,--no-undefined']) conf.env.append_unique('LINKFLAGS', ['-Wl,--no-undefined'])
if(conf.options.RELEASE): if(conf.options.RELEASE):
conf.env.append_unique('CFLAGS', ['-O2']) conf.env.append_unique('CFLAGS', ['-O2'])
conf.env.append_unique('CXXFLAGS', ['-O2']) conf.env.append_unique('CXXFLAGS', ['-O2'])
else: elif(conf.env.COMPILER_CC == 'gcc'):
conf.env.append_unique('CFLAGS', ['-Og', '-g']) conf.env.append_unique('CFLAGS', ['-Og', '-g'])
conf.env.append_unique('CXXFLAGS', ['-Og', '-g']) conf.env.append_unique('CXXFLAGS', ['-Og', '-g'])
else:
conf.env.append_unique('CFLAGS', ['-O0', '-g', '-gdwarf-2'])
conf.env.append_unique('CXXFLAGS', ['-O0', '-g', '-gdwarf-2'])
if conf.options.GCC_COLORS: if conf.options.GCC_COLORS:
conf.env.append_unique('CFLAGS', ['-fdiagnostics-color=always']) conf.env.append_unique('CFLAGS', ['-fdiagnostics-color=always'])
conf.env.append_unique('CXXFLAGS', ['-fdiagnostics-color=always']) conf.env.append_unique('CXXFLAGS', ['-fdiagnostics-color=always'])
@ -113,8 +117,10 @@ def configure(conf):
# TODO: wrapper around bld.stlib, bld.shlib and so on? # TODO: wrapper around bld.stlib, bld.shlib and so on?
conf.env.MSVC_SUBSYSTEM = 'WINDOWS,5.01' conf.env.MSVC_SUBSYSTEM = 'WINDOWS,5.01'
if(conf.env.DEST_OS != 'win32'): if(conf.env.DEST_OS == 'linux'):
conf.check( lib='dl' ) conf.check( lib='dl' )
if(conf.env.DEST_OS != 'win32'):
conf.check( lib='m' ) conf.check( lib='m' )
conf.check( lib='pthread' ) conf.check( lib='pthread' )