diff --git a/quick/framework/platform/android.lua b/quick/framework/platform/android.lua index e2ec8fd7..e72804de 100644 --- a/quick/framework/platform/android.lua +++ b/quick/framework/platform/android.lua @@ -1,12 +1,4 @@ luaj = require(cc.PACKAGE_NAME .. ".luaj") -function io.exists(path) - return cc.FileUtils:getInstance():isFileExist(path) -end - -function io.readfile(path) - return cc.HelperFunc:getFileData(path) -end - function device.showAlertAndroid(title, message, buttonLabels, listener) end diff --git a/quick/lib/quick-src/extra/Android.mk b/quick/lib/quick-src/extra/Android.mk index 2e18b8ae..f3ab30ab 100644 --- a/quick/lib/quick-src/extra/Android.mk +++ b/quick/lib/quick-src/extra/Android.mk @@ -7,8 +7,6 @@ LOCAL_MODULE_FILENAME := libextra LOCAL_SRC_FILES := \ $(LOCAL_PATH)/luabinding/cocos2dx_extra_luabinding.cpp \ - $(LOCAL_PATH)/luabinding/HelperFunc_luabinding.cpp \ - $(LOCAL_PATH)/apptools/HelperFunc.cpp \ $(LOCAL_PATH)/crypto/CCCrypto.cpp \ $(LOCAL_PATH)/crypto/base64/libbase64.c \ $(LOCAL_PATH)/network/CCNetwork.cpp \ diff --git a/quick/lib/quick-src/extra/apptools/HelperFunc.cpp b/quick/lib/quick-src/extra/apptools/HelperFunc.cpp deleted file mode 100644 index 1a5df4ba..00000000 --- a/quick/lib/quick-src/extra/apptools/HelperFunc.cpp +++ /dev/null @@ -1,88 +0,0 @@ -#include "cocos2d.h" -extern "C" { -#include "lua.h" -} -#include "xxtea/xxtea.h" -#include "CCLuaEngine.h" -#include "HelperFunc.h" - - -USING_NS_CC; - -unsigned char* HelperFunc::getFileData(const char* pszFileName, const char* pszMode, unsigned long * pSize) -{ - ssize_t size; - unsigned char* buf = FileUtils::getInstance()->getFileData(pszFileName, pszMode, &size); - if (NULL==buf || size<1) return NULL; - -#ifdef LUASTACK_USED_FOR_QUICK_COCOS2DX - LuaStack* stack = LuaEngine::getInstance()->getLuaStack(); - if (NULL==stack) { - return NULL; - } - int xxteaKeyLen = 0; - const char *xxteaKey = stack->getXXTEAKey(&xxteaKeyLen); - int xxteaSignLen = 0; - const char *xxteaSign = stack->getXXTEASign(&xxteaSignLen); - unsigned char* buffer = NULL; - if (xxteaKey && xxteaSign) { - bool isXXTEA = true; - for (int i = 0; isXXTEA && igetLuaStack(); - stack->clean(); - if (buf) { - stack->pushString((const char*)(buf), (int)size); - delete buf; - } else { - stack->pushNil(); - } - return 1; -} - -Data HelperFunc::getData(const std::string &filename) -{ - unsigned long sz; - unsigned char * buf = HelperFunc::getFileData(filename.c_str(), "rb", &sz); - if (!buf) { - return Data::Null; - } - Data data; - data.fastSet(buf, sz); - return data; -} \ No newline at end of file diff --git a/quick/lib/quick-src/extra/apptools/HelperFunc.h b/quick/lib/quick-src/extra/apptools/HelperFunc.h deleted file mode 100644 index ed5c32df..00000000 --- a/quick/lib/quick-src/extra/apptools/HelperFunc.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef Cocos2Dx_ZJF_HelperFunc_h -#define Cocos2Dx_ZJF_HelperFunc_h - -#include "base/CCData.h" - -NS_CC_BEGIN - -class HelperFunc -{ -public: - static int getFileData(const char *pPathFile); - static unsigned char* getFileData(const char* pszFileName, const char* pszMode, unsigned long * pSize); - static Data getData(const std::string& filename); - -private: - -}; - -NS_CC_END - -#endif //Cocos2Dx_ZJF_HelperFunc_h diff --git a/quick/lib/quick-src/extra/luabinding/HelperFunc_luabinding.cpp b/quick/lib/quick-src/extra/luabinding/HelperFunc_luabinding.cpp deleted file mode 100644 index 648c789d..00000000 --- a/quick/lib/quick-src/extra/luabinding/HelperFunc_luabinding.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* -** Lua binding: HelperFunc_luabinding -** Generated automatically by tolua++-1.0.92 on Tue Jul 15 15:28:05 2014. -*/ - -#include "HelperFunc_luabinding.h" -#include "CCLuaEngine.h" - -using namespace cocos2d; - - - - -#include "../apptools/HelperFunc.h" - -/* function to release collected object via destructor */ -#ifdef __cplusplus - - -#endif - - -/* function to register type */ -static void tolua_reg_types (lua_State* tolua_S) -{ - - tolua_usertype(tolua_S,"HelperFunc"); -} - -/* method: getFileData of class HelperFunc */ -#ifndef TOLUA_DISABLE_tolua_HelperFunc_luabinding_HelperFunc_getFileData00 -static int tolua_HelperFunc_luabinding_HelperFunc_getFileData00(lua_State* tolua_S) -{ -#if COCOS2D_DEBUG >= 1 - tolua_Error tolua_err; - if ( - !tolua_isusertable(tolua_S,1,"HelperFunc",0,&tolua_err) || - !tolua_isstring(tolua_S,2,0,&tolua_err) || - !tolua_isnoobj(tolua_S,3,&tolua_err) - ) - goto tolua_lerror; - else -#endif - { - const char* pPathFile = ((const char*) tolua_tostring(tolua_S,2,0)); - { - HelperFunc::getFileData(pPathFile); - - } - } - return 1; -#if COCOS2D_DEBUG >= 1 - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'getFileData'.",&tolua_err); - return 0; -#endif -} -#endif //#ifndef TOLUA_DISABLE - -/* Open function */ -TOLUA_API int tolua_HelperFunc_luabinding_open (lua_State* tolua_S) -{ - tolua_open(tolua_S); - tolua_reg_types(tolua_S); - tolua_module(tolua_S,"cc",0); - tolua_beginmodule(tolua_S,"cc"); - tolua_cclass(tolua_S,"HelperFunc","HelperFunc","",NULL); - tolua_beginmodule(tolua_S,"HelperFunc"); - tolua_function(tolua_S,"getFileData",tolua_HelperFunc_luabinding_HelperFunc_getFileData00); - tolua_endmodule(tolua_S); - tolua_endmodule(tolua_S); - return 1; -} - - -#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 501 - TOLUA_API int luaopen_HelperFunc_luabinding (lua_State* tolua_S) { - return tolua_HelperFunc_luabinding_open(tolua_S); -}; -#endif - diff --git a/quick/lib/quick-src/extra/luabinding/HelperFunc_luabinding.h b/quick/lib/quick-src/extra/luabinding/HelperFunc_luabinding.h deleted file mode 100644 index 8e00f8f6..00000000 --- a/quick/lib/quick-src/extra/luabinding/HelperFunc_luabinding.h +++ /dev/null @@ -1,13 +0,0 @@ - -#ifndef __HELPERFUNC_LUABINDING_H_ -#define __HELPERFUNC_LUABINDING_H_ - -extern "C" { -#include "lua.h" -#include "tolua++.h" -} -#include "tolua_fix.h" - -TOLUA_API int luaopen_HelperFunc_luabinding(lua_State* tolua_S); - -#endif // __HELPERFUNC_LUABINDING_H_ diff --git a/quick/lib/quick-src/extra/luabinding/HelperFunc_luabinding.tolua b/quick/lib/quick-src/extra/luabinding/HelperFunc_luabinding.tolua deleted file mode 100644 index 7db3fb18..00000000 --- a/quick/lib/quick-src/extra/luabinding/HelperFunc_luabinding.tolua +++ /dev/null @@ -1,7 +0,0 @@ - -$#include "../apptools/HelperFunc.h" - -class HelperFunc -{ - static LUA_STRING getFileData(const char *pPathFile); -}; diff --git a/quick/lib/quick-src/extra/luabinding/build.bat b/quick/lib/quick-src/extra/luabinding/build.bat deleted file mode 100644 index ad484966..00000000 --- a/quick/lib/quick-src/extra/luabinding/build.bat +++ /dev/null @@ -1,16 +0,0 @@ -@echo off -set DIR=%~dp0 -set OUTPUT_DIR=%DIR% -set MAKE_LUABINDING="%QUICK_V3_ROOT%quick\bin\compile_luabinding.bat" -pushd -cd "%DIR%" -call %MAKE_LUABINDING% -E CCOBJECTS=CCHTTPRequest -pfx cc -d %OUTPUT_DIR% cocos2dx_extra_luabinding.tolua -echo. -echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -echo. -call %MAKE_LUABINDING% -pfx cc -d %OUTPUT_DIR% cocos2dx_extra_ios_iap_luabinding.tolua -echo. -echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -echo. -call %MAKE_LUABINDING% -pfx cc -d %OUTPUT_DIR% HelperFunc_luabinding.tolua -popd diff --git a/quick/lib/quick-src/extra/luabinding/build.sh b/quick/lib/quick-src/extra/luabinding/build.sh deleted file mode 100755 index 7615058c..00000000 --- a/quick/lib/quick-src/extra/luabinding/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cd "$DIR" -OUTPUT_DIR="$DIR" -MAKE_LUABINDING="$QUICK_V3_ROOT"/quick/bin/compile_luabinding.sh -$MAKE_LUABINDING -E CCOBJECTS=CCHTTPRequest -pfx cc -d "$OUTPUT_DIR" cocos2dx_extra_luabinding.tolua -echo "" -echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" -echo "" -$MAKE_LUABINDING -pfx cc -d "$OUTPUT_DIR" cocos2dx_extra_ios_iap_luabinding.tolua -echo "" -echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" -echo "" -$MAKE_LUABINDING -pfx cc -d "$OUTPUT_DIR" HelperFunc_luabinding.tolua diff --git a/quick/lib/quick-src/extra/luabinding/cocos2dx_extra_ios_iap_luabinding.tolua b/quick/lib/quick-src/extra/luabinding/cocos2dx_extra_ios_iap_luabinding.tolua deleted file mode 100644 index 94e82a7f..00000000 --- a/quick/lib/quick-src/extra/luabinding/cocos2dx_extra_ios_iap_luabinding.tolua +++ /dev/null @@ -1,44 +0,0 @@ - -$#include "store/CCStore.h" - -$using namespace std; -$using namespace cocos2d; -$using namespace cocos2d::extra; - -typedef enum { - CCStoreReceiptVerifyModeNone = 0, - CCStoreReceiptVerifyModeDevice = 1, - CCStoreReceiptVerifyModeServer -} CCStoreReceiptVerifyMode; - - -#define CCStoreReceiptVerifyStatusUnknownError -5 -#define CCStoreReceiptVerifyStatusInvalidReceipt -4 -#define CCStoreReceiptVerifyStatusRequestFailed -3 -#define CCStoreReceiptVerifyStatusInvalidResult -2 -#define CCStoreReceiptVerifyStatusNone -1 -#define CCStoreReceiptVerifyStatusOK 0 - -class Store -{ -public: - static Store* sharedStore(void); - static void purgeSharedStore(void); - - void postInitWithTransactionListenerLua @ postInitWithTransactionListener (LUA_FUNCTION listener); - - bool canMakePurchases(void); - - void loadProductsLua @ loadProducts (LUA_TABLE __LUA_TABLE__, LUA_FUNCTION callback); - void cancelLoadProducts(void); - bool isProductLoaded(const char* productId); - - bool purchase(const char* productId); - void restore(void); - void finishTransactionLua @ finishTransaction (const char* transactionIdentifier); - - CCStoreReceiptVerifyMode getReceiptVerifyMode(void); - void setReceiptVerifyMode(CCStoreReceiptVerifyMode mode, bool isSandbox = true); - const char* getReceiptVerifyServerUrl(void); - void setReceiptVerifyServerUrl(const char* url); -}; diff --git a/quick/lib/quick-src/extra/luabinding/cocos2dx_extra_luabinding.tolua b/quick/lib/quick-src/extra/luabinding/cocos2dx_extra_luabinding.tolua deleted file mode 100644 index 0647c685..00000000 --- a/quick/lib/quick-src/extra/luabinding/cocos2dx_extra_luabinding.tolua +++ /dev/null @@ -1,129 +0,0 @@ - -$#include "crypto/CCCrypto.h" -$#include "native/CCNative.h" -$#include "network/CCNetwork.h" - -$using namespace std; -$using namespace cocos2d; -$using namespace cocos2d::extra; - -class Crypto -{ -public: - static int getAES256KeyLength(void); - - static LUA_STRING encryptAES256Lua @ encryptAES256 (const char* plaintext, - int plaintextLength, - const char* key, - int keyLength); - - static LUA_STRING decryptAES256Lua @ decryptAES256 (const char* ciphertext, - int ciphertextLength, - const char* key, - int keyLength); - - static LUA_STRING encryptXXTEALua @ encryptXXTEA (const char* plaintext, - int plaintextLength, - const char* key, - int keyLength); - - static LUA_STRING decryptXXTEALua @ decryptXXTEA (const char* ciphertext, - int ciphertextLength, - const char* key, - int keyLength); - - static LUA_STRING encodeBase64Lua @ encodeBase64 (const char* input, int inputLength); - static LUA_STRING decodeBase64Lua @ decodeBase64 (const char* input); - - static LUA_STRING MD5Lua @ MD5 (char* input, bool isRawOutput); - - static LUA_STRING MD5FileLua @ MD5File(const char* path); -}; - -// - -class Native -{ -public: - static void showActivityIndicator(void); - static void hideActivityIndicator(void); - - static void createAlert(const char* title, - const char* message, - const char* cancelButtonTitle); - static int addAlertButton(const char* buttonTitle); - - static void showAlertLua @ showAlert (LUA_FUNCTION listener); - - static void cancelAlert(void); - - static string getOpenUDID(void); - static void openURL(const char* url); - static string getInputText(const char* title, const char* message, const char* defaultValue); - - static const string getDeviceName(void); - static void vibrate(); -}; - -// - -#define kCCHTTPRequestMethodGET 0 -#define kCCHTTPRequestMethodPOST 1 -#define kCCHTTPRequestMethodPUT 2 -#define kCCHTTPRequestMethodDELETE 3 - -#define kCCHTTPRequestAcceptEncodingIdentity 0 -#define kCCHTTPRequestAcceptEncodingGzip 1 -#define kCCHTTPRequestAcceptEncodingDeflate 2 - -#define kCCHTTPRequestStateIdle 0 -#define kCCHTTPRequestStateCleared 1 -#define kCCHTTPRequestStateInProgress 2 -#define kCCHTTPRequestStateCompleted 3 -#define kCCHTTPRequestStateCancelled 4 -#define kCCHTTPRequestStateFailed 5 - -class HTTPRequest : public cc.Ref -{ - static HTTPRequest* createWithUrlLua @ createWithUrl (LUA_FUNCTION listener, - const char* url, - int method = kCCHTTPRequestMethodGET); - void setRequestUrl(const char* url); - string getRequestUrl(void); - void addRequestHeader(const char* header); - void addPOSTValue(const char* key, const char* value); - void setPOSTData(const char* data); - void addFormFile(const char *name, const char *filePath, const char * fileType="application/octet-stream"); - void addFormContents(const char *name, const char *value); - void setCookieString(const char *cookie); - string getCookieString(void); - void setAcceptEncoding(int acceptEncoding); - void setTimeout(int timeout); - bool start(void); - void cancel(void); - int getState(void); - int getResponseStatusCode(void); - string getResponseHeadersString(void); - string getResponseString(void); - LUA_STRING getResponseDataLua @ getResponseData (void); - int getResponseDataLength(void); - int saveResponseData(const char* filename); - int getErrorCode(void); - string getErrorMessage(void); -}; - -#define kCCNetworkStatusNotReachable 0 -#define kCCNetworkStatusReachableViaWiFi 1 -#define kCCNetworkStatusReachableViaWWAN 2 - -class Network -{ - static bool isLocalWiFiAvailable(void); - static bool isInternetConnectionAvailable(void); - static bool isHostNameReachable(const char* hostName); - static int getInternetConnectionStatus(void); - - static HTTPRequest* createHTTPRequestLua @ createHTTPRequest (LUA_FUNCTION listener, - const char* url, - int method = kCCHTTPRequestMethodGET); -}; diff --git a/quick/player/Classes/AppDelegate.cpp b/quick/player/Classes/AppDelegate.cpp index 55dafe34..0729495a 100644 --- a/quick/player/Classes/AppDelegate.cpp +++ b/quick/player/Classes/AppDelegate.cpp @@ -6,7 +6,6 @@ #include "native/CCNative.h" #include "network/CCHTTPRequest.h" #include "luabinding/cocos2dx_extra_luabinding.h" -#include "luabinding/HelperFunc_luabinding.h" #include "lua_extensions/lua_extensions_more.h" #include "PlayerProtocol.h" @@ -23,7 +22,6 @@ static void quick_module_register(lua_State *L) { register_all_quick_manual(L); luaopen_cocos2dx_extra_luabinding(L); - luaopen_HelperFunc_luabinding(L); } lua_pop(L, 1); } diff --git a/quick/player/proj.mac/player3.xcodeproj/project.pbxproj b/quick/player/proj.mac/player3.xcodeproj/project.pbxproj index c5621b23..5a22c432 100644 --- a/quick/player/proj.mac/player3.xcodeproj/project.pbxproj +++ b/quick/player/proj.mac/player3.xcodeproj/project.pbxproj @@ -30,11 +30,9 @@ 50D7C96C17EBBEDF005D0B91 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */; }; 50D7C96E17EBBEE6005D0B91 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D7C96D17EBBEE6005D0B91 /* AppKit.framework */; }; 50D7C97017EBBEEC005D0B91 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D7C96F17EBBEEC005D0B91 /* IOKit.framework */; }; - 9F72892B1A24957700EE0234 /* HelperFunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F7288311A24957700EE0234 /* HelperFunc.cpp */; }; 9F72892C1A24957700EE0234 /* libbase64.c in Sources */ = {isa = PBXBuildFile; fileRef = 9F7288361A24957700EE0234 /* libbase64.c */; }; 9F72892D1A24957700EE0234 /* CCCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F7288381A24957700EE0234 /* CCCrypto.cpp */; }; 9F7289611A24957700EE0234 /* cocos2dx_extra_luabinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F7288A71A24957700EE0234 /* cocos2dx_extra_luabinding.cpp */; }; - 9F7289631A24957700EE0234 /* HelperFunc_luabinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F7288AA1A24957700EE0234 /* HelperFunc_luabinding.cpp */; }; 9F7289661A24957700EE0234 /* CCHTTPRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F7288B31A24957700EE0234 /* CCHTTPRequest.cpp */; }; 9F7289671A24957700EE0234 /* CCNetwork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F7288B61A24957700EE0234 /* CCNetwork.cpp */; }; 9F7289781A24957700EE0234 /* CCNetworkIOSMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F7288D61A24957700EE0234 /* CCNetworkIOSMac.mm */; }; @@ -163,8 +161,6 @@ 50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 50D7C96D17EBBEE6005D0B91 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; 50D7C96F17EBBEEC005D0B91 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; - 9F7288311A24957700EE0234 /* HelperFunc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HelperFunc.cpp; sourceTree = ""; }; - 9F7288321A24957700EE0234 /* HelperFunc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelperFunc.h; sourceTree = ""; }; 9F7288331A24957700EE0234 /* cocos2dx_extra.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocos2dx_extra.h; sourceTree = ""; }; 9F7288361A24957700EE0234 /* libbase64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = libbase64.c; sourceTree = ""; }; 9F7288371A24957700EE0234 /* libbase64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libbase64.h; sourceTree = ""; }; @@ -172,8 +168,6 @@ 9F7288391A24957700EE0234 /* CCCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCrypto.h; sourceTree = ""; }; 9F7288A71A24957700EE0234 /* cocos2dx_extra_luabinding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cocos2dx_extra_luabinding.cpp; sourceTree = ""; }; 9F7288A81A24957700EE0234 /* cocos2dx_extra_luabinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocos2dx_extra_luabinding.h; sourceTree = ""; }; - 9F7288AA1A24957700EE0234 /* HelperFunc_luabinding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HelperFunc_luabinding.cpp; sourceTree = ""; }; - 9F7288AB1A24957700EE0234 /* HelperFunc_luabinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelperFunc_luabinding.h; sourceTree = ""; }; 9F7288B01A24957700EE0234 /* CCAlertViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAlertViewDelegate.h; sourceTree = ""; }; 9F7288B11A24957700EE0234 /* CCNative.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNative.h; sourceTree = ""; }; 9F7288B31A24957700EE0234 /* CCHTTPRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCHTTPRequest.cpp; sourceTree = ""; }; @@ -409,15 +403,6 @@ path = extra; sourceTree = ""; }; - 9F7288301A24957700EE0234 /* apptools */ = { - isa = PBXGroup; - children = ( - 9F7288311A24957700EE0234 /* HelperFunc.cpp */, - 9F7288321A24957700EE0234 /* HelperFunc.h */, - ); - path = apptools; - sourceTree = ""; - }; 9F7288341A24957700EE0234 /* crypto */ = { isa = PBXGroup; children = ( @@ -442,8 +427,6 @@ children = ( 9F7288A71A24957700EE0234 /* cocos2dx_extra_luabinding.cpp */, 9F7288A81A24957700EE0234 /* cocos2dx_extra_luabinding.h */, - 9F7288AA1A24957700EE0234 /* HelperFunc_luabinding.cpp */, - 9F7288AB1A24957700EE0234 /* HelperFunc_luabinding.h */, ); path = luabinding; sourceTree = ""; @@ -813,7 +796,6 @@ 0AA993221DAF389F002339DC /* pb.c in Sources */, 0450D5F51D05B05F00B9B05E /* lunqlite.c in Sources */, 9FD0193419F8C4D4005E0C49 /* PlayerTaskServiceProtocol.cpp in Sources */, - 9F72892B1A24957700EE0234 /* HelperFunc.cpp in Sources */, 0450D5F61D05B05F00B9B05E /* unqlite.c in Sources */, 9FD01B2919F8C6A3005E0C49 /* PlayerMessageBoxServiceMac.mm in Sources */, 9FD01B2D19F8C6BA005E0C49 /* AppController.mm in Sources */, @@ -836,7 +818,6 @@ 9F72898A1A24957700EE0234 /* lua_cjson.c in Sources */, 0A532A8D1E62FE19004E2B32 /* lpcode.c in Sources */, 0A532A8C1E62FE19004E2B32 /* lpcap.c in Sources */, - 9F7289631A24957700EE0234 /* HelperFunc_luabinding.cpp in Sources */, 9F72892C1A24957700EE0234 /* libbase64.c in Sources */, 9FD01B1219F8C69C005E0C49 /* ConsoleWindowController.m in Sources */, 9F7289661A24957700EE0234 /* CCHTTPRequest.cpp in Sources */, diff --git a/quick/player/proj.win32/player.vcxproj b/quick/player/proj.win32/player.vcxproj index a15a8677..0e25d95c 100644 --- a/quick/player/proj.win32/player.vcxproj +++ b/quick/player/proj.win32/player.vcxproj @@ -199,12 +199,10 @@ xcopy /Y /Q "$(TargetPath)" "$(ProjectDir)..\win32\" - - @@ -315,7 +313,6 @@ xcopy /Y /Q "$(TargetPath)" "$(ProjectDir)..\win32\" - Default @@ -342,7 +339,6 @@ xcopy /Y /Q "$(TargetPath)" "$(ProjectDir)..\win32\" - Default diff --git a/quick/player/proj.win32/player.vcxproj.filters b/quick/player/proj.win32/player.vcxproj.filters index f4efe15c..721d9a1f 100644 --- a/quick/player/proj.win32/player.vcxproj.filters +++ b/quick/player/proj.win32/player.vcxproj.filters @@ -16,9 +16,6 @@ {50a0a35c-3c28-4a41-8e4e-599902c49781} - - {954dc9d2-8ab6-40b2-a94f-0f41909a69f3} - {29868673-81d3-4b89-9cbb-013c4604ab3d} @@ -90,9 +87,6 @@ Classes\quick-src\ProjectConfig - - Classes\quick-src\extra\apptools - Classes\quick-src\extra\crypto\base64 @@ -105,9 +99,6 @@ Classes\quick-src\extra\luabinding - - Classes\quick-src\extra\luabinding - Classes\quick-src\extra\platform\win32 @@ -263,9 +254,6 @@ Classes\quick-src\ProjectConfig - - Classes\quick-src\extra\apptools - Classes\quick-src\extra\crypto\base64 @@ -278,9 +266,6 @@ Classes\quick-src\extra\luabinding - - Classes\quick-src\extra\luabinding - Classes\quick-src\extra\platform\win32 diff --git a/quick/templates/lua-template-quick/frameworks/runtime-src/Classes/AppDelegate.cpp b/quick/templates/lua-template-quick/frameworks/runtime-src/Classes/AppDelegate.cpp index a3e5f1d3..752ba7ad 100644 --- a/quick/templates/lua-template-quick/frameworks/runtime-src/Classes/AppDelegate.cpp +++ b/quick/templates/lua-template-quick/frameworks/runtime-src/Classes/AppDelegate.cpp @@ -8,7 +8,6 @@ #include "cocos2dx_extra.h" #include "lua_extensions/lua_extensions_more.h" #include "luabinding/cocos2dx_extra_luabinding.h" -#include "luabinding/HelperFunc_luabinding.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #include "luabinding/cocos2dx_extra_ios_iap_luabinding.h" #endif @@ -27,7 +26,6 @@ static void quick_module_register(lua_State *L) register_all_quick_manual(L); // extra luaopen_cocos2dx_extra_luabinding(L); - luaopen_HelperFunc_luabinding(L); #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) luaopen_cocos2dx_extra_ios_iap_luabinding(L); #endif diff --git a/quick/templates/lua-template-quick/frameworks/runtime-src/proj.ios_mac/__PROJECT_PACKAGE_LAST_NAME__.xcodeproj/project.pbxproj b/quick/templates/lua-template-quick/frameworks/runtime-src/proj.ios_mac/__PROJECT_PACKAGE_LAST_NAME__.xcodeproj/project.pbxproj index a5927a67..226ebb1e 100644 --- a/quick/templates/lua-template-quick/frameworks/runtime-src/proj.ios_mac/__PROJECT_PACKAGE_LAST_NAME__.xcodeproj/project.pbxproj +++ b/quick/templates/lua-template-quick/frameworks/runtime-src/proj.ios_mac/__PROJECT_PACKAGE_LAST_NAME__.xcodeproj/project.pbxproj @@ -75,8 +75,6 @@ 9F91071A19F5614900AD5CAB /* cocos2dx_extra_ios_iap_luabinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F91061A19F5614800AD5CAB /* cocos2dx_extra_ios_iap_luabinding.cpp */; }; 9F91071E19F5614900AD5CAB /* cocos2dx_extra_luabinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F91061D19F5614800AD5CAB /* cocos2dx_extra_luabinding.cpp */; }; 9F91071F19F5614900AD5CAB /* cocos2dx_extra_luabinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F91061D19F5614800AD5CAB /* cocos2dx_extra_luabinding.cpp */; }; - 9F91072219F5614900AD5CAB /* HelperFunc_luabinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F91062019F5614800AD5CAB /* HelperFunc_luabinding.cpp */; }; - 9F91072319F5614900AD5CAB /* HelperFunc_luabinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F91062019F5614800AD5CAB /* HelperFunc_luabinding.cpp */; }; 9F91072619F5614900AD5CAB /* CCHTTPRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F91062719F5614800AD5CAB /* CCHTTPRequest.cpp */; }; 9F91072719F5614900AD5CAB /* CCHTTPRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F91062719F5614800AD5CAB /* CCHTTPRequest.cpp */; }; 9F91072819F5614900AD5CAB /* CCNetwork.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F91062A19F5614800AD5CAB /* CCNetwork.cpp */; }; @@ -126,8 +124,6 @@ 9F91077F19F5614900AD5CAB /* lua_extensions_more.c in Sources */ = {isa = PBXBuildFile; fileRef = 9F91068219F5614800AD5CAB /* lua_extensions_more.c */; }; 9F91078019F5614900AD5CAB /* lua_zlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 9F91068519F5614800AD5CAB /* lua_zlib.c */; }; 9F91078119F5614900AD5CAB /* lua_zlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 9F91068519F5614800AD5CAB /* lua_zlib.c */; }; - 9F91078619F561CD00AD5CAB /* HelperFunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F9105A719F5614800AD5CAB /* HelperFunc.cpp */; }; - 9F91078719F561CD00AD5CAB /* HelperFunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F9105A719F5614800AD5CAB /* HelperFunc.cpp */; }; 9F91078919F5628A00AD5CAB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F91078819F5628A00AD5CAB /* SystemConfiguration.framework */; }; 9F91079419F56A6600AD5CAB /* ProjectConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F91079019F56A6600AD5CAB /* ProjectConfig.cpp */; }; 9F91079519F56A6600AD5CAB /* ProjectConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F91079019F56A6600AD5CAB /* ProjectConfig.cpp */; }; @@ -277,8 +273,6 @@ 521A8E6F19F0C3D200D177D7 /* Default-736h@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-736h@3x.png"; sourceTree = ""; }; 9F598A0719F5F3A6006015D6 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; 9F598A0A19F5F4F4006015D6 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.1.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; }; - 9F9105A719F5614800AD5CAB /* HelperFunc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HelperFunc.cpp; path = "quick/lib/quick-src/extra/apptools/HelperFunc.cpp"; sourceTree = QUICK_V3_ROOT; }; - 9F9105A819F5614800AD5CAB /* HelperFunc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelperFunc.h; path = "quick/lib/quick-src/extra/apptools/HelperFunc.h"; sourceTree = QUICK_V3_ROOT; }; 9F9105A919F5614800AD5CAB /* cocos2dx_extra.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cocos2dx_extra.h; path = "quick/lib/quick-src/extra/cocos2dx_extra.h"; sourceTree = QUICK_V3_ROOT; }; 9F9105AC19F5614800AD5CAB /* libbase64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = libbase64.c; path = "quick/lib/quick-src/extra/crypto/base64/libbase64.c"; sourceTree = QUICK_V3_ROOT; }; 9F9105AD19F5614800AD5CAB /* libbase64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libbase64.h; path = "quick/lib/quick-src/extra/crypto/base64/libbase64.h"; sourceTree = QUICK_V3_ROOT; }; @@ -288,8 +282,6 @@ 9F91061B19F5614800AD5CAB /* cocos2dx_extra_ios_iap_luabinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cocos2dx_extra_ios_iap_luabinding.h; path = "quick/lib/quick-src/extra/luabinding/cocos2dx_extra_ios_iap_luabinding.h"; sourceTree = QUICK_V3_ROOT; }; 9F91061D19F5614800AD5CAB /* cocos2dx_extra_luabinding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cocos2dx_extra_luabinding.cpp; path = "quick/lib/quick-src/extra/luabinding/cocos2dx_extra_luabinding.cpp"; sourceTree = QUICK_V3_ROOT; }; 9F91061E19F5614800AD5CAB /* cocos2dx_extra_luabinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cocos2dx_extra_luabinding.h; path = "quick/lib/quick-src/extra/luabinding/cocos2dx_extra_luabinding.h"; sourceTree = QUICK_V3_ROOT; }; - 9F91062019F5614800AD5CAB /* HelperFunc_luabinding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HelperFunc_luabinding.cpp; path = "quick/lib/quick-src/extra/luabinding/HelperFunc_luabinding.cpp"; sourceTree = QUICK_V3_ROOT; }; - 9F91062119F5614800AD5CAB /* HelperFunc_luabinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelperFunc_luabinding.h; path = "quick/lib/quick-src/extra/luabinding/HelperFunc_luabinding.h"; sourceTree = QUICK_V3_ROOT; }; 9F91062419F5614800AD5CAB /* CCAlertViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCAlertViewDelegate.h; path = "quick/lib/quick-src/extra/native/CCAlertViewDelegate.h"; sourceTree = QUICK_V3_ROOT; }; 9F91062519F5614800AD5CAB /* CCNative.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNative.h; path = "quick/lib/quick-src/extra/native/CCNative.h"; sourceTree = QUICK_V3_ROOT; }; 9F91062719F5614800AD5CAB /* CCHTTPRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCHTTPRequest.cpp; path = "quick/lib/quick-src/extra/network/CCHTTPRequest.cpp"; sourceTree = QUICK_V3_ROOT; }; @@ -563,15 +555,6 @@ path = extra; sourceTree = ""; }; - 9F9105A619F5614800AD5CAB /* apptools */ = { - isa = PBXGroup; - children = ( - 9F9105A719F5614800AD5CAB /* HelperFunc.cpp */, - 9F9105A819F5614800AD5CAB /* HelperFunc.h */, - ); - path = apptools; - sourceTree = ""; - }; 9F9105AA19F5614800AD5CAB /* crypto */ = { isa = PBXGroup; children = ( @@ -598,8 +581,6 @@ 9F91061B19F5614800AD5CAB /* cocos2dx_extra_ios_iap_luabinding.h */, 9F91061D19F5614800AD5CAB /* cocos2dx_extra_luabinding.cpp */, 9F91061E19F5614800AD5CAB /* cocos2dx_extra_luabinding.h */, - 9F91062019F5614800AD5CAB /* HelperFunc_luabinding.cpp */, - 9F91062119F5614800AD5CAB /* HelperFunc_luabinding.h */, ); path = luabinding; sourceTree = ""; @@ -1072,7 +1053,6 @@ 9F91074D19F5614900AD5CAB /* ReachabilityIOSMac.m in Sources */, 9F91076D19F5614900AD5CAB /* fpconv.c in Sources */, 9F9106B719F5614900AD5CAB /* CCCrypto.cpp in Sources */, - 9F91078619F561CD00AD5CAB /* HelperFunc.cpp in Sources */, 9F91079519F56A6600AD5CAB /* ProjectConfig.cpp in Sources */, 9F91077719F5614900AD5CAB /* lfs.c in Sources */, 9F91077B19F5614900AD5CAB /* lsqlite3.c in Sources */, @@ -1084,7 +1064,6 @@ 9F91077919F5614900AD5CAB /* lpack.c in Sources */, C07828F818B4D72E00BD2287 /* main.m in Sources */, 9F91074B19F5614900AD5CAB /* CCNetworkIOSMac.mm in Sources */, - 9F91072319F5614900AD5CAB /* HelperFunc_luabinding.cpp in Sources */, 9F91077D19F5614900AD5CAB /* sqlite3.c in Sources */, 0A532A611E62FB06004E2B32 /* lpprint.c in Sources */, 9F91075119F5614900AD5CAB /* CCNative.mm in Sources */, @@ -1121,7 +1100,6 @@ 0A532A621E62FB06004E2B32 /* lptree.c in Sources */, 9F91074019F5614900AD5CAB /* SBJSON.m in Sources */, 9F91073E19F5614900AD5CAB /* CCStoreReceiptVerifyRequestIOS.mm in Sources */, - 9F91072219F5614900AD5CAB /* HelperFunc_luabinding.cpp in Sources */, F293BB9C15EB831F00256477 /* AppDelegate.cpp in Sources */, 9F91076819F5614900AD5CAB /* CCStoreProduct.cpp in Sources */, 0A532A5C1E62FB06004E2B32 /* lpcap.c in Sources */, @@ -1146,7 +1124,6 @@ 9F91076619F5614900AD5CAB /* CCStorePaymentTransaction.cpp in Sources */, 5023812417EBBCAC00990C9B /* main.m in Sources */, 9F91072819F5614900AD5CAB /* CCNetwork.cpp in Sources */, - 9F91078719F561CD00AD5CAB /* HelperFunc.cpp in Sources */, 9F91073C19F5614900AD5CAB /* CCStorePaymentTransactionWrapper.mm in Sources */, 0A532A641E62FB06004E2B32 /* lpvm.c in Sources */, 9F9106B419F5614900AD5CAB /* libbase64.c in Sources */, diff --git a/quick/templates/lua-template-quick/frameworks/runtime-src/proj.win32/__PROJECT_COCOS_NAME__.vcxproj b/quick/templates/lua-template-quick/frameworks/runtime-src/proj.win32/__PROJECT_COCOS_NAME__.vcxproj index 1b0c3e86..6cb2c8a7 100644 --- a/quick/templates/lua-template-quick/frameworks/runtime-src/proj.win32/__PROJECT_COCOS_NAME__.vcxproj +++ b/quick/templates/lua-template-quick/frameworks/runtime-src/proj.win32/__PROJECT_COCOS_NAME__.vcxproj @@ -180,12 +180,10 @@ - - @@ -269,7 +267,6 @@ - Default @@ -304,7 +301,6 @@ - diff --git a/quick/templates/lua-template-quick/frameworks/runtime-src/proj.win32/__PROJECT_COCOS_NAME__.vcxproj.filters b/quick/templates/lua-template-quick/frameworks/runtime-src/proj.win32/__PROJECT_COCOS_NAME__.vcxproj.filters index 09da64bf..dcfb959f 100644 --- a/quick/templates/lua-template-quick/frameworks/runtime-src/proj.win32/__PROJECT_COCOS_NAME__.vcxproj.filters +++ b/quick/templates/lua-template-quick/frameworks/runtime-src/proj.win32/__PROJECT_COCOS_NAME__.vcxproj.filters @@ -40,9 +40,6 @@ {86a62d16-c431-4d73-8ea6-16a36bc0d780} - - {0f4429db-4f7a-4b14-b930-0a05a705a7c3} - {7e3dbde2-df3c-4bbf-ab9e-34dd5bf5ef9b} @@ -124,9 +121,6 @@ Classes\quick-src\lua_extensions\cjson - - Classes\quick-src\extra\apptools - Classes\quick-src\extra\crypto @@ -139,9 +133,6 @@ Classes\quick-src\extra\luabinding - - Classes\quick-src\extra\luabinding - Classes\quick-src\extra\native @@ -244,9 +235,6 @@ Classes\quick-src\lua_extensions\cjson - - Classes\quick-src\extra\apptools - Classes\quick-src\extra\crypto @@ -259,9 +247,6 @@ Classes\quick-src\extra\luabinding - - Classes\quick-src\extra\luabinding - Classes\quick-src\extra\platform\win32