Changeset 185

Timestamp:

06/12/07 22:23:49 (1 year ago)

Author:

pmac

Message:

Fix compile errors for OS X.
(use_sound is no longer a global variable.)

Files:

• trunk/src/Makefile.osx (modified) (1 diff)
• trunk/src/main-crb.c (modified) (2 diffs)
• trunk/src/osx/osx_tables.h (modified) (2 diffs)

trunk/src/Makefile.osx

@@ -30 +30 @@
-
-CFLAGS = \
-c
+gnu
-        -DPRIVATE_USER_PATH=\"~/Library/Preferences\" -DUSE_PRIVATE_PATHS
-LIBS = -framework CoreFoundation -framework QuickTime -framework Carbon

trunk/src/main-crb.c

@@ -175 +175 @@
-#ifdef MACH_O_CARBON
-
+#include "angband.h"
+
-#include <Carbon/Carbon.h>
-#include <QuickTime/QuickTime.h>
-#include <CoreServices/CoreServices.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include "angband.h"
-
-#include "osx/osx_tables.h"
@@ -328 +329 @@
-static void install_handlers(WindowRef w);
-static void graphics_tiles_nuke(void);
+static void play_sound(int num);
-
-/*

trunk/src/osx/osx_tables.h

@@ -54 +54 @@
-// Special Menu
-enum {
-
-
-
-
+
+
+
-};
-
@@ -203 +202 @@
-        { &arg_wizard, kSpecialMenu, kWizard,   false},
-        { &arg_fiddle, kSpecialMenu, kFiddle,   false},
-        { &use_sound,  kSpecialMenu, kSound,    false},
-        { &use_bigtile, kStyleMenu,  kBigTile,  true},
-        { &interpolate, kStyleMenu,  kInterpolate, true},