From 3fc0e4dd98c69c39240d061513acddd7dadbc18b Mon Sep 17 00:00:00 2001 From: Alexei Svitkine Date: Sat, 30 Jun 2012 21:40:16 -0400 Subject: [PATCH] Rename clip_macosx64.cpp to clip_macosx64.mm in preparation for a patch from Charles Srstka. --- .../src/MacOSX/{clip_macosx64.cpp => clip_macosx64.mm} | 2 +- SheepShaver/Makefile | 2 +- .../src/MacOSX/SheepShaver.xcodeproj/project.pbxproj | 8 ++++---- SheepShaver/src/MacOSX/clip_macosx64.cpp | 1 - SheepShaver/src/MacOSX/clip_macosx64.mm | 1 + SheepShaver/src/Unix/configure.ac | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename BasiliskII/src/MacOSX/{clip_macosx64.cpp => clip_macosx64.mm} (95%) delete mode 120000 SheepShaver/src/MacOSX/clip_macosx64.cpp create mode 120000 SheepShaver/src/MacOSX/clip_macosx64.mm diff --git a/BasiliskII/src/MacOSX/clip_macosx64.cpp b/BasiliskII/src/MacOSX/clip_macosx64.mm similarity index 95% rename from BasiliskII/src/MacOSX/clip_macosx64.cpp rename to BasiliskII/src/MacOSX/clip_macosx64.mm index 068a6721..d8db1495 100644 --- a/BasiliskII/src/MacOSX/clip_macosx64.cpp +++ b/BasiliskII/src/MacOSX/clip_macosx64.mm @@ -1,5 +1,5 @@ /* - * clip_macosx64.cpp - Clipboard handling, MacOS X (Pasteboard Manager) implementation + * clip_macosx64.mm - Clipboard handling, MacOS X (Pasteboard Manager) implementation * * (C) 2012 Jean-Pierre Stierlin * (C) 2012 Alexei Svitkine diff --git a/SheepShaver/Makefile b/SheepShaver/Makefile index a5e8e7c8..8f44feed 100644 --- a/SheepShaver/Makefile +++ b/SheepShaver/Makefile @@ -73,7 +73,7 @@ links: Unix/Darwin/lowmem.c Unix/Darwin/pagezero.c Unix/Darwin/testlmem.sh \ dummy/audio_dummy.cpp dummy/clip_dummy.cpp dummy/serial_dummy.cpp \ dummy/prefs_editor_dummy.cpp dummy/scsi_dummy.cpp SDL slirp \ - MacOSX/sys_darwin.cpp MacOSX/clip_macosx.cpp MacOSX/clip_macosx64.cpp \ + MacOSX/sys_darwin.cpp MacOSX/clip_macosx.cpp MacOSX/clip_macosx64.mm \ MacOSX/macos_util_macosx.h Unix/cpr.sh \ MacOSX/extfs_macosx.cpp Windows/clip_windows.cpp \ MacOSX/MacOSX_sound_if.cpp MacOSX/MacOSX_sound_if.h \ diff --git a/SheepShaver/src/MacOSX/SheepShaver.xcodeproj/project.pbxproj b/SheepShaver/src/MacOSX/SheepShaver.xcodeproj/project.pbxproj index 9038fb72..9650252d 100644 --- a/SheepShaver/src/MacOSX/SheepShaver.xcodeproj/project.pbxproj +++ b/SheepShaver/src/MacOSX/SheepShaver.xcodeproj/project.pbxproj @@ -118,10 +118,10 @@ 0873A76A14ABD151004F12B7 /* config-macosx-x86_64.h in Headers */ = {isa = PBXBuildFile; fileRef = 0873A76614ABD151004F12B7 /* config-macosx-x86_64.h */; }; 0873A76B14ABD151004F12B7 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 0873A76714ABD151004F12B7 /* config.h */; }; 0873A80214AC515D004F12B7 /* utils_macosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0873A80114AC515D004F12B7 /* utils_macosx.mm */; }; - 0885A52F1593E47F005C4F7B /* clip_macosx64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0851E9561593E22B00EE3FAD /* clip_macosx64.cpp */; }; 08C99DA11593E79F00898E41 /* clip_macosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CE2C14A99EF0000B1711 /* clip_macosx.cpp */; }; 08CD42DC14B7B85B009CA2A2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08CD42DB14B7B85B009CA2A2 /* Cocoa.framework */; }; 08CD42E814B7B8AA009CA2A2 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08CD42E714B7B8AA009CA2A2 /* Carbon.framework */; }; + 08D93A16159FE174003B04EC /* clip_macosx64.mm in Sources */ = {isa = PBXBuildFile; fileRef = 08D93A15159FE174003B04EC /* clip_macosx64.mm */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -214,7 +214,6 @@ 0846E52314B129DA00574779 /* ppc_asm.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = ppc_asm.S; sourceTree = ""; }; 0846E52814B129EE00574779 /* libppc_asm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libppc_asm.a; sourceTree = BUILT_PRODUCTS_DIR; }; 0846E55214B12B0D00574779 /* paranoia.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = paranoia.cpp; sourceTree = ""; }; - 0851E9561593E22B00EE3FAD /* clip_macosx64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = clip_macosx64.cpp; sourceTree = ""; }; 0856CCC114A99E1C000B1711 /* SheepShaver.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SheepShaver.app; sourceTree = BUILT_PRODUCTS_DIR; }; 0856CD4B14A99EEF000B1711 /* adb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = adb.cpp; path = ../adb.cpp; sourceTree = SOURCE_ROOT; }; 0856CD4C14A99EEF000B1711 /* audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = audio.cpp; path = ../audio.cpp; sourceTree = SOURCE_ROOT; }; @@ -432,6 +431,7 @@ 0885A5341593E47F005C4F7B /* libclip64.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libclip64.a; sourceTree = BUILT_PRODUCTS_DIR; }; 08CD42DB14B7B85B009CA2A2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 08CD42E714B7B8AA009CA2A2 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; + 08D93A15159FE174003B04EC /* clip_macosx64.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = clip_macosx64.mm; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -801,7 +801,7 @@ 0873A76514ABD151004F12B7 /* config */, 0856D2D614A9A704000B1711 /* Launcher */, 0856CE2C14A99EF0000B1711 /* clip_macosx.cpp */, - 0851E9561593E22B00EE3FAD /* clip_macosx64.cpp */, + 08D93A15159FE174003B04EC /* clip_macosx64.mm */, 0856CE2D14A99EF0000B1711 /* extfs_macosx.cpp */, 0856CE6D14A99EF0000B1711 /* macos_util_macosx.h */, 0856CE7014A99EF0000B1711 /* prefs_macosx.mm */, @@ -1461,7 +1461,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0885A52F1593E47F005C4F7B /* clip_macosx64.cpp in Sources */, + 08D93A16159FE174003B04EC /* clip_macosx64.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/SheepShaver/src/MacOSX/clip_macosx64.cpp b/SheepShaver/src/MacOSX/clip_macosx64.cpp deleted file mode 120000 index 806397aa..00000000 --- a/SheepShaver/src/MacOSX/clip_macosx64.cpp +++ /dev/null @@ -1 +0,0 @@ -../../../BasiliskII/src/MacOSX/clip_macosx64.cpp \ No newline at end of file diff --git a/SheepShaver/src/MacOSX/clip_macosx64.mm b/SheepShaver/src/MacOSX/clip_macosx64.mm new file mode 120000 index 00000000..18640812 --- /dev/null +++ b/SheepShaver/src/MacOSX/clip_macosx64.mm @@ -0,0 +1 @@ +../../../BasiliskII/src/MacOSX/clip_macosx64.mm \ No newline at end of file diff --git a/SheepShaver/src/Unix/configure.ac b/SheepShaver/src/Unix/configure.ac index 4b20ee49..58d91c7c 100644 --- a/SheepShaver/src/Unix/configure.ac +++ b/SheepShaver/src/Unix/configure.ac @@ -716,7 +716,7 @@ if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then [AC_MSG_RESULT(yes); LP64_DEFINED=yes], [AC_MSG_RESULT(no)]) if [[ "x$LP64_DEFINED" = "xyes" ]]; then - EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx64.cpp" + EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx64.mm" else EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp" fi