aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.common7
-rwxr-xr-xconfigure2
-rwxr-xr-xdists/iphone/scummvm.xcodeproj/project.pbxproj112
-rw-r--r--gui/browser.cpp97
-rw-r--r--gui/module.mk9
5 files changed, 17 insertions, 210 deletions
diff --git a/Makefile.common b/Makefile.common
index 74fc84356d..083d86d4cb 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -102,7 +102,12 @@ ifdef CXX_UPDATE_DEP_FLAG
$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-# Build rule for Objective-C files. Strictly speaking, this is for OS X only.
+
+# Build rules for Objective-C and Objective-C++ files. Strictly speaking, this is for OS X only.
+%.o: %.mm
+ $(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
+ $(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+
%.o: %.m
$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(OBJCFLAGS) -c $(<) -o $*.o
diff --git a/configure b/configure
index ac760c89d0..5cea437d6c 100755
--- a/configure
+++ b/configure
@@ -1274,6 +1274,7 @@ case $_host_os in
darwin*)
DEFINES="$DEFINES -DUNIX -DMACOSX"
LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
+ add_line_to_config_mk 'MACOSX = 1'
;;
mingw*)
DEFINES="$DEFINES -DWIN32 -D__USE_MINGW_ANSI_STDIO=0"
@@ -2562,6 +2563,7 @@ vpath %.h \$(srcdir)
vpath %.cpp \$(srcdir)
vpath %.c \$(srcdir)
vpath %.m \$(srcdir)
+vpath %.mm \$(srcdir)
vpath %.asm \$(srcdir)
vpath %.s \$(srcdir)
vpath %.S \$(srcdir)
diff --git a/dists/iphone/scummvm.xcodeproj/project.pbxproj b/dists/iphone/scummvm.xcodeproj/project.pbxproj
index 3fb60cca4e..f91e0e2832 100755
--- a/dists/iphone/scummvm.xcodeproj/project.pbxproj
+++ b/dists/iphone/scummvm.xcodeproj/project.pbxproj
@@ -6,20 +6,6 @@
objectVersion = 45;
objects = {
-/* Begin PBXAggregateTarget section */
- DF573C400F5A827500961A72 /* Info.plist */ = {
- isa = PBXAggregateTarget;
- buildConfigurationList = DF573C550F5A829500961A72 /* Build configuration list for PBXAggregateTarget "Info.plist" */;
- buildPhases = (
- DF573C3F0F5A827500961A72 /* ShellScript */,
- );
- dependencies = (
- );
- name = Info.plist;
- productName = Info.plist;
- };
-/* End PBXAggregateTarget section */
-
/* Begin PBXBuildFile section */
DF093E5F0F63CAD4002D821E /* pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5C0F63CAD4002D821E /* pn.cpp */; };
DF093E600F63CAD4002D821E /* script_pn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF093E5D0F63CAD4002D821E /* script_pn.cpp */; };
@@ -2868,30 +2854,6 @@
DFF95CCF0FB22D8500A3EC78 /* libmpeg2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DFD6476D0F49F7EF008E18EF /* libmpeg2.a */; };
/* End PBXBuildFile section */
-/* Begin PBXContainerItemProxy section */
- DF09425C0F63CDBB002D821E /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = DF573C400F5A827500961A72;
- remoteInfo = Info.plist;
- };
- DF573C870F5A835E00961A72 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = DF573C400F5A827500961A72;
- remoteInfo = Info.plist;
- };
- DFF9590B0FB22D5700A3EC78 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = DF573C400F5A827500961A72;
- remoteInfo = Info.plist;
- };
-/* End PBXContainerItemProxy section */
-
/* Begin PBXCopyFilesBuildPhase section */
DF0942260F63CB26002D821E /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
@@ -4498,7 +4460,7 @@
DFE4778A0D81F4E900B6D1FB /* about.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = about.h; sourceTree = "<group>"; };
DFE4778B0D81F4E900B6D1FB /* Actions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Actions.cpp; sourceTree = "<group>"; };
DFE4778C0D81F4E900B6D1FB /* Actions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Actions.h; sourceTree = "<group>"; };
- DFE4778D0D81F4E900B6D1FB /* browser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = browser.cpp; sourceTree = "<group>"; };
+ DFE4778D0D81F4E900B6D1FB /* browser.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = browser.cpp; sourceTree = "<group>"; };
DFE4778E0D81F4E900B6D1FB /* browser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = browser.h; sourceTree = "<group>"; };
DFE4778F0D81F4E900B6D1FB /* chooser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chooser.cpp; sourceTree = "<group>"; };
DFE477900D81F4E900B6D1FB /* chooser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chooser.h; sourceTree = "<group>"; };
@@ -6979,7 +6941,6 @@
buildRules = (
);
dependencies = (
- DF573C880F5A835E00961A72 /* PBXTargetDependency */,
);
name = "ScummVM-iPhone";
productName = scummvm;
@@ -6998,7 +6959,6 @@
buildRules = (
);
dependencies = (
- DF09425D0F63CDBB002D821E /* PBXTargetDependency */,
);
name = "ScummVM-OS X";
productName = scummvm;
@@ -7017,7 +6977,6 @@
buildRules = (
);
dependencies = (
- DFF9590A0FB22D5700A3EC78 /* PBXTargetDependency */,
);
name = "ScummVM-Simulator";
productName = scummvm;
@@ -7037,7 +6996,6 @@
projectRoot = "";
targets = (
1D6058900D05DD3D006BFB54 /* ScummVM-iPhone */,
- DF573C400F5A827500961A72 /* Info.plist */,
DF093E730F63CB26002D821E /* ScummVM-OS X */,
DFF959090FB22D5700A3EC78 /* ScummVM-Simulator */,
);
@@ -7091,26 +7049,6 @@
};
/* End PBXResourcesBuildPhase section */
-/* Begin PBXShellScriptBuildPhase section */
- DF573C3F0F5A827500961A72 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "$(SRCROOT)/Info.plist.in",
- "$(SRCROOT)/../macosx/Info.plist.in\n$(SRCROOT)/Info.plist.in",
- );
- outputPaths = (
- "$(SRCROOT)/Info.plist",
- "$(SRCROOT)/../macosx/Info.plist",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "VERSION=`cat $SRCROOT/../../base/internal_version.h | cut -d\\\" -f2`\ncat $SRCROOT/Info.plist.in | sed -e \"s/@VERSION@/svn-snapshot/g\" > $SRCROOT/Info.plist\ncat $SRCROOT/../macosx/Info.plist.in | sed -e \"s/@VERSION@/svn-snapshot/g\" > $SRCROOT/../macosx/Info.plist\n";
- };
-/* End PBXShellScriptBuildPhase section */
-
/* Begin PBXSourcesBuildPhase section */
1D60588E0D05DD3D006BFB54 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -9927,24 +9865,6 @@
};
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- DF09425D0F63CDBB002D821E /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = DF573C400F5A827500961A72 /* Info.plist */;
- targetProxy = DF09425C0F63CDBB002D821E /* PBXContainerItemProxy */;
- };
- DF573C880F5A835E00961A72 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = DF573C400F5A827500961A72 /* Info.plist */;
- targetProxy = DF573C870F5A835E00961A72 /* PBXContainerItemProxy */;
- };
- DFF9590A0FB22D5700A3EC78 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = DF573C400F5A827500961A72 /* Info.plist */;
- targetProxy = DFF9590B0FB22D5700A3EC78 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin XCBuildConfiguration section */
1D6058940D05DD3E006BFB54 /* Debug */ = {
isa = XCBuildConfiguration;
@@ -10331,27 +10251,6 @@
};
name = Release;
};
- DF573C410F5A827600961A72 /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_OPTIMIZATION_LEVEL = 0;
- PRODUCT_NAME = Info.plist;
- };
- name = Debug;
- };
- DF573C420F5A827600961A72 /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- PRODUCT_NAME = Info.plist;
- ZERO_LINK = NO;
- };
- name = Release;
- };
DFF95CC80FB22D5700A3EC78 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -10520,15 +10419,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- DF573C550F5A829500961A72 /* Build configuration list for PBXAggregateTarget "Info.plist" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- DF573C410F5A827600961A72 /* Debug */,
- DF573C420F5A827600961A72 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
DFF95CC70FB22D5700A3EC78 /* Build configuration list for PBXNativeTarget "ScummVM-Simulator" */ = {
isa = XCConfigurationList;
buildConfigurations = (
diff --git a/gui/browser.cpp b/gui/browser.cpp
index e7be11531c..906ca0dbe0 100644
--- a/gui/browser.cpp
+++ b/gui/browser.cpp
@@ -37,101 +37,6 @@ enum {
kGoUpCmd = 'GoUp'
};
-#ifdef MACOSX
-/* On Mac OS X, use the native file selector dialog. We could do the same for
- * other operating systems.
- */
-
-BrowserDialog::BrowserDialog(const char *title, bool dirBrowser)
- : Dialog("Browser") {
- _titleRef = CFStringCreateWithCString(0, title, CFStringGetSystemEncoding());
- _isDirBrowser = dirBrowser;
-}
-
-BrowserDialog::~BrowserDialog() {
- CFRelease(_titleRef);
-}
-
-int BrowserDialog::runModal() {
- NavDialogRef dialogRef;
- WindowRef windowRef = 0;
- NavDialogCreationOptions options;
- NavUserAction result;
- NavReplyRecord reply;
- OSStatus err;
- bool choiceMade = false;
-
- // If in fullscreen mode, switch to windowed mode
- bool wasFullscreen = g_system->getFeatureState(OSystem::kFeatureFullscreenMode);
- if (wasFullscreen) {
- g_system->beginGFXTransaction();
- g_system->setFeatureState(OSystem::kFeatureFullscreenMode, false);
- g_system->endGFXTransaction();
- }
-
- // Temporarily show the real mouse
- CGDisplayShowCursor(kCGDirectMainDisplay);
-
- err = NavGetDefaultDialogCreationOptions(&options);
- assert(err == noErr);
- options.windowTitle = _titleRef;
-// options.message = CFSTR("Select your game directory");
- options.modality = kWindowModalityAppModal;
-
- if (_isDirBrowser)
- err = NavCreateChooseFolderDialog(&options, 0, 0, 0, &dialogRef);
- else
- err = NavCreateChooseFileDialog(&options, 0, 0, 0, 0, 0, &dialogRef);
- assert(err == noErr);
-
- windowRef = NavDialogGetWindow(dialogRef);
-
- err = NavDialogRun(dialogRef);
- assert(err == noErr);
-
- CGDisplayHideCursor(kCGDirectMainDisplay);
-
- result = NavDialogGetUserAction(dialogRef);
-
- if (result == kNavUserActionChoose) {
- err = NavDialogGetReply(dialogRef, &reply);
- assert(err == noErr);
-
- if (reply.validRecord && err == noErr) {
- long theCount;
- AECountItems(&reply.selection, &theCount);
- assert(theCount == 1);
-
- AEKeyword keyword;
- FSRef ref;
- char buf[4096];
- err = AEGetNthPtr(&reply.selection, 1, typeFSRef, &keyword, NULL, &ref, sizeof(ref), NULL);
- assert(err == noErr);
- err = FSRefMakePath(&ref, (UInt8*)buf, sizeof(buf)-1);
- assert(err == noErr);
-
- _choice = Common::FSNode(buf);
- choiceMade = true;
- }
-
- err = NavDisposeReply(&reply);
- assert(err == noErr);
- }
-
- NavDialogDispose(dialogRef);
-
- // If we were in fullscreen mode, switch back
- if (wasFullscreen) {
- g_system->beginGFXTransaction();
- g_system->setFeatureState(OSystem::kFeatureFullscreenMode, true);
- g_system->endGFXTransaction();
- }
-
- return choiceMade;
-}
-
-#else
-
/* We want to use this as a general directory selector at some point... possible uses
* - to select the data dir for a game
* - to select the place where save games are stored
@@ -271,6 +176,4 @@ void BrowserDialog::updateListing() {
draw();
}
-#endif // MACOSX
-
} // End of namespace GUI
diff --git a/gui/module.mk b/gui/module.mk
index cd0c73b1a3..e97a6eb741 100644
--- a/gui/module.mk
+++ b/gui/module.mk
@@ -2,7 +2,6 @@ MODULE := gui
MODULE_OBJS := \
about.o \
- browser.o \
chooser.o \
console.o \
debugger.o \
@@ -27,5 +26,13 @@ MODULE_OBJS := \
ThemeParser.o \
widget.o
+ifdef MACOSX
+MODULE_OBJS += \
+ browser_osx.o
+else
+MODULE_OBJS += \
+ browser.o
+endif
+
# Include common rules
include $(srcdir)/rules.mk
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 20:53:15 +0000