libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-27 03:10:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALL: Fix compile on 64-bit Mac OS X

Browse Source
This commit is contained in:
Matthew Hoops 2011-03-21 08:32:36 +08:00 committed by Paweł Kołodziejski
parent e89ca555ef
commit 06e521382a
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -835,13 +835,6 @@ ps2)
;;
esac
# special case for Snow Leopard is to force compile as 32 bit
os=${_host_os%.*.*}
if test "$os" = "darwin10"; then
CXXFLAGS="$CXXFLAGS -m32"
LDFLAGS="$LDFLAGS -m32"
fi
if test -z "$_host_alias"; then
_host_alias="$_host_cpu-$_host_os"
else
@ -1214,7 +1207,7 @@ case $_host_os in
;;
darwin*)
DEFINES="$DEFINES -DUNIX -DMACOSX -DUSE_OPENGL"
LIBS="$LIBS -framework QuickTime -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI -framework OpenGL \
LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI -framework OpenGL \
-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
add_line_to_config_mk 'MACOSX = 1'
;;
@ -2262,7 +2255,11 @@ $_def_64bit_type_signed
typedef signed $type_1_byte int8;
typedef signed $type_2_byte int16;
typedef signed $type_4_byte int32;
#ifndef _UINT64
#define _UINT64
$_def_64bit_type_unsigned
#endif
/* Libs */
$_def_vorbis

6
gui/browser.h
View File

@ -29,10 +29,6 @@
#include "common/str.h"
#include "common/fs.h"
#ifdef MACOSX
#include <Carbon/Carbon.h>
#endif
namespace GUI {
class ListWidget;
@ -54,7 +50,7 @@ public:
protected:
#ifdef MACOSX
CFStringRef _titleRef;
const void *_titleRef;
#else
ListWidget *_fileList;
StaticTextWidget *_currentPath;