Renamed main-xxx.cpp back to gameplay-main-xxx.cpp due to existing Android.mk files.

gameplay/CMakeLists.txt

@@ -73,6 +73,10 @@ set(GAMEPLAY_SRC
     src/Game.inl
     src/Gamepad.cpp
     src/Gamepad.h
+    src/gameplay-main-android.cpp
+    src/gameplay-main-blackberry.cpp
+    src/gameplay-main-linux.cpp
+    src/gameplay-main-windows.cpp
 	src/Gesture.h
     src/Image.cpp
     src/Image.h
@@ -90,10 +94,6 @@ set(GAMEPLAY_SRC
     src/Light.h
     src/Logger.cpp
     src/Logger.h
-    src/main-android.cpp
-    src/main-blackberry.cpp
-    src/main-linux.cpp
-    src/main-windows.cpp
     src/Material.cpp
     src/Material.h
     src/MaterialParameter.cpp

gameplay/android/jni/Android.mk

@@ -52,7 +52,6 @@ LOCAL_SRC_FILES := \
     Frustum.cpp \
     Game.cpp \
     Gamepad.cpp \
-    main-android.cpp \
     Image.cpp \
     Joint.cpp \
     Joystick.cpp \

gameplay/gameplay.cbp

@@ -120,6 +120,11 @@
 		<Unit filename="src/Game.h" />
 		<Unit filename="src/Gamepad.cpp" />
 		<Unit filename="src/Gamepad.h" />
+		<Unit filename="src/gameplay.h" />
+        <Unit filename="src/gameplay-main-android.cpp" />
+		<Unit filename="src/gameplay-main-blackberry.cpp" />
+		<Unit filename="src/gameplay-main-linux.cpp" />
+		<Unit filename="src/gameplay-main-windows.cpp" />
 		<Unit filename="src/Gesture.h" />
 		<Unit filename="src/Image.cpp" />
 		<Unit filename="src/Image.h" />
@@ -252,7 +257,6 @@
 		<Unit filename="src/VertexFormat.h" />
 		<Unit filename="src/VerticalLayout.cpp" />
 		<Unit filename="src/VerticalLayout.h" />
-		<Unit filename="src/gameplay.h" />
 		<Unit filename="src/lua/lua_AIAgent.cpp" />
 		<Unit filename="src/lua/lua_AIAgent.h" />
 		<Unit filename="src/lua/lua_AIAgentListener.cpp" />
@@ -579,10 +583,6 @@
 		<Unit filename="src/lua/lua_VerticalLayout.h" />
 		<Unit filename="src/lua/lua_all_bindings.cpp" />
 		<Unit filename="src/lua/lua_all_bindings.h" />
-		<Unit filename="src/main-android.cpp" />
-		<Unit filename="src/main-blackberry.cpp" />
-		<Unit filename="src/main-linux.cpp" />
-		<Unit filename="src/main-windows.cpp" />
 		<Extensions>
 			<code_completion />
 			<debugger />

gameplay/gameplay.vcxproj

@@ -73,6 +73,10 @@
     <ClCompile Include="src\Frustum.cpp" />
     <ClCompile Include="src\Game.cpp" />
     <ClCompile Include="src\Gamepad.cpp" />
+    <ClCompile Include="src\gameplay-main-android.cpp" />
+    <ClCompile Include="src\gameplay-main-blackberry.cpp" />
+    <ClCompile Include="src\gameplay-main-linux.cpp" />
+    <ClCompile Include="src\gameplay-main-windows.cpp" />
     <ClCompile Include="src\Image.cpp" />
     <ClCompile Include="src\Joint.cpp" />
     <ClCompile Include="src\Joystick.cpp" />
@@ -80,10 +84,6 @@
     <ClCompile Include="src\Layout.cpp" />
     <ClCompile Include="src\Light.cpp" />
     <ClCompile Include="src\Logger.cpp" />
-    <ClCompile Include="src\main-android.cpp" />
-    <ClCompile Include="src\main-blackberry.cpp" />
-    <ClCompile Include="src\main-linux.cpp" />
-    <ClCompile Include="src\main-windows.cpp" />
     <ClCompile Include="src\lua\lua_AbsoluteLayout.cpp" />
     <ClCompile Include="src\lua\lua_AIAgent.cpp" />
     <ClCompile Include="src\lua\lua_AIAgentListener.cpp" />

gameplay/gameplay.vcxproj.filters

@@ -81,13 +81,13 @@
     <ClCompile Include="src\Plane.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="src\main-blackberry.cpp">
+    <ClCompile Include="src\gameplay-main-blackberry.cpp">
       <Filter>src</Filter>
     </ClCompile>
     <ClCompile Include="src\PlatformBlackBerry.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="src\main-windows.cpp">
+    <ClCompile Include="src\gameplay-main-windows.cpp">
       <Filter>src</Filter>
     </ClCompile>
     <ClCompile Include="src\PlatformWindows.cpp">
@@ -216,7 +216,7 @@
     <ClCompile Include="src\MeshBatch.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="src\main-android.cpp">
+    <ClCompile Include="src\gameplay-main-android.cpp">
       <Filter>src</Filter>
     </ClCompile>
     <ClCompile Include="src\PlatformAndroid.cpp">
@@ -783,7 +783,7 @@
     <ClCompile Include="src\lua\lua_ScriptTarget.cpp">
       <Filter>lua</Filter>
     </ClCompile>
-    <ClCompile Include="src\main-linux.cpp">
+    <ClCompile Include="src\gameplay-main-linux.cpp">
       <Filter>src</Filter>
     </ClCompile>
     <ClCompile Include="src\PlatformLinux.cpp">

gameplay/gameplay.xcodeproj/project.pbxproj

@@ -1715,10 +1715,10 @@
 		B67EC8F9161DFCA8000B4D12 /* Logger.h in Headers */ = {isa = PBXBuildFile; fileRef = B67EC8F5161DFCA8000B4D12 /* Logger.h */; };
 		F1616ABC1614E24B008DD8B7 /* MathUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F1616ABB1614E24B008DD8B7 /* MathUtil.cpp */; };
 		F1616ABD1614E24B008DD8B7 /* MathUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F1616ABB1614E24B008DD8B7 /* MathUtil.cpp */; };
