ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #255 from ericwa/clang 

Use clang on OS X instead of gcc48
This commit is contained in:
Jay Dolan 2014-01-20 04:38:10 -08:00
parent 5b1bb1ce7e adbace1da2
commit 73b5b0dca7
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:
```
sudo port install dylibbundler gcc48 gtkglext scons
sudo port install dylibbundler pkgconfig gtkglext scons
```
- 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
cd GtkRadiant/
scons cc=gcc-mp-4.8 cxx=g++-mp-4.8
scons
```
- 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" );
*loop = 0;
*ret = (int)data;
*ret = (int)((intptr_t)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" );
*loop = 0;
*ret = (int)data;
*ret = (int)((intptr_t)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" );
*loop = 0;
*ret = (int)data;
*ret = (int)((intptr_t)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" );
*loop = 0;
if ( (int)data == IDOK ) {
if ( (int)((intptr_t)data) == IDOK ) {
*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__
#include <gtk/gtk.h>
#include <stdint.h>
#if defined( __linux__ ) || defined( __APPLE__ )
#include <GL/glx.h>