ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use clang on OS X instead of gcc48

Browse source 
Also - add 'pkgconfig' to list of MacPorts to install, as it's a required dependency.
This commit is contained in:
Eric Wasylishen 2014-01-19 22:04:30 -07:00
parent 5b1bb1ce7e
commit adbace1da2
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apple/README.md
View file

@ -14,7 +14,7 @@ Directions for OSX Mavericks 10.9 - your mileage may vary:
- Install dependencies with MacPorts: - Install dependencies with MacPorts:
``` ```
sudo port install dylibbundler gcc48 gtkglext scons sudo port install dylibbundler pkgconfig gtkglext scons
``` ```
- Get the GtkRadiant code and compile: - Get the GtkRadiant code and compile:
@ -22,7 +22,7 @@ sudo port install dylibbundler gcc48 gtkglext scons
``` ```
git clone https://github.com/TTimo/GtkRadiant.git git clone https://github.com/TTimo/GtkRadiant.git
cd GtkRadiant/ cd GtkRadiant/
scons cc=gcc-mp-4.8 cxx=g++-mp-4.8 scons
``` ```
- Run the build: - Run the build:

2
contrib/prtview/AboutDialog.cpp
View file

@ -40,7 +40,7 @@ static void dialog_button_callback( GtkWidget *widget, gpointer data ){
ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" ); ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" );
*loop = 0; *loop = 0;
*ret = (int)data; *ret = (int)((intptr_t)data);
} }
static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){ static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){

2
contrib/prtview/ConfigDialog.cpp
View file

@ -42,7 +42,7 @@ static void dialog_button_callback( GtkWidget *widget, gpointer data ){
ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" ); ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" );
*loop = 0; *loop = 0;
*ret = (int)data; *ret = (int)((intptr_t)data);
} }
static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){ static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){

4
contrib/prtview/gtkdlgs.cpp
View file

@ -36,7 +36,7 @@ static void dialog_button_callback( GtkWidget *widget, gpointer data ){
ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" ); ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" );
*loop = 0; *loop = 0;
*ret = (int)data; *ret = (int)((intptr_t)data);
} }
static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){ static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){
@ -59,7 +59,7 @@ static void file_sel_callback( GtkWidget *widget, gpointer data ){
filename = (char**)g_object_get_data( G_OBJECT( parent ), "filename" ); filename = (char**)g_object_get_data( G_OBJECT( parent ), "filename" );
*loop = 0; *loop = 0;
if ( (int)data == IDOK ) { if ( (int)((intptr_t)data) == IDOK ) {
*filename = g_strdup( gtk_file_selection_get_filename( GTK_FILE_SELECTION( parent ) ) ); *filename = g_strdup( gtk_file_selection_get_filename( GTK_FILE_SELECTION( parent ) ) );
} }
} }

1
contrib/prtview/stdafx.h
View file

@ -21,6 +21,7 @@
#define __PRTVIEW_AFX_H__ #define __PRTVIEW_AFX_H__
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <stdint.h>
#if defined( __linux__ ) || defined( __APPLE__ ) #if defined( __linux__ ) || defined( __APPLE__ )
#include <GL/glx.h> #include <GL/glx.h>