mirror of
https://github.com/nillerusr/source-engine.git
synced 2025-04-21 02:17:29 +00:00
Merge c3fa16c9b7
into 29985681a1
This commit is contained in:
commit
af758a6f25
@ -24,7 +24,7 @@
|
|||||||
#include "tier1/utllinkedlist.h"
|
#include "tier1/utllinkedlist.h"
|
||||||
#include "togl/rendermechanism.h"
|
#include "togl/rendermechanism.h"
|
||||||
#include "appframework/ilaunchermgr.h" // gets pulled in from glmgr.h
|
#include "appframework/ilaunchermgr.h" // gets pulled in from glmgr.h
|
||||||
#include "appframework/iappsystemgroup.h"
|
#include "appframework/IAppSystemGroup.h"
|
||||||
#include "inputsystem/ButtonCode.h"
|
#include "inputsystem/ButtonCode.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ def build(bld):
|
|||||||
|
|
||||||
bld.shlib(
|
bld.shlib(
|
||||||
source = source,
|
source = source,
|
||||||
target = PROJECT_NAME,
|
target = PROJECT_NAME.lower() if bld.env.DEST_OS == 'darwin' else PROJECT_NAME,
|
||||||
name = PROJECT_NAME,
|
name = PROJECT_NAME,
|
||||||
features = 'c cxx',
|
features = 'c cxx',
|
||||||
includes = includes,
|
includes = includes,
|
||||||
|
7
wscript
7
wscript
@ -257,7 +257,12 @@ def define_platform(conf):
|
|||||||
'NO_HOOK_MALLOC',
|
'NO_HOOK_MALLOC',
|
||||||
'_DLL_EXT=.dylib'
|
'_DLL_EXT=.dylib'
|
||||||
])
|
])
|
||||||
|
conf.env.append_unique('INCLUDES', [
|
||||||
|
'/opt/local/include'
|
||||||
|
])
|
||||||
|
conf.env.append_unique('LINKFLAGS', [
|
||||||
|
'-L/opt/local/lib'
|
||||||
|
])
|
||||||
elif conf.env.DEST_OS in ['freebsd', 'openbsd', 'netbsd', 'dragonflybsd']: # Tested only in freebsd
|
elif conf.env.DEST_OS in ['freebsd', 'openbsd', 'netbsd', 'dragonflybsd']: # Tested only in freebsd
|
||||||
conf.env.append_unique('DEFINES', [
|
conf.env.append_unique('DEFINES', [
|
||||||
'POSIX=1', '_POSIX=1', 'PLATFORM_POSIX=1',
|
'POSIX=1', '_POSIX=1', 'PLATFORM_POSIX=1',
|
||||||
|
Loading…
Reference in New Issue
Block a user