Merge pull request #3074 from dumganhar/iss2371-add-lua-ios-mac

ios and mac projects need to be unified in one simple xcode project, adding lua projects for Mac and iOS.

Author: James Chen

.gitignore

@@ -59,6 +59,7 @@ build_*_vc10/
 *.pbxuser
 *.xcbkptlist
 *.xcscheme
+*.xcworkspacedata
 *.xcuserstate
 xcschememanagement.plist
 build/

cocos2d-ios.xcworkspace/contents.xcworkspacedata

@@ -617,26 +617,26 @@ std::string FileUtils::fullPathForFilename(const char* pszFileName)
 
     string fullpath = "";
 
-    for (std::vector<std::string>::iterator searchPathsIter = _searchPathArray.begin();
+    for (auto searchPathsIter = _searchPathArray.begin();
          searchPathsIter != _searchPathArray.end(); ++searchPathsIter) {
-        for (std::vector<std::string>::iterator resOrderIter = _searchResolutionsOrderArray.begin();
+        for (auto resOrderIter = _searchResolutionsOrderArray.begin();
              resOrderIter != _searchResolutionsOrderArray.end(); ++resOrderIter) {
 
-            //CCLOG("\n\nSEARCHING: %s, %s, %s", newFilename.c_str(), resOrderIter->c_str(), searchPathsIter->c_str());
+//            CCLOG("\n\nSEARCHING: %s, %s, %s", newFilename.c_str(), resOrderIter->c_str(), searchPathsIter->c_str());
 
             fullpath = this->getPathForFilename(newFilename, *resOrderIter, *searchPathsIter);
 
             if (fullpath.length() > 0)
             {
                 // Using the filename passed in as key.
                 _fullPathCache.insert(std::pair<std::string, std::string>(pszFileName, fullpath));
-                //CCLOG("Returning path: %s", fullpath.c_str());
+//                CCLOG("Returning path: %s", fullpath.c_str());
                 return fullpath;
             }
         }
     }
 
-    //CCLOG("cocos2d: fullPathForFilename: No file found at %s. Possible missing file.", pszFileName);
+//    CCLOG("cocos2d: fullPathForFilename: No file found at %s. Possible missing file.", pszFileName);
 
     // The file wasn't found, return the file name passed in.
     return pszFileName;

cocos2d_libs.xcodeproj/project.pbxproj

@@ -35,6 +35,9 @@ THE SOFTWARE.
 #define glDeleteVertexArrays            glDeleteVertexArraysAPPLE
 #define glGenVertexArrays               glGenVertexArraysAPPLE
 #define glBindVertexArray               glBindVertexArrayAPPLE
+#define glClearDepthf                   glClearDepth
+#define glDepthRangef                   glDepthRange
+#define glReleaseShaderCompiler(xxx)
 
 
 #endif // __PLATFORM_MAC_CCGL_H__