Partial OSX support

2026-09-28 00:00:03 +02:00 · 2016-01-22 22:23:05 +11:00
parent 940ca0c117
commit 318eb70605
73 changed files with 91 additions and 77 deletions
@@ -68,6 +68,8 @@ if(NOT WIN32)
        -DPOSIX=1
        -DXWINDOWS=1
    )
+    find_package(X11 REQUIRED)
+    include_directories(${X11_INCLUDE_DIR})
 else()
    add_definitions(
        -D_WIN32
@@ -4,6 +4,8 @@ if(PKG_CONFIG_FOUND)
    pkg_check_modules(GTK gtk+-2.0)
    if(WIN32)
        pkg_check_modules(GTKGL gtkglext-win32-1.0)
+    elseif(APPLE)
+        pkg_check_modules(GTKGL gtkglext-quartz-1.0)
    else()
        pkg_check_modules(GTKGL gtkglext-x11-1.0)
    endif()
@@ -25,7 +25,7 @@
 #define AFX_DPATCH_H__26C6B083_CE5B_420B_836B_1DDA733C04CE__INCLUDED_

 #include <list>
-#include <stdlib.h>
+#include <cstdlib>

 typedef struct
 {
@@ -28,7 +28,7 @@
 #pragma once
 #endif // _MSC_VER > 1000

-#include <stdlib.h>
+#include <cstdlib>
 #include "mathlib.h"
 #include "DMap.h"
 class DBrush;
@@ -20,6 +20,7 @@
 #ifndef __DTREE_H__
 #define __DTREE_H__

+#include <cstdlib>
 #include "qerplugin.h"
 #include "signal/isignal.h"
 #include "string/string.h"
@@ -20,6 +20,7 @@
 #include "dialogs-gtk.h"
 #include "../funchandlers.h"

+#include <cstdlib>
 #include "str.h"
 #include <list>
 #include <gtk/gtk.h>
@@ -45,6 +45,8 @@
 #include "scenelib.h"
 #include "texturelib.h"

+#include <cstdlib>
+
 //#include "dialogs-gtk.h"

 /************************
@@ -58,10 +60,10 @@
       / |   / |
      /  |  /  |
    4 ----- 6  |
- |  2|_|___|8
- |  /  |   /
- | /   |  /       ----> WEST, definitely
- ||/    | /
+     |  2|_|___|8
+     |  /  |   /
+     | /   |  /       ----> WEST, definitely
+     |/    | /
    1|_____|/3

 */
@@ -8,6 +8,7 @@
 #include "bsploader.h"

 #include <list>
+#include <cstdlib>

 typedef struct {
 	int portalclusters;
@@ -209,7 +210,7 @@ std::list<DWinding*> *CreateTrace( dleaf_t *leaf, int c, vis_header *header, byt
 		}
 	}

-	delete repeatlist;
+	delete[] repeatlist;

 	return pointlist;
 }
@@ -18,7 +18,7 @@
 */

 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <math.h>
 #include "gensurf.h"

@@ -24,7 +24,7 @@
 #define REAL double
 #endif /* not SINGLE */

-#include <stdlib.h>
+#include <cstdlib>
 #include <stdio.h>
 #include <math.h>
 #include "gensurf.h"
@@ -17,7 +17,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

-#include <stdlib.h>
+#include <cstdlib>
 #include <math.h>
 #include "gensurf.h"

@@ -26,7 +26,7 @@
 // Leonardo Zide (leo@lokigames.com)
 //

-#include <stdlib.h>
+#include <cstdlib>
 #include "gensurf.h"

 static const unsigned char data[2048] = {
@@ -19,7 +19,7 @@

 #include <gtk/gtk.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <string.h>
 #include <math.h>
 #include "gensurf.h"
@@ -18,7 +18,7 @@
 */

 #include <math.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <stdio.h>
 #include "gensurf.h"

@@ -19,7 +19,7 @@

 #include <gtk/gtk.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 /*
   #include <string.h>
   #include <tchar.h>
@@ -17,7 +17,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

-#include <stdlib.h>
+#include <cstdlib>
 #include <math.h>
 #include <stdio.h>
 #include "gensurf.h"
@@ -19,7 +19,7 @@

 #include <math.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include "gensurf.h"

 #undef ISOMETRIC
@@ -37,7 +37,7 @@

 #include <gtk/gtk.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>

 #include "iplugin.h"

@@ -19,7 +19,7 @@

 #include "portals.h"
 #include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
 #ifndef __APPLE__
 #include <search.h>
 #endif
@@ -20,7 +20,7 @@

 #include "prtview.h"
 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>

 #include "profile/profile.h"

@@ -19,6 +19,7 @@
 */

 #include "sunplug.h"
+#include <cstdlib>

 #include "debugging/debugging.h"

@@ -25,6 +25,7 @@

 #include "string/string.h"
 #include <list>
+#include <cstdlib>

 class Level;

@@ -35,6 +35,7 @@

 #if defined ( POSIX )

+#include <cstdlib>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -23,7 +23,7 @@
 #define INCLUDED_ECLASSLIB_H

 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <list>
 #include <map>
 #include <vector>
@@ -23,7 +23,7 @@
 #define INCLUDED_GTKUTIL_ENTRY_H

 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <gtk/gtkentry.h>

 inline void entry_set_string( GtkEntry* entry, const char* string ){
@@ -25,7 +25,7 @@
 #include "iimage.h"
 #include "iarchive.h"
 #include "idatastream.h"
-#include <stdlib.h>
+#include <cstdlib>

 struct RGBAPixel
 {
@@ -31,7 +31,7 @@

 #include <windows.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <string.h>
 #include "l_net.h"
 #include "l_net_wins.h"
@@ -38,7 +38,7 @@
 #include "file.h"

 #include <memory.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <string.h>
 #include <stdarg.h>

@@ -42,7 +42,7 @@

 #include "file.h"

-#include <stdlib.h>
+#include <cstdlib>

 #include "str.h"

@@ -25,7 +25,7 @@
 #include "iselection.h"
 #include "generic/callback.h"
 #include "scenelib.h"
-#include <stdlib.h>
+#include <cstdlib>

 class SelectableBool : public Selectable
 {
@@ -22,7 +22,7 @@
 #ifndef __MATH_ANGLES_H__
 #define __MATH_ANGLES_H__

-#include <stdlib.h>
+#include <cstdlib>
 #include <assert.h>

 #include "math_vector.h"
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <time.h>
 #include <ctype.h>

@@ -62,7 +62,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <time.h>
 #include <ctype.h>
 #ifdef WIN32                // mac doesn't have malloc.h
@@ -228,11 +228,6 @@ typedef enum {
 #define MAX_QINT            0x7fffffff
 #define MIN_QINT            ( -MAX_QINT - 1 )

-#ifndef max
-#define max( x, y ) ( ( ( x ) > ( y ) ) ? ( x ) : ( y ) )
-#define min( x, y ) ( ( ( x ) < ( y ) ) ? ( x ) : ( y ) )
-#endif
-
 #ifndef sign
 #define sign( f )   ( ( f > 0 ) ? 1 : ( ( f < 0 ) ? -1 : 0 ) )
 #endif
@@ -22,7 +22,7 @@
 #ifndef __UTIL_LIST_H__
 #define __UTIL_LIST_H__

-#include <stdlib.h>
+#include <cstdlib>
 #include <assert.h>

 template< class type >
@@ -22,7 +22,7 @@
 //need to rewrite this

 #include "util_str.h"
-#include <stdlib.h>
+#include <cstdlib>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -22,7 +22,7 @@
 #if !defined ( INCLUDED_STRINGIO_H )
 #define INCLUDED_STRINGIO_H

-#include <stdlib.h>
+#include <cstdlib>
 #include <cctype>

 #include "generic/vector.h"
@@ -22,6 +22,7 @@
 #if !defined( INCLUDED_UNIQUENAMES_H )
 #define INCLUDED_UNIQUENAMES_H

+#include <cstdlib>
 #include "debugging/debugging.h"
 #include <map>
 #include "string/string.h"
@@ -36,7 +36,7 @@

 #include "light.h"

-#include <stdlib.h>
+#include <cstdlib>

 #include "cullable.h"
 #include "renderable.h"
@@ -21,7 +21,7 @@

 #include "dds.h"

-#include <stdlib.h>
+#include <cstdlib>

 #include "ifilesystem.h"
 #include "iarchive.h"
@@ -37,7 +37,7 @@
 #include "jpeg.h"

 #include <setjmp.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <stdio.h>
 #include <string.h>

@@ -25,7 +25,7 @@

 typedef unsigned char byte;

-#include <stdlib.h>
+#include <cstdlib>

 #include "imagelib.h"
 #include "bytestreamutils.h"
@@ -27,7 +27,7 @@

 typedef unsigned char byte;

-#include <stdlib.h>
+#include <cstdlib>

 #include "generic/bitfield.h"
 #include "imagelib.h"
@@ -29,7 +29,7 @@

 #include "hlw.h"

-#include <stdlib.h>
+#include <cstdlib>
 #include <string.h>
 #include <stdio.h>

@@ -21,7 +21,7 @@

 #include "mip.h"

-#include <stdlib.h>
+#include <cstdlib>
 #include <string.h>
 #include <stdio.h>

@@ -23,7 +23,7 @@

 #include "sprite.h"

-#include <stdlib.h>
+#include <cstdlib>
 #include <string.h>
 #include <stdio.h>

@@ -31,7 +31,7 @@
 // ====== PNG loader functionality ======

 #include "png.h"
-#include <stdlib.h>
+#include <cstdlib>

 void user_warning_fn( png_structp png_ptr, png_const_charp warning_msg ){
 	globalErrorStream() << "libpng warning: " << warning_msg << "\n";
@@ -22,7 +22,7 @@
 #include "mdlimage.h"

 #include <math.h>
-#include <stdlib.h>
+#include <cstdlib>

 #include "ifilesystem.h"
 #include "bytestreamutils.h"
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include "picomodel.h"
 typedef unsigned char byte;
-#include <stdlib.h>
+#include <cstdlib>
 #include <algorithm>
 #include <list>

@@ -37,7 +37,7 @@
 #include "shaders.h"

 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <map>
 #include <list>

@@ -26,7 +26,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>

 #if !defined( WIN32 )

@@ -25,7 +25,7 @@
 #include "iarchive.h"

 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <vector>

 #include "stream/filestream.h"
@@ -44,7 +44,7 @@
 #include "vfs.h"

 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <glib.h>

 #include "qerplugin.h"
@@ -210,3 +210,6 @@ target_link_libraries(radiant
    string
    xmllib
 )
+if(NOT WIN32)
+    target_link_libraries(radiant ${X11_LIBRARIES})
+endif()
@@ -33,7 +33,7 @@

 #include "mainframe.h"

-#include <stdlib.h>
+#include <cstdlib>

 #include <gtk/gtkmain.h>
 #include <gtk/gtkvbox.h>
@@ -66,7 +66,7 @@ StaticRegisterModule staticRegisterEclassDef( StaticEclassDefModule::instance()

 #include "string/string.h"

-#include <stdlib.h>
+#include <cstdlib>


 char com_token[1024];
@@ -181,7 +181,7 @@ bool portable_app_setup(){

 #if defined( POSIX )

-#include <stdlib.h>
+#include <cstdlib>
 #include <pwd.h>
 #include <unistd.h>

@@ -25,7 +25,7 @@
 #include "debugging/debugging.h"

 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <string.h>

 #if defined( _WIN32 )
@@ -55,7 +55,6 @@ PROC ( WINAPI * qwglGetProcAddress )( LPCSTR );

 #include <GL/glx.h>
 #include <dlfcn.h>
-#include <gdk/gdkx.h>

 Bool ( *qglXQueryExtension )( Display *dpy, int *errorb, int *event );
 void*        ( *qglXGetProcAddressARB )( const GLubyte * procName );
@@ -537,7 +536,7 @@ int QGL_Init( OpenGLBinding& table ){
 	qwglGetProcAddress           = wglGetProcAddress;
 #elif defined( XWINDOWS )
 	qglXGetProcAddressARB = (glXGetProcAddressARBProc)dlsym( RTLD_DEFAULT, "glXGetProcAddressARB" );
-	if ( ( qglXQueryExtension == 0 ) || ( qglXQueryExtension( GDK_DISPLAY(),0,0 ) != True ) ) {
+	if ( ( qglXQueryExtension == 0 ) || ( qglXQueryExtension(XOpenDisplay(nullptr), 0, 0) != True ) ) {
 		return 0;
 	}
 #else
@@ -22,10 +22,9 @@
 #include "server.h"

 #include "debugging/debugging.h"
-#include "warnings.h"

-#include <vector>
 #include <map>
+#include <vector>
 #include "os/path.h"

 #include "modulesystem.h"
@@ -151,7 +150,12 @@ public:
 typedef int ( *FunctionPointer )();

 DynamicLibrary( const char* filename ){
-	m_library = dlopen( filename, RTLD_NOW|RTLD_LOCAL|RTLD_DEEPBIND );
+	m_library = dlopen(filename, RTLD_LOCAL
+								 | RTLD_NOW
+								 #ifndef __APPLE__
+								 | RTLD_DEEPBIND
+                                 #endif
+	);
 	if ( !m_library )
 	{
 		globalErrorStream() << "LoadLibrary failed: '" << filename << "'\n";
@@ -31,7 +31,7 @@

 #include "texmanip.h"

-#include <stdlib.h>
+#include <cstdlib>
 #include "stream/textstream.h"

 static byte *row1 = NULL, *row2 = NULL;
@@ -33,7 +33,7 @@ bool open_url( const char* url ){
 #endif

 #if defined( __linux__ ) || defined( __FreeBSD__ )
-#include <stdlib.h>
+#include <cstdlib>
 bool open_url( const char* url ){
 	// \todo FIXME: the way we open URLs on *nix should be improved. A script is good (see how I do on RTCW)
 	char command[2 * PATH_MAX];
@@ -44,7 +44,7 @@ bool open_url( const char* url ){
 #endif

 #ifdef __APPLE__
-#include <stdlib.h>
+#include <cstdlib>
 bool open_url( const char* url ){
 	char command[2 * PATH_MAX];
 	snprintf( command, sizeof( command ), "open \"%s\" &", url );
@@ -26,7 +26,7 @@

 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <errno.h>
 #include <ctype.h>
 #include <time.h>
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <errno.h>
 #include <ctype.h>
 #include <time.h>
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // qdata.h


-#include <stdlib.h>
+#include <cstdlib>
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <errno.h>
 #include <ctype.h>
 #include <time.h>
@@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <gl/glaux.h>
 #include "glingr.h"
 #include <math.h>
-#include <stdlib.h>
+#include <cstdlib>

 #include "cmdlib.h"
 #include "mathlib.h"
@@ -35,7 +35,7 @@
 	#include <windows.h>
 #endif

-#include <stdlib.h>
+#include <cstdlib>

 #include "cmdlib.h"
 #include "mathlib.h"
@@ -19,7 +19,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

-#include <stdlib.h>
+#include <cstdlib>
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
@@ -20,7 +20,7 @@
 */


-#include <stdlib.h>
+#include <cstdlib>
 #include <stdio.h>
 #include <math.h>
 #include <memory.h>
@@ -38,7 +38,7 @@

 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <errno.h>
 #include <ctype.h>
 #include <time.h>
@@ -24,7 +24,7 @@
 //

 #include "h2common.h"
-#include <stdlib.h>     // needed here for size_t
+#include <cstdlib>     // needed here for size_t

 typedef struct ResourceManager_s
 {
@@ -19,7 +19,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

-#include <stdlib.h> // for size_t
+#include <cstdlib> // for size_t
 #include "arrayedlist.h"

 #define JN_YAW_CHANGED      0x00000001
@@ -22,7 +22,7 @@
 // qdata.h


-#include <stdlib.h>
+#include <cstdlib>
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
@@ -19,7 +19,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

-#include <stdlib.h>
+#include <cstdlib>
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>