Mac/iOS app sources: removed '-x objective-c++' flag and using mm extension instead

11 files changed, 10 insertions, 17 deletions

diff --git a/NativeApp/Apple/Source/Classes/OSX/GLView.m b/NativeApp/Apple/Source/Classes/OSX/GLView.mm
index d4aef78..d4aef78 100644
--- a/NativeApp/Apple/Source/Classes/OSX/GLView.m
+++ b/NativeApp/Apple/Source/Classes/OSX/GLView.mm
diff --git a/NativeApp/Apple/Source/Classes/OSX/MVKView.m b/NativeApp/Apple/Source/Classes/OSX/MVKView.mm
index 06353e4..06353e4 100644
--- a/NativeApp/Apple/Source/Classes/OSX/MVKView.m
+++ b/NativeApp/Apple/Source/Classes/OSX/MVKView.mm
diff --git a/NativeApp/Apple/Source/Classes/OSX/MetalView.m b/NativeApp/Apple/Source/Classes/OSX/MetalView.mm
index 05de9b1..05de9b1 100644
--- a/NativeApp/Apple/Source/Classes/OSX/MetalView.m
+++ b/NativeApp/Apple/Source/Classes/OSX/MetalView.mm
diff --git a/NativeApp/Apple/Source/Classes/OSX/ViewBase.m b/NativeApp/Apple/Source/Classes/OSX/ViewBase.mm
index bbc5cbb..bbc5cbb 100644
--- a/NativeApp/Apple/Source/Classes/OSX/ViewBase.m
+++ b/NativeApp/Apple/Source/Classes/OSX/ViewBase.mm
diff --git a/NativeApp/Apple/Source/Classes/OSX/WindowController.m b/NativeApp/Apple/Source/Classes/OSX/WindowController.mm
index e3f7923..e3f7923 100644
--- a/NativeApp/Apple/Source/Classes/OSX/WindowController.m
+++ b/NativeApp/Apple/Source/Classes/OSX/WindowController.mm
diff --git a/NativeApp/Apple/Source/Classes/iOS/AppViewBase.m b/NativeApp/Apple/Source/Classes/iOS/AppViewBase.mm
index 84d1b01..84d1b01 100644
--- a/NativeApp/Apple/Source/Classes/iOS/AppViewBase.m
+++ b/NativeApp/Apple/Source/Classes/iOS/AppViewBase.mm
diff --git a/NativeApp/Apple/Source/Classes/iOS/BaseView.m b/NativeApp/Apple/Source/Classes/iOS/BaseView.mm
index c87e5cd..c87e5cd 100644
--- a/NativeApp/Apple/Source/Classes/iOS/BaseView.m
+++ b/NativeApp/Apple/Source/Classes/iOS/BaseView.mm
diff --git a/NativeApp/Apple/Source/Classes/iOS/EAGLView.m b/NativeApp/Apple/Source/Classes/iOS/EAGLView.mm
index 5980493..5980493 100644
--- a/NativeApp/Apple/Source/Classes/iOS/EAGLView.m
+++ b/NativeApp/Apple/Source/Classes/iOS/EAGLView.mm
diff --git a/NativeApp/Apple/Source/Classes/iOS/MVKView.m b/NativeApp/Apple/Source/Classes/iOS/MVKView.mm
index 6f3a11e..6f3a11e 100644
--- a/NativeApp/Apple/Source/Classes/iOS/MVKView.m
+++ b/NativeApp/Apple/Source/Classes/iOS/MVKView.mm
diff --git a/NativeApp/Apple/Source/Classes/iOS/MetalView.m b/NativeApp/Apple/Source/Classes/iOS/MetalView.mm
index c56049f..c56049f 100644
--- a/NativeApp/Apple/Source/Classes/iOS/MetalView.m
+++ b/NativeApp/Apple/Source/Classes/iOS/MetalView.mm
diff --git a/NativeApp/CMakeLists.txt b/NativeApp/CMakeLists.txt
index 2f9904d..eb55573 100644
--- a/NativeApp/CMakeLists.txt
+++ b/NativeApp/CMakeLists.txt
@@ -151,19 +151,16 @@ elseif(PLATFORM_MACOS)
 
         set(APPLE_SOURCE
             ${NATIVE_APP_SOURCE_DIR}/Apple/Source/main.m
-            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/WindowController.m
+            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/WindowController.mm
             ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/AppDelegate.m
             ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/FullscreenWindow.m
-            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/GLView.m
-            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/MetalView.m
-            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/MVKView.m
-            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/ViewBase.m
+            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/GLView.mm
+            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/MetalView.mm
+            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/MVKView.mm
+            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/ViewBase.mm
             ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/ViewController.mm
             ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/ModeSelectionViewController.mm
         )
-        set_source_files_properties(${APPLE_SOURCE} PROPERTIES
-            COMPILE_FLAGS "-x objective-c++"
-        )
 
         set(APPLE_INCLUDE
             ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/OSX/WindowController.h
@@ -244,16 +241,12 @@ elseif(PLATFORM_IOS)
         set(APPLE_SOURCE
             ${NATIVE_APP_SOURCE_DIR}/Apple/Source/main.m
             ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/iOS/AppDelegate.m
-            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/iOS/BaseView.m
-            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/iOS/EAGLView.m
-            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/iOS/AppViewBase.m
+            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/iOS/BaseView.mm
+            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/iOS/EAGLView.mm
+            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/iOS/AppViewBase.mm
             ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/iOS/ModeSelectionViewController.mm
-            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/iOS/MetalView.m
-            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/iOS/MVKView.m
-        )
-
-        set_source_files_properties(${APPLE_SOURCE} PROPERTIES
-            COMPILE_FLAGS "-x objective-c++"
+            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/iOS/MetalView.mm
+            ${NATIVE_APP_SOURCE_DIR}/Apple/Source/Classes/iOS/MVKView.mm
         )
 
         set(APPLE_INCLUDE