[Scummvm-cvs-logs] scummvm master -> 6a31dadfea1d13970e7d0bb21f3a9b2287ff067d

[lordhoto]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
13358c541d IPHONE: Add include guards.
a9b74779c9 IPHONE: Pass $CPPFLAGS to build command line for ObjC files.
6a31dadfea IPHONE: Use include instead of import for all of our headers.


Commit: 13358c541df46b03d3c25a9fa7e4615c64424517
    https://github.com/scummvm/scummvm/commit/13358c541df46b03d3c25a9fa7e4615c64424517
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-02-19T12:44:37-08:00

Commit Message:
IPHONE: Add include guards.

Changed paths:
    backends/platform/iphone/iphone_common.h
    backends/platform/iphone/iphone_keyboard.h
    backends/platform/iphone/iphone_video.h
    backends/platform/iphone/osys_main.h



diff --git a/backends/platform/iphone/iphone_common.h b/backends/platform/iphone/iphone_common.h
index 9bf5598..d6d3a3d 100644
--- a/backends/platform/iphone/iphone_common.h
+++ b/backends/platform/iphone/iphone_common.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_COMMON_H
+#define BACKENDS_PLATFORM_IPHONE_IPHONE_COMMON_H
+
 enum InputEvent {
 	kInputMouseDown,
 	kInputMouseUp,
@@ -79,3 +82,5 @@ uint getSizeNextPOT(uint size);
 #ifdef __cplusplus
 }
 #endif
+
+#endif
diff --git a/backends/platform/iphone/iphone_keyboard.h b/backends/platform/iphone/iphone_keyboard.h
index 6d64f90..b13ac35 100644
--- a/backends/platform/iphone/iphone_keyboard.h
+++ b/backends/platform/iphone/iphone_keyboard.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_KEYBOARD_H
+#define BACKENDS_PLATFORM_IPHONE_IPHONE_KEYBOARD_H
+
 #import <UIKit/UIKit.h>
 #import <UIKit/UITextView.h>
 
@@ -34,3 +37,5 @@
 - (void)handleKeyPress:(unichar)c;
 
 @end
+
+#endif
diff --git a/backends/platform/iphone/iphone_video.h b/backends/platform/iphone/iphone_video.h
index 21593b2..a7a83e2 100644
--- a/backends/platform/iphone/iphone_video.h
+++ b/backends/platform/iphone/iphone_video.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef _IPHONE_VIDEO__H
-#define _IPHONE_VIDEO__H
+#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_VIDEO_H
+#define BACKENDS_PLATFORM_IPHONE_IPHONE_VIDEO_H
 
 #import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
@@ -80,6 +80,4 @@
 
 @end
 
-
-
-#endif /* _IPHONE_VIDEO__H */
+#endif
diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h
index 04b82ab..993c1aa 100644
--- a/backends/platform/iphone/osys_main.h
+++ b/backends/platform/iphone/osys_main.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef BACKENDS_PLATFORM_IPHONE_OSYS_MAIN_H
+#define BACKENDS_PLATFORM_IPHONE_OSYS_MAIN_H
+
 #include "graphics/surface.h"
 #include "iphone_common.h"
 #include "backends/base-backend.h"
@@ -208,3 +211,5 @@ protected:
 	bool handleEvent_mouseDragged(Common::Event &event, int x, int y);
 	bool handleEvent_mouseSecondDragged(Common::Event &event, int x, int y);
 };
+
+#endif


Commit: a9b74779c95b5948bcb6e8d5eccc0b9f8f4e8106
    https://github.com/scummvm/scummvm/commit/a9b74779c95b5948bcb6e8d5eccc0b9f8f4e8106
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-02-19T13:02:19-08:00

Commit Message:
IPHONE: Pass $CPPFLAGS to build command line for ObjC files.

Changed paths:
    Makefile.common



diff --git a/Makefile.common b/Makefile.common
index 2aa3325..744ac49 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -106,7 +106,7 @@ ifdef CXX_UPDATE_DEP_FLAG
 
 %.o: %.m
 	$(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
-	$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(OBJCFLAGS) -c $(<) -o $*.o
+	$(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CPPFLAGS) $(OBJCFLAGS) -c $(<) -o $*.o
 
 # Build rule for assembler files with preprocessing
 %.o: %.S


Commit: 6a31dadfea1d13970e7d0bb21f3a9b2287ff067d
    https://github.com/scummvm/scummvm/commit/6a31dadfea1d13970e7d0bb21f3a9b2287ff067d
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-02-19T13:10:08-08:00

Commit Message:
IPHONE: Use include instead of import for all of our headers.

Changed paths:
    backends/platform/iphone/iphone_keyboard.m
    backends/platform/iphone/iphone_video.h



diff --git a/backends/platform/iphone/iphone_keyboard.m b/backends/platform/iphone/iphone_keyboard.m
index 4d92b15..b00930a 100644
--- a/backends/platform/iphone/iphone_keyboard.m
+++ b/backends/platform/iphone/iphone_keyboard.m
@@ -20,7 +20,7 @@
  *
  */
 
-#import "iphone_keyboard.h"
+#include "iphone_keyboard.h"
 
 @interface UITextInputTraits
 - (void)setAutocorrectionType:(int)type;
diff --git a/backends/platform/iphone/iphone_video.h b/backends/platform/iphone/iphone_video.h
index a7a83e2..25208de 100644
--- a/backends/platform/iphone/iphone_video.h
+++ b/backends/platform/iphone/iphone_video.h
@@ -31,7 +31,7 @@
 #import <OpenGLES/ES1/gl.h>
 #import <OpenGLES/ES1/glext.h>
 
-#import "iphone_keyboard.h"
+#include "iphone_keyboard.h"
 
 @interface iPhoneView : UIView {
 	void *_screenSurface;