d4708/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2025-03-12 13:41:59 +00:00
Code Issues Projects Releases Wiki Activity

mustdie

Browse Source
This commit is contained in:
Er2 2023-05-01 14:40:38 +03:00
parent 4147bb5817
commit 36cc43902b
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dedicated_main/main.cpp
View File

@ -212,7 +212,7 @@ int main( int argc, char *argv[] )
if ( !dedicated ) if ( !dedicated )
{ {
printf( "Failed to open %s (%s)\n", pBinaryName, dlerror()); printf( "Failed to open dedicated" DLL_EXT_STRING " (%s)\n", dlerror());
return -1; return -1;
} }
DedicatedMain_t dedicated_main = (DedicatedMain_t)dlsym( dedicated, "DedicatedMain" ); DedicatedMain_t dedicated_main = (DedicatedMain_t)dlsym( dedicated, "DedicatedMain" );

4
utils/unittest/unittest.cpp
View File

@ -94,7 +94,7 @@ bool CUnitTestApp::Create()
#ifdef WIN32 #ifdef WIN32
WIN32_FIND_DATA findFileData; WIN32_FIND_DATA findFileData;
HANDLE hFind= FindFirstFile("tests/*.dll", &findFileData); HANDLE hFind= FindFirstFile(LIBDIR "/tests/*.dll", &findFileData);
while (hFind != INVALID_HANDLE_VALUE) while (hFind != INVALID_HANDLE_VALUE)
{ {
@ -122,7 +122,7 @@ bool CUnitTestApp::Create()
#elif POSIX #elif POSIX
DIR *d; DIR *d;
struct dirent *dir; struct dirent *dir;
d = opendir("tests"); d = opendir(LIBDIR "/tests");
if (d) if (d)
{ {
while ((dir = readdir(d)) != NULL) while ((dir = readdir(d)) != NULL)

2
utils/unittest/wscript
View File

@ -17,7 +17,7 @@ def configure(conf):
def build(bld): def build(bld):
source = ['unittest.cpp'] source = ['unittest.cpp']
includes = ['../../public'] includes = ['../../public']
defines = [] defines = ['LIBDIR="%s"' % bld.env.LIBDIR]
libs = ['tier0', 'appframework', 'tier1', 'tier2','tier3', 'vstdlib', 'unitlib'] libs = ['tier0', 'appframework', 'tier1', 'tier2','tier3', 'vstdlib', 'unitlib']
if bld.env.DEST_OS != 'win32': if bld.env.DEST_OS != 'win32':

7
wscript
View File

@ -465,9 +465,14 @@ def configure(conf):
# installation paths # installation paths
if conf.env.DEST_OS == 'android': if conf.env.DEST_OS == 'android':
conf.env.LIBDIR = conf.env.BINDIR = conf.env.PREFIX conf.env.LIBDIR = conf.env.BINDIR = conf.env.PREFIX
elif conf.env.DEST_OS == 'win32':
# mustdie
conf.env.LIBDIR = conf.env.PREFIX + '/bin'
conf.env.BINDIR = conf.env.PREFIX
else: else:
conf.env.LIBDIR = conf.env.LIBDIR + '/srceng' conf.env.LIBDIR = conf.env.LIBDIR + '/srceng'
conf.env.TESTDIR = conf.env.BINDIR + 'tests'
conf.env.TESTDIR = conf.env.LIBDIR + '/tests'
flags = [] flags = []