diff options
| author | Johannes Schickel | 2012-02-22 02:30:44 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2012-02-22 02:30:44 +0100 |
| commit | e79f6a631474a49b9e92d3d0c8c5f2a7dc72d123 (patch) | |
| tree | bc7d05bfeeccd1d2af2bd12193ae26565a3728f5 | |
| parent | 1b26346fc887ce2681b3a70c6b5af030542dc3f1 (diff) | |
| download | scummvm-rg350-e79f6a631474a49b9e92d3d0c8c5f2a7dc72d123.tar.gz scummvm-rg350-e79f6a631474a49b9e92d3d0c8c5f2a7dc72d123.tar.bz2 scummvm-rg350-e79f6a631474a49b9e92d3d0c8c5f2a7dc72d123.zip | |
IPHONE: Move ObjC code files (.m) to ObjC++ files (.mm).
| -rw-r--r-- | backends/platform/iphone/iphone_common.h | 24 | ||||
| -rw-r--r-- | backends/platform/iphone/iphone_keyboard.mm (renamed from backends/platform/iphone/iphone_keyboard.m) | 0 | ||||
| -rw-r--r-- | backends/platform/iphone/iphone_main.mm (renamed from backends/platform/iphone/iphone_main.m) | 0 | ||||
| -rw-r--r-- | backends/platform/iphone/iphone_video.mm (renamed from backends/platform/iphone/iphone_video.m) | 2 | ||||
| -rw-r--r-- | backends/platform/iphone/osys_video.cpp | 2 |
5 files changed, 5 insertions, 23 deletions
diff --git a/backends/platform/iphone/iphone_common.h b/backends/platform/iphone/iphone_common.h index 3c2d414304..5a46a6dde6 100644 --- a/backends/platform/iphone/iphone_common.h +++ b/backends/platform/iphone/iphone_common.h @@ -50,27 +50,13 @@ enum UIViewSwipeDirection { kUIViewSwipeRight = 8 }; -typedef enum { +enum GraphicsModes { kGraphicsModeLinear = 0, kGraphicsModeNone = 1 -} GraphicsModes; - -#ifdef IPHONE_OFFICIAL -void iphone_main(int argc, char **argv); -#endif - -// We need this to be able to call functions from/in Objective-C. -#ifdef __cplusplus -extern "C" { -#endif - -// On the C++ side -#ifndef IPHONE_OFFICIAL -void iphone_main(int argc, char *argv[]); -#endif +}; // On the ObjC side -void iPhone_setGraphicsMode(int mode); +void iPhone_setGraphicsMode(GraphicsModes mode); void iPhone_updateScreen(int mouseX, int mouseY); void iPhone_updateScreenRect(unsigned short *screen, int x1, int y1, int x2, int y2); void iPhone_updateOverlayRect(unsigned short *screen, int x1, int y1, int x2, int y2); @@ -87,8 +73,4 @@ void iPhone_setMouseCursor(unsigned short *buffer, int width, int height, int ho uint getSizeNextPOT(uint size); -#ifdef __cplusplus -} -#endif - #endif diff --git a/backends/platform/iphone/iphone_keyboard.m b/backends/platform/iphone/iphone_keyboard.mm index b00930ab31..b00930ab31 100644 --- a/backends/platform/iphone/iphone_keyboard.m +++ b/backends/platform/iphone/iphone_keyboard.mm diff --git a/backends/platform/iphone/iphone_main.m b/backends/platform/iphone/iphone_main.mm index 051da417ea..051da417ea 100644 --- a/backends/platform/iphone/iphone_main.m +++ b/backends/platform/iphone/iphone_main.mm diff --git a/backends/platform/iphone/iphone_video.m b/backends/platform/iphone/iphone_video.mm index 5adf594a15..2dcca3592c 100644 --- a/backends/platform/iphone/iphone_video.m +++ b/backends/platform/iphone/iphone_video.mm @@ -83,7 +83,7 @@ int printOglError(const char *file, int line) { return retCode; } -void iPhone_setGraphicsMode(int mode) { +void iPhone_setGraphicsMode(GraphicsModes mode) { _graphicsMode = mode; [sharedInstance performSelectorOnMainThread:@selector(setGraphicsMode) withObject:nil waitUntilDone: YES]; diff --git a/backends/platform/iphone/osys_video.cpp b/backends/platform/iphone/osys_video.cpp index 2b45b5568c..e26c360c82 100644 --- a/backends/platform/iphone/osys_video.cpp +++ b/backends/platform/iphone/osys_video.cpp @@ -39,7 +39,7 @@ bool OSystem_IPHONE::setGraphicsMode(int mode) { case kGraphicsModeNone: case kGraphicsModeLinear: _currentGraphicsMode = mode; - iPhone_setGraphicsMode(mode); + iPhone_setGraphicsMode((GraphicsModes)mode); return true; default: |