mustdie

dedicated_main/main.cpp

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

utils/unittest/unittest.cpp

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

utils/unittest/wscript

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

wscript

@@ -465,9 +465,14 @@ def configure(conf):
 	# installation paths
 	if conf.env.DEST_OS == 'android':
 		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:
 		conf.env.LIBDIR = conf.env.LIBDIR + '/srceng'
-		conf.env.TESTDIR = conf.env.BINDIR + 'tests'
+
+	conf.env.TESTDIR = conf.env.LIBDIR + '/tests'
 
 	flags = []