Skip to content

ios and mac projects unified in one simple xcode project #3060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 4, 2013
Merged

ios and mac projects unified in one simple xcode project #3060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a232a2
ios and mac projects unified in one simple xcode project
ricardoquesada Jul 3, 2013
fac938e
Merge branch 'develop' into ios_mac_one_project
ricardoquesada Jul 3, 2013
021e591
SimpleGame and HelloCpp works as expected
ricardoquesada Jul 3, 2013
1e35404
Adds JS tests for iOS
ricardoquesada Jul 3, 2013
2a2b155
Obfuscated Test JS added on iOS and Mac
ricardoquesada Jul 3, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,094 changes: 2,849 additions & 245 deletions cocos2d_libs-mac.xcodeproj/project.pbxproj → cocos2d_libs.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cocos2dx/base_nodes/CCGLBufferedNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ THE SOFTWARE.
#ifndef __CC_GL_BUFFERED_NODE__
#define __CC_GL_BUFFERED_NODE__

#include <CCGL.h>
#include "CCGL.h"

class GLBufferedNode
{
Expand Down
6 changes: 3 additions & 3 deletions cocos2dx/platform/ios/CCGL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/

#ifndef __CCGL_H__
#define __CCGL_H__
#ifndef __PLATFORM_IOS_CCGL_H__
#define __PLATFORM_IOS_CCGL_H__

#define glClearDepth glClearDepthf
#define glDeleteVertexArrays glDeleteVertexArraysOES
Expand All @@ -39,4 +39,4 @@ THE SOFTWARE.
#include <OpenGLES/ES2/glext.h>


#endif // __CCGL_H__
#endif // __PLATFORM_IOS_CCGL_H__
6 changes: 3 additions & 3 deletions cocos2dx/platform/mac/CCGL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/

#ifndef __CCGL_H__
#define __CCGL_H__
#ifndef __PLATFORM_MAC_CCGL_H__
#define __PLATFORM_MAC_CCGL_H__

#import <OpenGL/gl.h>
#import <OpenGL/glu.h>
Expand All @@ -37,4 +37,4 @@ THE SOFTWARE.
#define glBindVertexArray glBindVertexArrayAPPLE


#endif // __CCGL_H__
#endif // __PLATFORM_MAC_CCGL_H__
12 changes: 6 additions & 6 deletions samples/Cpp/HelloCpp/proj.ios/HelloCpp-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDisplayName</key>
<string>HelloCpp</string>
<string>${PRODUCT_NAME}</string>
<key>CFBundleExecutable</key>
<string>HelloCpp</string>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>Icon-57.png</string>
<key>CFBundleIconFiles</key>
Expand Down Expand Up @@ -37,11 +37,11 @@
</dict>
</dict>
<key>CFBundleIdentifier</key>
<string>org.cocos2d-x.HelloCpp</string>
<string>org.cocos2d-x.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>HelloCpp</string>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand All @@ -52,10 +52,10 @@
<string>1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSMainNibFile</key>
<string></string>
<key>UIPrerenderedIcon</key>
<true/>
<key>UIStatusBarHidden</key>
<true/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationLandscapeRight</string>
Expand Down
10 changes: 5 additions & 5 deletions samples/Cpp/SimpleGame/proj.ios/SimpleGame-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDisplayName</key>
<string>SimpleGame</string>
<string>${PRODUCT_NAME}</string>
<key>CFBundleExecutable</key>
<string>SimpleGame</string>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>Icon-57.png</string>
<key>CFBundleIconFiles</key>
Expand Down Expand Up @@ -37,15 +37,15 @@
</dict>
</dict>
<key>CFBundleIdentifier</key>
<string>org.cocos2d-x.SimpleGame</string>
<string>org.cocos2d-x.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>SimpleGame</string>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string></string>
<string>${PRODUCT_NAME}</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
1,446 changes: 747 additions & 699 deletions samples/Javascript/TestJavascript/game.js
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions samples/Test JavaScript Mac copy-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string>Icon</string>
<key>CFBundleIdentifier</key>
<string>org.cocos2d-x.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2012. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>
Loading