Haiku: Fix build on Windows and Android

er2off · er2off · commit 944c0097ad6e · 2023-02-09T16:46:29.000Z
diff --git a/appframework/wscript b/appframework/wscript
@@ -42,6 +42,7 @@ def build(bld):
 
 	includes = [
 		'.',
+		'../common',
 		'../public',
 		'../public/tier0',
 		'../public/tier1'
diff --git a/materialsystem/stdshaders/wscript b/materialsystem/stdshaders/wscript
@@ -141,6 +141,7 @@ def build(bld):
 
 	includes = [
 		'.',
+		'../../common',
 		'../../public',
 		'../../public/tier0',
 		'../../public/tier1',
diff --git a/public/sse2neon.h b/public/sse2neon.h
diff --git a/tier1/strtools.cpp b/tier1/strtools.cpp
@@ -2953,7 +2953,7 @@ extern "C" void qsort_s( void *base, size_t num, size_t width, int (*compare )(v
 
 void V_qsort_s( void *base, size_t num, size_t width, int ( __cdecl *compare )(void *, const void *, const void *), void * context ) 
 {
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(LINUX)
 	// the arguments are swapped 'round on the win32 - awesome, huh?
 	return qsort_s( base, num, width, compare, context );
 #else
diff --git a/togles/wscript b/togles/wscript
@@ -39,6 +39,7 @@ def build(bld):
 
 	includes = [
 		'.',
+		'../common',
 		'../public',
 		'../public/tier0',
 		'../public/tier1'
diff --git a/vgui2/src/wscript b/vgui2/src/wscript
@@ -53,7 +53,7 @@ def build(bld):
 		'../../public',
 		'../../public/tier0',
 		'../../public/tier1',
-		'../../common'
+		'../../common',
 	] + bld.env.INCLUDES_SDL2
 
 	defines = []
diff --git a/vgui2/vgui_controls/wscript b/vgui2/vgui_controls/wscript
@@ -97,6 +97,7 @@ def build(bld):
 
 	includes = [
 		'.',
+		'../../common',
 		'../../public',
 		'../../public/tier0',
 		'../../public/tier1'

Original file line number	Diff line number	Diff line change
`@@ -2953,7 +2953,7 @@ extern "C" void qsort_s( void base, size_t num, size_t width, int (compare )(v`
`2953`	`2953`
`2954`	`2954`	`void V_qsort_s( void base, size_t num, size_t width, int ( __cdecl compare )(void , const void , const void ), void context )`
`2955`	`2955`	`{`
`2956`		`-#if defined(_WIN32)`
	`2956`	`+#if defined(_WIN32) \|\| defined(LINUX)`
`2957`	`2957`	`// the arguments are swapped 'round on the win32 - awesome, huh?`
`2958`	`2958`	`return qsort_s( base, num, width, compare, context );`
`2959`	`2959`	`#else`