From 8c2a9519413229034385a86128e4dbd23e4b1797 Mon Sep 17 00:00:00 2001 From: gecko_reverse Date: Thu, 29 Jan 2009 23:54:55 +0000 Subject: [PATCH] mac compile fix --- desmume/src/cocoa/DeSmuME.cbp | 2 ++ desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj | 6 ++++++ desmume/src/cocoa/Rakefile | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/desmume/src/cocoa/DeSmuME.cbp b/desmume/src/cocoa/DeSmuME.cbp index af9aed5df..fc23c35e3 100644 --- a/desmume/src/cocoa/DeSmuME.cbp +++ b/desmume/src/cocoa/DeSmuME.cbp @@ -125,6 +125,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA]]> + + diff --git a/desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj b/desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj index b7fb29ed0..6cb445800 100644 --- a/desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj +++ b/desmume/src/cocoa/DeSmuME.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 1F5577080F326E2000DCF447 /* cheatSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F5577060F326E2000DCF447 /* cheatSystem.cpp */; }; 1FB3725C0F1CB9D300F75A43 /* mic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FB3725A0F1CB9D300F75A43 /* mic.cpp */; }; 1FB372630F1CB9F700F75A43 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FB372610F1CB9F700F75A43 /* addons.cpp */; }; 1FB3727A0F1CBAB200F75A43 /* compactFlash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FB372760F1CBAB200F75A43 /* compactFlash.cpp */; }; @@ -75,6 +76,8 @@ /* Begin PBXFileReference section */ 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 1F5577060F326E2000DCF447 /* cheatSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cheatSystem.cpp; path = ../cheatSystem.cpp; sourceTree = SOURCE_ROOT; }; + 1F5577070F326E2000DCF447 /* cheatSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cheatSystem.h; path = ../cheatSystem.h; sourceTree = SOURCE_ROOT; }; 1FB3725A0F1CB9D300F75A43 /* mic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mic.cpp; path = ../mic.cpp; sourceTree = SOURCE_ROOT; }; 1FB3725B0F1CB9D300F75A43 /* mic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mic.h; path = ../mic.h; sourceTree = SOURCE_ROOT; }; 1FB372610F1CB9F700F75A43 /* addons.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = addons.cpp; path = ../addons.cpp; sourceTree = SOURCE_ROOT; }; @@ -321,6 +324,8 @@ children = ( 1FB372750F1CBAB200F75A43 /* addons */, 1FDD29400F080DBD004021C9 /* decrypt */, + 1F5577060F326E2000DCF447 /* cheatSystem.cpp */, + 1F5577070F326E2000DCF447 /* cheatSystem.h */, 1FB372610F1CB9F700F75A43 /* addons.cpp */, 1FB372620F1CB9F700F75A43 /* addons.h */, 1FB3725A0F1CB9D300F75A43 /* mic.cpp */, @@ -583,6 +588,7 @@ 1FB3727B0F1CBAB200F75A43 /* gbagame.cpp in Sources */, 1FB3727C0F1CBAB200F75A43 /* none.cpp in Sources */, 1FB3727D0F1CBAB200F75A43 /* rumblepak.cpp in Sources */, + 1F5577080F326E2000DCF447 /* cheatSystem.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/desmume/src/cocoa/Rakefile b/desmume/src/cocoa/Rakefile index 7d23ac464..fa16759dc 100644 --- a/desmume/src/cocoa/Rakefile +++ b/desmume/src/cocoa/Rakefile @@ -10,7 +10,7 @@ indent = ' ' compile = { :command => 'g++', :files => Dir['*.m'] + Dir['*.mm'] + Dir['dialogs/*.m'] + Dir['dialogs/*.mm'] + ([ - 'MMU', 'SPU', 'cflash', 'fs-linux', 'matrix', 'FIFO', 'NDSSystem', 'arm_instructions', 'cp15', 'mc', + 'MMU', 'SPU', 'cflash', 'fs-linux', 'matrix', 'FIFO', 'NDSSystem', 'arm_instructions', 'cp15', 'mc', 'cheatSystem', 'thumb_instructions', 'GPU', 'OGLRender', 'armcpu', 'gfx3d', 'render3D', 'wifi', 'GPU_osd', 'ROMReader', 'bios', 'debug', 'saves', 'readwrite', 'rtc', 'softrender', 'common', 'mic', 'addons'].map { |core_file| '../' + core_file + '.cpp' } ) + Dir['../utils/*.c'] + Dir['../utils/*.cpp'] + Dir['../utils/decrypt/*.cpp'] + Dir['../addons/*.cpp'], @@ -113,7 +113,7 @@ end desc 'Builds an executable out of the object files' -task :link => :compile do +task :link do#=> :compile do puts 'Linking...' command = [link[:command]]