-		F18024A51627000D001BFF87 /* main-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = F18024A31627000D001BFF87 /* main-ios.mm */; };
-		F18024A61627000D001BFF87 /* main-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = F18024A31627000D001BFF87 /* main-ios.mm */; };
-		F18024A71627000D001BFF87 /* main-macosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = F18024A41627000D001BFF87 /* main-macosx.mm */; };
-		F18024A81627000D001BFF87 /* main-macosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = F18024A41627000D001BFF87 /* main-macosx.mm */; };
+		F18024A51627000D001BFF87 /* gameplay-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = F18024A31627000D001BFF87 /* gameplay-main-ios.mm */; };
+		F18024A61627000D001BFF87 /* gameplay-main-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = F18024A31627000D001BFF87 /* gameplay-main-ios.mm */; };
+		F18024A71627000D001BFF87 /* gameplay-main-macosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = F18024A41627000D001BFF87 /* gameplay-main-macosx.mm */; };
+		F18024A81627000D001BFF87 /* gameplay-main-macosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = F18024A41627000D001BFF87 /* gameplay-main-macosx.mm */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -2617,8 +2617,8 @@
 		B67EC8F4161DFCA8000B4D12 /* Logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Logger.cpp; path = src/Logger.cpp; sourceTree = SOURCE_ROOT; };
 		B67EC8F5161DFCA8000B4D12 /* Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logger.h; path = src/Logger.h; sourceTree = SOURCE_ROOT; };
 		F1616ABB1614E24B008DD8B7 /* MathUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MathUtil.cpp; path = src/MathUtil.cpp; sourceTree = SOURCE_ROOT; };
-		F18024A31627000D001BFF87 /* main-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "main-ios.mm"; path = "src/main-ios.mm"; sourceTree = SOURCE_ROOT; };
-		F18024A41627000D001BFF87 /* main-macosx.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "main-macosx.mm"; path = "src/main-macosx.mm"; sourceTree = SOURCE_ROOT; };
+		F18024A31627000D001BFF87 /* gameplay-main-ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "gameplay-main-ios.mm"; path = "src/gameplay-main-ios.mm"; sourceTree = SOURCE_ROOT; };
+		F18024A41627000D001BFF87 /* gameplay-main-macosx.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "gameplay-main-macosx.mm"; path = "src/gameplay-main-macosx.mm"; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -2785,8 +2785,8 @@
 				42CD0DE7147D8FF50000361E /* Light.h */,
 				B67EC8F4161DFCA8000B4D12 /* Logger.cpp */,
 				B67EC8F5161DFCA8000B4D12 /* Logger.h */,
-				F18024A31627000D001BFF87 /* main-ios.mm */,
-				F18024A41627000D001BFF87 /* main-macosx.mm */,
+				F18024A31627000D001BFF87 /* gameplay-main-ios.mm */,
+				F18024A41627000D001BFF87 /* gameplay-main-macosx.mm */,
 				42CD0DE8147D8FF50000361E /* Material.cpp */,
 				42CD0DE9147D8FF50000361E /* Material.h */,
 				42CD0DEA147D8FF50000361E /* MaterialParameter.cpp */,
@@ -5001,8 +5001,8 @@
 				B67EC8EB161DFC8E000B4D12 /* lua_Logger.cpp in Sources */,
 				B67EC8EF161DFC8E000B4D12 /* lua_LoggerLevel.cpp in Sources */,
 				B67EC8F6161DFCA8000B4D12 /* Logger.cpp in Sources */,
-				F18024A51627000D001BFF87 /* main-ios.mm in Sources */,
-				F18024A71627000D001BFF87 /* main-macosx.mm in Sources */,
+				F18024A51627000D001BFF87 /* gameplay-main-ios.mm in Sources */,
+				F18024A71627000D001BFF87 /* gameplay-main-macosx.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5427,8 +5427,8 @@
 				B67EC8EC161DFC8E000B4D12 /* lua_Logger.cpp in Sources */,
 				B67EC8F0161DFC8E000B4D12 /* lua_LoggerLevel.cpp in Sources */,
 				B67EC8F7161DFCA8000B4D12 /* Logger.cpp in Sources */,
-				F18024A61627000D001BFF87 /* main-ios.mm in Sources */,
-				F18024A81627000D001BFF87 /* main-macosx.mm in Sources */,
+				F18024A61627000D001BFF87 /* gameplay-main-ios.mm in Sources */,
+				F18024A81627000D001BFF87 /* gameplay-main-macosx.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};