Merge pull request #142 from exstrim401/macos

macOS build support

Author: nillerusr

appframework/wscript

@@ -18,13 +18,17 @@ def build(bld):
 	source = [
 		'AppSystemGroup.cpp',
 		'../public/filesystem_init.cpp',
-#		'glmrendererinfo_osx.mm'		[$OSXALL]
 	]
 
 	if bld.env.SDL:
 		source += [
 			'sdlmgr.cpp'
 		]
+	
+	if bld.env.DEST_OS == 'darwin':
+		source += [
+			'glmrendererinfo_osx.mm'
+		]
 
 	if bld.env.DEST_OS == 'win32':
 		source += [

engine/wscript

@@ -15,6 +15,9 @@ def configure(conf):
 	if conf.options.DEDICATED:
 		conf.define('SWDS', 1)
 		conf.define('NO_STEAM', 1)
+	else:
+		if conf.env.DEST_OS == 'darwin':
+			conf.define('HAVE_OPENAL', 1)
 
 	conf.env.append_unique('DEFINES',[
 		'__USEA3D',
@@ -204,9 +207,17 @@ def build(bld):
 
 	if bld.env.SDL:
 		source += [
-			'audio/snd_dev_sdl.cpp',		#[$SDL && !$OSXALL]
 			'audio/voice_record_sdl.cpp' #[$OSXALL||$LINUXALL]
 		]
+		if bld.env.DEST_OS != "darwin":
+			source += ['audio/snd_dev_sdl.cpp']
+	
+	if bld.env.DEST_OS == 'darwin':
+		source += [
+			'audio/snd_dev_openal.cpp', # [$OSXALL]
+			'audio/snd_dev_mac_audioqueue.cpp',#	[$OSXALL]
+			'audio/voice_record_mac_audioqueue.cpp',	#[$OSXALL]
+		]
 
 	if bld.env.DEST_OS == 'win32':
 		source += [	
@@ -352,6 +363,8 @@ def build(bld):
 		libs += ['SSL', 'CRYPTO'] # android curl was built with openssl
 	elif bld.env.DEST_OS == 'win32':
 		libs += ['USER32', 'WINMM', 'WININET', 'DSOUND', 'DXGUID', 'GDI32', 'bzip2']
+	elif bld.env.DEST_OS == 'darwin':
+		libs += ['APPKIT', 'COREAUDIO', 'AUDIOTOOLBOX', 'SYSTEMCONFIGURATION']
 
 	install_path = bld.env.LIBDIR
 

launcher/wscript

@@ -45,6 +45,8 @@ def build(bld):
 
 	if bld.env.DEST_OS == 'win32':
 		libs += ['USER32', 'OLE32', 'SHELL32']
+	elif bld.env.DEST_OS == 'darwin':
+		libs += ['FOUNDATION', 'APPKIT', 'IOKIT']
 
 	install_path = bld.env.LIBDIR
 

mathlib/3dnow.cpp

@@ -16,7 +16,7 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
-#if !defined(COMPILER_MSVC64) && !defined(LINUX)
+#if !defined(COMPILER_MSVC64) && !defined(LINUX) && !defined(OSX)
 // Implement for 64-bit Windows if needed.
 // Clang hits "fatal error: error in backend:" and other errors when trying
 // to compile the inline assembly below. 3DNow support is highly unlikely to

public/tier0/platform.h

@@ -1038,7 +1038,7 @@ inline T QWordSwapC( T dw )
 // The typically used methods.
 //-------------------------------------
 
-#if (defined(__i386__) || defined(__amd64__) || (defined(__arm__) && defined(ANDROID))) && !defined(VALVE_LITTLE_ENDIAN)
+#if (defined(__i386__) || defined(__amd64__) || defined(__arm__) || defined(__aarch64__)) && !defined(VALVE_LITTLE_ENDIAN)
 #define VALVE_LITTLE_ENDIAN 1
 #endif
 

public/togl/linuxwin/cglmtex.h

@@ -126,7 +126,6 @@ enum EGLMTexFlags
 	kGLMTexMultisampled	=	0x40,		// has an RBO backing it.  Cannot combine with Mipped, MippedAuto.  One slice maximum, only targeting GL_TEXTURE_2D.
 										// actually not 100% positive on the mipmapping, the RBO itself can't be mipped, but the resulting texture could
 										// have mipmaps generated.
-	kGLMTexDynamic		=	0x80
 };
 
 //===============================================================================
@@ -205,7 +204,6 @@ struct GLMTexLockParams
 	// tells GLM to force re-read of the texels back from GL
 	// i.e. "I know I stepped on those texels with a draw or blit - the GLM copy is stale"
 	bool		m_readback;
-	bool		m_readonly;
 };
 
 struct GLMTexLockDesc
@@ -487,7 +485,7 @@ class CGLMTex
 	int						CalcSliceIndex( int face, int mip );
 	void					CalcTexelDataOffsetAndStrides( int sliceIndex, int x, int y, int z, int *offsetOut, int *yStrideOut, int *zStrideOut );
 
-	GLubyte					*ReadTexels( GLMTexLockDesc *desc, bool readWholeSlice=true, bool readOnly=false );
+	void					ReadTexels( GLMTexLockDesc *desc, bool readWholeSlice=true );
 	void					WriteTexels( GLMTexLockDesc *desc, bool writeWholeSlice=true, bool noDataWrite=false );
 		// last param lets us send NULL data ptr (only legal with uncompressed formats, beware)
 		// this helps out ResetSRGB.
@@ -507,8 +505,6 @@ class CGLMTex
 		// noWrite means send NULL for texel source addresses instead of actual data - ideal for RT's
 
 	GLuint					m_texName;			// name of this texture in the context
-	GLuint					m_pbo;
-	GLubyte					*m_mapped;
 	GLenum					m_texGLTarget;
 	uint					m_nSamplerType;		// SAMPLER_2D, etc.
 

public/togl/linuxwin/glfuncs.h

@@ -63,7 +63,7 @@ GL_FUNC_VOID(OpenGL,true,glDrawArrays,(GLenum a,GLint b,GLsizei c),(a,b,c))
 GL_FUNC_VOID(OpenGL,true,glDrawBuffer,(GLenum a),(a))
 GL_FUNC_VOID(OpenGL,true,glDrawBuffers,(GLsizei a,const GLenum *b),(a,b))
 GL_FUNC_VOID(OpenGL,true,glDrawRangeElements,(GLenum a,GLuint b,GLuint c,GLsizei d,GLenum e,const GLvoid *f),(a,b,c,d,e,f))
-#ifndef OSX // 10.6/GL 2.1 compatability
+#if 1 //ifndef OSX // 10.6/GL 2.1 compatability
 GL_FUNC_VOID(OpenGL,true,glDrawRangeElementsBaseVertex,(GLenum a,GLuint b,GLuint c,GLsizei d,GLenum e,const GLvoid *f, GLenum g),(a,b,c,d,e,f,g))
 #endif
 GL_FUNC_VOID(OpenGL,true,glEnable,(GLenum a),(a))

public/togl/linuxwin/glmgr.h

@@ -1451,7 +1451,7 @@ class GLMContext
 		void FlushDrawStatesNoShaders();
 
 		// drawing
-#ifndef OSX
+#if 1 //ifndef OSX
 		FORCEINLINE void DrawRangeElements(	GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, uint baseVertex, CGLMBuffer *pIndexBuf );
 		void DrawRangeElementsNonInline(	GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, uint baseVertex, CGLMBuffer *pIndexBuf );
 #else
@@ -1911,7 +1911,7 @@ class GLMContext
 	CTSQueue<CGLMTex*> m_DeleteTextureQueue;
 };
 
-#ifndef OSX
+#if 1 //ifndef OSX
 
 FORCEINLINE void GLMContext::DrawRangeElements(	GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, uint baseVertex, CGLMBuffer *pIndexBuf )
 {

public/togles/linuxwin/glfuncs.h

@@ -66,7 +66,7 @@ GL_FUNC_VOID(OpenGL,true,glWaitSync,(GLsync a, GLbitfield b, GLuint64 c),(a,b,c)
 GL_FUNC_VOID(OpenGL,true,glDeleteSync,(GLsync a),(a))
 GL_FUNC(OpenGL,true,GLsync,glFenceSync,(GLenum a, GLbitfield b),(a,b))
 
-#ifndef OSX // 10.6/GL 2.1 compatability
+#if 1 //ifndef OSX // 10.6/GL 2.1 compatability
 GL_FUNC_VOID(OpenGL,true,glDrawRangeElementsBaseVertex,(GLenum a,GLuint b,GLuint c,GLsizei d,GLenum e,const GLvoid *f, GLenum g),(a,b,c,d,e,f,g))
 #endif
 GL_FUNC_VOID(OpenGL,true,glEnable,(GLenum a),(a))

public/togles/linuxwin/glmgr.h

@@ -1365,7 +1365,7 @@ class GLMContext
 		void FlushDrawStatesNoShaders();
 
 		// drawing
-#ifndef OSX
+#if 1 //ifndef OSX
 		FORCEINLINE void DrawRangeElements(	GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, uint baseVertex, CGLMBuffer *pIndexBuf );
 		void DrawRangeElementsNonInline(	GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, uint baseVertex, CGLMBuffer *pIndexBuf );
 #else
@@ -1815,7 +1815,7 @@ class GLMContext
 	CTSQueue<CGLMTex*> m_DeleteTextureQueue;
 };
 
-#ifndef OSX
+#if 1 //ifndef OSX
 
 FORCEINLINE void GLMContext::DrawRangeElements(	GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, uint baseVertex, CGLMBuffer *pIndexBuf )
 {