mirror of https://github.com/axmolengine/axmol.git
Refactor WebSocket to support SSL (wss) (#17172)
* Refactors WebSocket: 1. Supports wss protocol 2. Uses only one libwebsockets context, multiple wsi instances to avoid multi-thread issues 3. Uses lws_create_vhost to create multiple virtual host, different protocols works * Adds openssl include path to xcode project configuration. * mac doesn’t depend on curl * ca file path should be full path. * More bug fixes like which in https://github.com/cocos2d/cocos2d-x/pull/6986 * Remove curl dependence for mac * Updates Andorid.mk * [win32] Adds wss support for win32, and updates openssl, libcurl, libwebsockets libraries. * Updates external/config.json to 118. * [win32] Updates cocos/2d/libcocos2d.vcxproj to fix compilation error while building in release mode. * Linux support websocket ssl connection. * Updates external/config.json * Updates install-deps-linux.sh * Adds dependence of binutils, print ld version * Updates travis scripts. * Updates travis scripts. * Updates travis script, don’t output log while extracting. * update before-install.sh * updates before-install.sh * updates before-install.sh * don’t output log for installing software. * Updates config.json to 120.
This commit is contained in:
parent
1278ccfbb2
commit
b1f2a056b2
|
@ -10,13 +10,6 @@ matrix:
|
||||||
- secure: M5lyDs0qai15mWHzJdkh0WPfVJJmVZu6SWtYULxatukGPXVwoQvmEtYAwAW+iz6aM+tXksQ/mk6nW5L8UFbHm+n6yrsa5bZU9sGXjilPE8p8bLFYDmIbPRazU+E6pBP3J2CDoAm0XnWkiYQ8feTxKTo6ysLnHAEjyaHTw0+Q1GM=
|
- secure: M5lyDs0qai15mWHzJdkh0WPfVJJmVZu6SWtYULxatukGPXVwoQvmEtYAwAW+iz6aM+tXksQ/mk6nW5L8UFbHm+n6yrsa5bZU9sGXjilPE8p8bLFYDmIbPRazU+E6pBP3J2CDoAm0XnWkiYQ8feTxKTo6ysLnHAEjyaHTw0+Q1GM=
|
||||||
sudo: required
|
sudo: required
|
||||||
language: cpp
|
language: cpp
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
sources:
|
|
||||||
- george-edison55-precise-backports # cmake 3.2.3 / doxygen 1.8.3
|
|
||||||
packages:
|
|
||||||
- cmake
|
|
||||||
- cmake-data
|
|
||||||
# android
|
# android
|
||||||
- os: linux
|
- os: linux
|
||||||
env: BUILD_TARGET=android
|
env: BUILD_TARGET=android
|
||||||
|
|
|
@ -1220,7 +1220,6 @@
|
||||||
292DB16019B461CA00A80320 /* ExtensionDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB15D19B461CA00A80320 /* ExtensionDeprecated.cpp */; };
|
292DB16019B461CA00A80320 /* ExtensionDeprecated.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB15D19B461CA00A80320 /* ExtensionDeprecated.cpp */; };
|
||||||
292DB16119B461CA00A80320 /* ExtensionDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */; };
|
292DB16119B461CA00A80320 /* ExtensionDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */; };
|
||||||
292DB16219B461CA00A80320 /* ExtensionDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */; };
|
292DB16219B461CA00A80320 /* ExtensionDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 292DB15E19B461CA00A80320 /* ExtensionDeprecated.h */; };
|
||||||
292F1A641A52447100E479F8 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 292F1A611A52447100E479F8 /* libcurl.a */; };
|
|
||||||
29394CF019B01DBA00D2DE1A /* UIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEC19B01DBA00D2DE1A /* UIWebView.h */; };
|
29394CF019B01DBA00D2DE1A /* UIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEC19B01DBA00D2DE1A /* UIWebView.h */; };
|
||||||
29394CF119B01DBA00D2DE1A /* UIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEC19B01DBA00D2DE1A /* UIWebView.h */; };
|
29394CF119B01DBA00D2DE1A /* UIWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 29394CEC19B01DBA00D2DE1A /* UIWebView.h */; };
|
||||||
29394CF219B01DBA00D2DE1A /* UIWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29394CED19B01DBA00D2DE1A /* UIWebView.mm */; };
|
29394CF219B01DBA00D2DE1A /* UIWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29394CED19B01DBA00D2DE1A /* UIWebView.mm */; };
|
||||||
|
@ -1773,7 +1772,6 @@
|
||||||
50693C611B6BF2AE005C5820 /* CCDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50693C5D1B6BF2AE005C5820 /* CCDownloader.h */; };
|
50693C611B6BF2AE005C5820 /* CCDownloader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50693C5D1B6BF2AE005C5820 /* CCDownloader.h */; };
|
||||||
5070031B1B69735200E83DDD /* HttpClient-android.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 507003161B69735200E83DDD /* HttpClient-android.cpp */; };
|
5070031B1B69735200E83DDD /* HttpClient-android.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 507003161B69735200E83DDD /* HttpClient-android.cpp */; };
|
||||||
5070031D1B69735200E83DDD /* HttpClient-winrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 507003171B69735200E83DDD /* HttpClient-winrt.cpp */; };
|
5070031D1B69735200E83DDD /* HttpClient-winrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 507003171B69735200E83DDD /* HttpClient-winrt.cpp */; };
|
||||||
5070031F1B69735200E83DDD /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 507003181B69735200E83DDD /* HttpClient.cpp */; };
|
|
||||||
507003211B69735300E83DDD /* HttpConnection-winrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 507003191B69735200E83DDD /* HttpConnection-winrt.cpp */; };
|
507003211B69735300E83DDD /* HttpConnection-winrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 507003191B69735200E83DDD /* HttpConnection-winrt.cpp */; };
|
||||||
507003221B69735300E83DDD /* HttpConnection-winrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 507003191B69735200E83DDD /* HttpConnection-winrt.cpp */; };
|
507003221B69735300E83DDD /* HttpConnection-winrt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 507003191B69735200E83DDD /* HttpConnection-winrt.cpp */; };
|
||||||
507003231B69735300E83DDD /* HttpConnection-winrt.h in Headers */ = {isa = PBXBuildFile; fileRef = 5070031A1B69735200E83DDD /* HttpConnection-winrt.h */; };
|
507003231B69735300E83DDD /* HttpConnection-winrt.h in Headers */ = {isa = PBXBuildFile; fileRef = 5070031A1B69735200E83DDD /* HttpConnection-winrt.h */; };
|
||||||
|
@ -7812,7 +7810,6 @@
|
||||||
B21770421977ECF8009EE11B /* ApplicationServices.framework in Frameworks */,
|
B21770421977ECF8009EE11B /* ApplicationServices.framework in Frameworks */,
|
||||||
B21770401977ECE6009EE11B /* OpenGL.framework in Frameworks */,
|
B21770401977ECE6009EE11B /* OpenGL.framework in Frameworks */,
|
||||||
B217703C1977ECB4009EE11B /* IOKit.framework in Frameworks */,
|
B217703C1977ECB4009EE11B /* IOKit.framework in Frameworks */,
|
||||||
292F1A641A52447100E479F8 /* libcurl.a in Frameworks */,
|
|
||||||
1A570347180BD0850088DEC7 /* libglfw3.a in Frameworks */,
|
1A570347180BD0850088DEC7 /* libglfw3.a in Frameworks */,
|
||||||
1A570361180BD1080088DEC7 /* libpng.a in Frameworks */,
|
1A570361180BD1080088DEC7 /* libpng.a in Frameworks */,
|
||||||
1A57037B180BD1C90088DEC7 /* libjpeg.a in Frameworks */,
|
1A57037B180BD1C90088DEC7 /* libjpeg.a in Frameworks */,
|
||||||
|
@ -14830,7 +14827,6 @@
|
||||||
B665E3A61AA80A6500DDB1C5 /* CCPURandomiser.cpp in Sources */,
|
B665E3A61AA80A6500DDB1C5 /* CCPURandomiser.cpp in Sources */,
|
||||||
B665E3CA1AA80A6600DDB1C5 /* CCPUScaleVelocityAffectorTranslator.cpp in Sources */,
|
B665E3CA1AA80A6600DDB1C5 /* CCPUScaleVelocityAffectorTranslator.cpp in Sources */,
|
||||||
1A57008D180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */,
|
1A57008D180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */,
|
||||||
5070031F1B69735200E83DDD /* HttpClient.cpp in Sources */,
|
|
||||||
B665E26E1AA80A6500DDB1C5 /* CCPUDoFreezeEventHandlerTranslator.cpp in Sources */,
|
B665E26E1AA80A6500DDB1C5 /* CCPUDoFreezeEventHandlerTranslator.cpp in Sources */,
|
||||||
B6DD2FF11B04825B00E47F5F /* DetourTileCacheBuilder.cpp in Sources */,
|
B6DD2FF11B04825B00E47F5F /* DetourTileCacheBuilder.cpp in Sources */,
|
||||||
B665E1FE1AA80A6500DDB1C5 /* CCPUAlignAffector.cpp in Sources */,
|
B665E1FE1AA80A6500DDB1C5 /* CCPUAlignAffector.cpp in Sources */,
|
||||||
|
@ -17350,7 +17346,7 @@
|
||||||
);
|
);
|
||||||
MACH_O_TYPE = staticlib;
|
MACH_O_TYPE = staticlib;
|
||||||
OTHER_LDFLAGS = "-llibsql3";
|
OTHER_LDFLAGS = "-llibsql3";
|
||||||
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/curl/include/mac $(SRCROOT)/../external/freetype2/include/mac/freetype2";
|
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/curl/include/mac $(SRCROOT)/../external/freetype2/include/mac/freetype2 $(SRCROOT)/../external/openssl/include/mac";
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
};
|
};
|
||||||
|
@ -17388,7 +17384,7 @@
|
||||||
);
|
);
|
||||||
MACH_O_TYPE = staticlib;
|
MACH_O_TYPE = staticlib;
|
||||||
OTHER_LDFLAGS = "-llibsql3";
|
OTHER_LDFLAGS = "-llibsql3";
|
||||||
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/curl/include/mac $(SRCROOT)/../external/freetype2/include/mac/freetype2";
|
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/curl/include/mac $(SRCROOT)/../external/freetype2/include/mac/freetype2 $(SRCROOT)/../external/openssl/include/mac";
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
};
|
};
|
||||||
|
@ -17419,7 +17415,7 @@
|
||||||
OTHER_LDFLAGS = "-llibsql3";
|
OTHER_LDFLAGS = "-llibsql3";
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SDKROOT = appletvos9.1;
|
SDKROOT = appletvos9.1;
|
||||||
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2";
|
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2 $(SRCROOT)/../external/openssl/include/ios";
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
};
|
};
|
||||||
|
@ -17451,7 +17447,7 @@
|
||||||
OTHER_LDFLAGS = "-llibsql3";
|
OTHER_LDFLAGS = "-llibsql3";
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SDKROOT = appletvos9.1;
|
SDKROOT = appletvos9.1;
|
||||||
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2";
|
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2 $(SRCROOT)/../external/openssl/include/ios";
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
};
|
};
|
||||||
|
@ -17484,7 +17480,7 @@
|
||||||
OTHER_LDFLAGS = "-llibsql3";
|
OTHER_LDFLAGS = "-llibsql3";
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
TARGETED_DEVICE_FAMILY = "1,2";
|
||||||
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2";
|
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2 $(SRCROOT)/../external/openssl/include/ios";
|
||||||
VALID_ARCHS = "arm64 armv7";
|
VALID_ARCHS = "arm64 armv7";
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
|
@ -17519,7 +17515,7 @@
|
||||||
OTHER_LDFLAGS = "-llibsql3";
|
OTHER_LDFLAGS = "-llibsql3";
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
TARGETED_DEVICE_FAMILY = "1,2";
|
||||||
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2";
|
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2 $(SRCROOT)/../external/openssl/include/ios";
|
||||||
VALID_ARCHS = "arm64 armv7";
|
VALID_ARCHS = "arm64 armv7";
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
|
|
|
@ -17,6 +17,7 @@ DEPENDS+=' libxmu-dev'
|
||||||
DEPENDS+=' libglu1-mesa-dev'
|
DEPENDS+=' libglu1-mesa-dev'
|
||||||
DEPENDS+=' libgl2ps-dev'
|
DEPENDS+=' libgl2ps-dev'
|
||||||
DEPENDS+=' libxi-dev'
|
DEPENDS+=' libxi-dev'
|
||||||
|
DEPENDS+=' gcc-4.9'
|
||||||
DEPENDS+=' g++-4.9'
|
DEPENDS+=' g++-4.9'
|
||||||
DEPENDS+=' libzip-dev'
|
DEPENDS+=' libzip-dev'
|
||||||
DEPENDS+=' libpng12-dev'
|
DEPENDS+=' libpng12-dev'
|
||||||
|
@ -26,6 +27,7 @@ DEPENDS+=' libsqlite3-dev'
|
||||||
DEPENDS+=' libglew-dev'
|
DEPENDS+=' libglew-dev'
|
||||||
DEPENDS+=' libssl-dev'
|
DEPENDS+=' libssl-dev'
|
||||||
DEPENDS+=' libgtk-3-dev'
|
DEPENDS+=' libgtk-3-dev'
|
||||||
|
DEPENDS+=' binutils'
|
||||||
|
|
||||||
MISSING=
|
MISSING=
|
||||||
echo "Checking for missing packages ..."
|
echo "Checking for missing packages ..."
|
||||||
|
@ -35,13 +37,6 @@ for i in $DEPENDS; do
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
if [ -f /usr/bin/g++ ];then
|
|
||||||
sudo rm /usr/bin/g++
|
|
||||||
echo "remove old g++"
|
|
||||||
fi
|
|
||||||
sudo ln -s /usr/bin/g++-4.9 /usr/bin/g++
|
|
||||||
|
|
||||||
if [ -n "$MISSING" ]; then
|
if [ -n "$MISSING" ]; then
|
||||||
TXTCOLOR_DEFAULT="\033[0;m"
|
TXTCOLOR_DEFAULT="\033[0;m"
|
||||||
TXTCOLOR_GREEN="\033[0;32m"
|
TXTCOLOR_GREEN="\033[0;32m"
|
||||||
|
@ -49,6 +44,16 @@ if [ -n "$MISSING" ]; then
|
||||||
sudo apt-get --force-yes --yes install $MISSING > /dev/null
|
sudo apt-get --force-yes --yes install $MISSING > /dev/null
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
sudo update-alternatives --remove-all gcc
|
||||||
|
sudo update-alternatives --remove-all g++
|
||||||
|
|
||||||
|
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60
|
||||||
|
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 60
|
||||||
|
|
||||||
|
echo "Cocos uses GCC Version: `gcc --version`"
|
||||||
|
echo "Cocos uses G++ Version: `g++ --version`"
|
||||||
|
echo "Cocos uses ld Version: `ld --version`"
|
||||||
|
echo "Cocos uses /usr/bin/ld Version: `/usr/bin/ld --version`"
|
||||||
# install glfw
|
# install glfw
|
||||||
../tools/travis-scripts/install_glfw.sh
|
../tools/travis-scripts/install_glfw.sh
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,9 @@ set(_webp_libs webp libwebp)
|
||||||
set(_websockets_inc libwebsockets.h)
|
set(_websockets_inc libwebsockets.h)
|
||||||
set(_websockets_libs websockets libwebsockets)
|
set(_websockets_libs websockets libwebsockets)
|
||||||
|
|
||||||
|
set(_openssl_inc openssl/ssl.h)
|
||||||
|
set(_openssl_libs ssl crypto)
|
||||||
|
|
||||||
set(_glfw3_inc glfw3.h)
|
set(_glfw3_inc glfw3.h)
|
||||||
if(WINDOWS)
|
if(WINDOWS)
|
||||||
if (${MSVC_VERSION} STREQUAL "1900")
|
if (${MSVC_VERSION} STREQUAL "1900")
|
||||||
|
@ -114,6 +117,7 @@ set(all_prebuilt_libs
|
||||||
tiff
|
tiff
|
||||||
webp
|
webp
|
||||||
websockets
|
websockets
|
||||||
|
openssl
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<PropertyGroup />
|
<PropertyGroup />
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>$(EngineRoot)cocos;$(EngineRoot)cocos/editor-support;$(EngineRoot)external\glfw3\include\win32;$(EngineRoot)external\win32-specific\gles\include\OGLES;$(EngineRoot)external\freetype2\include\win32\freetype2;$(EngineRoot)external\freetype2\include\win32\;$(EngineRoot)external</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(EngineRoot)cocos;$(EngineRoot)cocos/editor-support;$(EngineRoot)external\glfw3\include\win32;$(EngineRoot)external\win32-specific\gles\include\OGLES;$(EngineRoot)external\freetype2\include\win32\freetype2;$(EngineRoot)external\freetype2\include\win32\;$(EngineRoot)external;$(EngineRoot)external\openssl\include\win32</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_VARIADIC_MAX=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ProjectReference>
|
<ProjectReference>
|
||||||
|
|
|
@ -76,7 +76,7 @@
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\box2d;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\OpenalSoft\include;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\platform\win8.1-universal;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\box2d;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\OpenalSoft\include;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\platform\win8.1-universal;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;CURL_STATICLIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
|
@ -106,8 +106,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\MP3Decoder\prebuilt\*.*"
|
||||||
xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\OggDecoder\prebuilt\*.*" "$(OutDir)"
|
xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\OggDecoder\prebuilt\*.*" "$(OutDir)"
|
||||||
xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)"
|
xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)"
|
||||||
xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*" "$(OutDir)"
|
xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*" "$(OutDir)"
|
||||||
xcopy /Y /Q "$(ProjectDir)..\..\external\openssl\prebuilt\win32\*.*" "$(OutDir)"
|
xcopy /Y /Q "$(ProjectDir)..\..\external\openssl\prebuilt\win32\*.*" "$(OutDir)"</Command>
|
||||||
</Command>
|
|
||||||
</PreLinkEvent>
|
</PreLinkEvent>
|
||||||
<Link>
|
<Link>
|
||||||
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
|
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
|
||||||
|
@ -119,7 +118,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\openssl\prebuilt\win32\*.*" "$(OutDir)"
|
||||||
<ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
|
<ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
<ModuleDefinitionFile>cocos2d.def</ModuleDefinitionFile>
|
<ModuleDefinitionFile>cocos2d.def</ModuleDefinitionFile>
|
||||||
<AdditionalDependencies>sqlite3.lib;libcurl_imp.lib;websockets.lib;libmpg123.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;libbullet.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>sqlite3.lib;libcurl_a.lib;websockets_static.lib;libcrypto.lib;libssl.lib;libmpg123.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;libbullet.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>
|
<Command>
|
||||||
|
@ -133,7 +132,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\openssl\prebuilt\win32\*.*" "$(OutDir)"
|
||||||
</PreBuildEvent>
|
</PreBuildEvent>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\OpenalSoft\include;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32\;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\platform\win8.1-universal;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\MP3Decoder\include;$(EngineRoot)external\win32-specific\OggDecoder\include;$(EngineRoot)external\win32-specific\OpenalSoft\include;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32\;$(EngineRoot)external\poly2tri\common;$(EngineRoot)external\poly2tri\sweep;$(EngineRoot)external\poly2tri;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\platform\win8.1-universal;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;CURL_STATICLIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;PROTOBUF_USE_DLLS;LIBPROTOBUF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
<PrecompiledHeader>
|
<PrecompiledHeader>
|
||||||
</PrecompiledHeader>
|
</PrecompiledHeader>
|
||||||
|
@ -163,10 +162,10 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\MP3Decoder\prebuilt\*.*"
|
||||||
xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\OggDecoder\prebuilt\*.*" "$(OutDir)"
|
xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\OggDecoder\prebuilt\*.*" "$(OutDir)"
|
||||||
xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)"
|
xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)"
|
||||||
xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*" "$(OutDir)"
|
xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*" "$(OutDir)"
|
||||||
</Command>
|
xcopy /Y /Q "$(ProjectDir)..\..\external\openssl\prebuilt\win32\*.*" "$(OutDir)"</Command>
|
||||||
</PreLinkEvent>
|
</PreLinkEvent>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>sqlite3.lib;libcurl_imp.lib;websockets.lib;libmpg123.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;libbullet.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>sqlite3.lib;libcurl_a.lib;websockets_static.lib;libcrypto.lib;libssl.lib;libmpg123.lib;libogg.lib;libvorbis.lib;libvorbisfile.lib;OpenAL32.lib;libbullet.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
|
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
|
||||||
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<IgnoreSpecificDefaultLibraries>LIBCMTD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
<IgnoreSpecificDefaultLibraries>LIBCMTD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||||
|
|
|
@ -330,4 +330,5 @@ $(call import-module,bullet)
|
||||||
$(call import-module,recast)
|
$(call import-module,recast)
|
||||||
# $(call import-module,curl/prebuilt/android)
|
# $(call import-module,curl/prebuilt/android)
|
||||||
$(call import-module,websockets/prebuilt/android)
|
$(call import-module,websockets/prebuilt/android)
|
||||||
|
$(call import-module,openssl/prebuilt/android)
|
||||||
$(call import-module,flatbuffers)
|
$(call import-module,flatbuffers)
|
||||||
|
|
|
@ -146,7 +146,7 @@ else()
|
||||||
message( FATAL_ERROR "Unsupported platform, CMake will exit" )
|
message( FATAL_ERROR "Unsupported platform, CMake will exit" )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
foreach(pkg ZLIB MINIZIP JPEG PNG TIFF TinyXML2 FREETYPE WEBSOCKETS CURL FLATBUFFERS XXHASH)
|
foreach(pkg ZLIB MINIZIP JPEG PNG TIFF TinyXML2 FREETYPE WEBSOCKETS CURL OPENSSL FLATBUFFERS XXHASH)
|
||||||
cocos_use_pkg(cocos2dInternal ${pkg})
|
cocos_use_pkg(cocos2dInternal ${pkg})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
|
@ -184,6 +184,8 @@ ADD_LIBRARY(cocos2d cc_dummy.c)
|
||||||
if(ANDROID)
|
if(ANDROID)
|
||||||
target_link_libraries(cocos2d -Wl,-whole-archive cocos2dxandroid_static -Wl,-no-whole-archive)
|
target_link_libraries(cocos2d -Wl,-whole-archive cocos2dxandroid_static -Wl,-no-whole-archive)
|
||||||
target_link_libraries(cocos2d cocos2dInternal cpufeatures)
|
target_link_libraries(cocos2d cocos2dInternal cpufeatures)
|
||||||
|
elseif(LINUX)
|
||||||
|
target_link_libraries(cocos2d cocos2dInternal dl)
|
||||||
else()
|
else()
|
||||||
target_link_libraries(cocos2d cocos2dInternal)
|
target_link_libraries(cocos2d cocos2dInternal)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -15,9 +15,6 @@ CCDownloader-android.cpp
|
||||||
|
|
||||||
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
|
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
|
||||||
|
|
||||||
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/curl/include/android \
|
|
||||||
$(LOCAL_PATH)/../../external/websockets/include/android
|
|
||||||
|
|
||||||
LOCAL_STATIC_LIBRARIES := cocos2dx_internal_static
|
LOCAL_STATIC_LIBRARIES := cocos2dx_internal_static
|
||||||
LOCAL_STATIC_LIBRARIES += libwebsockets_static
|
LOCAL_STATIC_LIBRARIES += libwebsockets_static
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -35,12 +35,12 @@
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <memory> // for std::shared_ptr
|
#include <memory> // for std::shared_ptr
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
|
#include <condition_variable>
|
||||||
|
|
||||||
#include "platform/CCPlatformMacros.h"
|
#include "platform/CCPlatformMacros.h"
|
||||||
#include "platform/CCStdC.h"
|
#include "platform/CCStdC.h"
|
||||||
|
|
||||||
struct lws;
|
struct lws;
|
||||||
struct lws_context;
|
|
||||||
struct lws_protocols;
|
struct lws_protocols;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -55,6 +55,7 @@ class EventListenerCustom;
|
||||||
namespace network {
|
namespace network {
|
||||||
|
|
||||||
class WsThreadHelper;
|
class WsThreadHelper;
|
||||||
|
struct WsCache;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* WebSocket is wrapper of the libwebsockets-protocol, let the develop could call the websocket easily.
|
* WebSocket is wrapper of the libwebsockets-protocol, let the develop could call the websocket easily.
|
||||||
|
@ -160,18 +161,20 @@ public:
|
||||||
virtual void onError(WebSocket* ws, const ErrorCode& error) = 0;
|
virtual void onError(WebSocket* ws, const ErrorCode& error) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The initialized method for websocket.
|
* @brief The initialized method for websocket.
|
||||||
* It needs to be invoked right after websocket instance is allocated.
|
* It needs to be invoked right after websocket instance is allocated.
|
||||||
* @param delegate The delegate which want to receive event from websocket.
|
* @param delegate The delegate which want to receive event from websocket.
|
||||||
* @param url The URL of websocket server.
|
* @param url The URL of websocket server.
|
||||||
|
* @param protocols The websocket protocols that agree with websocket server
|
||||||
|
* @param caFilePath The ca file path for wss connection
|
||||||
* @return true: Success, false: Failure.
|
* @return true: Success, false: Failure.
|
||||||
* @lua NA
|
* @lua NA
|
||||||
*/
|
*/
|
||||||
bool init(const Delegate& delegate,
|
bool init(const Delegate& delegate,
|
||||||
const std::string& url,
|
const std::string& url,
|
||||||
const std::vector<std::string>* protocols = nullptr);
|
const std::vector<std::string>* protocols = nullptr,
|
||||||
|
const std::string& caFilePath = "");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Sends string data to websocket server.
|
* @brief Sends string data to websocket server.
|
||||||
|
@ -211,39 +214,56 @@ public:
|
||||||
State getReadyState();
|
State getReadyState();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void onSubThreadStarted();
|
|
||||||
void onSubThreadLoop();
|
|
||||||
void onSubThreadEnded();
|
|
||||||
|
|
||||||
// The following callback functions are invoked in websocket thread
|
// The following callback functions are invoked in websocket thread
|
||||||
int onSocketCallback(struct lws *wsi, int reason, void *user, void *in, ssize_t len);
|
void onClientOpenConnectionRequest();
|
||||||
|
int onSocketCallback(struct lws *wsi, int reason, void *in, ssize_t len);
|
||||||
|
|
||||||
void onClientWritable();
|
int onClientWritable();
|
||||||
void onClientReceivedData(void* in, ssize_t len);
|
int onClientReceivedData(void* in, ssize_t len);
|
||||||
void onConnectionOpened();
|
int onConnectionOpened();
|
||||||
void onConnectionError();
|
int onConnectionError();
|
||||||
void onConnectionClosed();
|
int onConnectionClosed();
|
||||||
|
|
||||||
|
struct WsCache* getOrCreateVhost(struct lws_protocols* protocols);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::mutex _readStateMutex;
|
|
||||||
|
std::mutex _readyStateMutex;
|
||||||
State _readyState;
|
State _readyState;
|
||||||
|
|
||||||
std::string _host;
|
std::string _host;
|
||||||
unsigned int _port;
|
unsigned int _port;
|
||||||
std::string _path;
|
std::string _path;
|
||||||
|
|
||||||
std::vector<char> _receivedData;
|
std::vector<char> _receivedData;
|
||||||
|
|
||||||
friend class WsThreadHelper;
|
|
||||||
friend class WebSocketCallbackWrapper;
|
|
||||||
WsThreadHelper* _wsHelper;
|
|
||||||
|
|
||||||
struct lws* _wsInstance;
|
struct lws* _wsInstance;
|
||||||
struct lws_context* _wsContext;
|
struct lws_protocols* _protocols;
|
||||||
|
std::string _protocolNames;
|
||||||
|
|
||||||
std::shared_ptr<std::atomic<bool>> _isDestroyed;
|
std::shared_ptr<std::atomic<bool>> _isDestroyed;
|
||||||
Delegate* _delegate;
|
Delegate* _delegate;
|
||||||
int _SSLConnection;
|
int _SSLConnection;
|
||||||
struct lws_protocols* _wsProtocols;
|
|
||||||
|
std::mutex _closeMutex;
|
||||||
|
std::condition_variable _closeCondition;
|
||||||
|
|
||||||
|
enum class CloseState
|
||||||
|
{
|
||||||
|
NONE,
|
||||||
|
SYNC_CLOSING,
|
||||||
|
SYNC_CLOSED,
|
||||||
|
ASYNC_CLOSING
|
||||||
|
};
|
||||||
|
CloseState _closeState;
|
||||||
|
|
||||||
|
std::string _caFilePath;
|
||||||
|
|
||||||
EventListenerCustom* _resetDirectorListener;
|
EventListenerCustom* _resetDirectorListener;
|
||||||
|
|
||||||
|
friend class WsThreadHelper;
|
||||||
|
friend class WebSocketCallbackWrapper;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,6 +40,7 @@ extern "C"
|
||||||
#ifndef __ENABLE_COMPATIBILITY_WITH_UNIX_2003__
|
#ifndef __ENABLE_COMPATIBILITY_WITH_UNIX_2003__
|
||||||
#define __ENABLE_COMPATIBILITY_WITH_UNIX_2003__
|
#define __ENABLE_COMPATIBILITY_WITH_UNIX_2003__
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <dirent.h>
|
||||||
FILE *fopen$UNIX2003( const char *filename, const char *mode )
|
FILE *fopen$UNIX2003( const char *filename, const char *mode )
|
||||||
{
|
{
|
||||||
return fopen(filename, mode);
|
return fopen(filename, mode);
|
||||||
|
@ -48,10 +49,31 @@ extern "C"
|
||||||
{
|
{
|
||||||
return fwrite(a, b, c, d);
|
return fwrite(a, b, c, d);
|
||||||
}
|
}
|
||||||
|
int fputs$UNIX2003(const char *res1, FILE *res2){
|
||||||
|
return fputs(res1,res2);
|
||||||
|
}
|
||||||
char *strerror$UNIX2003( int errnum )
|
char *strerror$UNIX2003( int errnum )
|
||||||
{
|
{
|
||||||
return strerror(errnum);
|
return strerror(errnum);
|
||||||
}
|
}
|
||||||
|
DIR * opendir$INODE64$UNIX2003( char * dirName )
|
||||||
|
{
|
||||||
|
return opendir( dirName );
|
||||||
|
}
|
||||||
|
DIR * opendir$INODE64( char * dirName )
|
||||||
|
{
|
||||||
|
return opendir( dirName );
|
||||||
|
}
|
||||||
|
|
||||||
|
int closedir$UNIX2003(DIR * dir)
|
||||||
|
{
|
||||||
|
return closedir(dir);
|
||||||
|
}
|
||||||
|
|
||||||
|
struct dirent * readdir$INODE64( DIR * dir )
|
||||||
|
{
|
||||||
|
return readdir( dir );
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"version":"v3-deps-117",
|
"version": "v3-deps-120",
|
||||||
"zip_file_size":"135533806",
|
"zip_file_size": "135533806",
|
||||||
"repo_name":"cocos2d-x-3rd-party-libs-bin",
|
"repo_name": "cocos2d-x-3rd-party-libs-bin",
|
||||||
"repo_parent":"https://github.com/cocos2d/",
|
"repo_parent": "https://github.com/cocos2d/",
|
||||||
"move_dirs":{
|
"move_dirs": {
|
||||||
"fbx-conv":"tools"
|
"fbx-conv": "tools"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -200,15 +200,16 @@ if(USE_BULLET)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(LINUX)
|
set (EXTENDED_TESTS_SRC
|
||||||
set(EXTENDED_TESTS_SRC
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
set(EXTENDED_TESTS_SRC
|
|
||||||
Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
|
Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
|
||||||
Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp
|
Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp
|
||||||
Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp
|
Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
if(LINUX)
|
||||||
|
|
||||||
|
else()
|
||||||
|
list(APPEND EXTENDED_TESTS_SRC
|
||||||
Classes/UITest/CocoStudioGUITest/UIEditBoxTest.cpp
|
Classes/UITest/CocoStudioGUITest/UIEditBoxTest.cpp
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#include "platform/CCPlatformConfig.h"
|
#include "platform/CCPlatformConfig.h"
|
||||||
#if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) && (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID)
|
#if (CC_TARGET_PLATFORM != CC_PLATFORM_MAC) && (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) && (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID)
|
||||||
#include "CurlTest.h"
|
#include "CurlTest.h"
|
||||||
#include "stdio.h"
|
#include "stdio.h"
|
||||||
#include "stdlib.h"
|
#include "stdlib.h"
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include "TableViewTest/TableViewTestScene.h"
|
#include "TableViewTest/TableViewTestScene.h"
|
||||||
|
|
||||||
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
|
#if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) || (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
|
||||||
#include "NetworkTest/WebSocketTest.h"
|
#include "NetworkTest/WebSocketTest.h"
|
||||||
#include "NetworkTest/SocketIOTest.h"
|
#include "NetworkTest/SocketIOTest.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -23,7 +23,7 @@ ExtensionsTests::ExtensionsTests()
|
||||||
#if (CC_TARGET_PLATFORM != CC_PLATFORM_EMSCRIPTEN) && (CC_TARGET_PLATFORM != CC_PLATFORM_NACL)
|
#if (CC_TARGET_PLATFORM != CC_PLATFORM_EMSCRIPTEN) && (CC_TARGET_PLATFORM != CC_PLATFORM_NACL)
|
||||||
addTest("HttpClientTest", [](){ return new (std::nothrow) HttpClientTests; });
|
addTest("HttpClientTest", [](){ return new (std::nothrow) HttpClientTests; });
|
||||||
#endif
|
#endif
|
||||||
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
|
#if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) || (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
|
||||||
addTest("WebSocketTest", [](){ return new (std::nothrow) WebSocketTests; });
|
addTest("WebSocketTest", [](){ return new (std::nothrow) WebSocketTests; });
|
||||||
addTest("SocketIOTest", [](){ return new (std::nothrow) SocketIOTests; });
|
addTest("SocketIOTest", [](){ return new (std::nothrow) SocketIOTests; });
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -36,7 +36,7 @@ public:
|
||||||
addTest("Click and Move", [](){return new ClickAndMoveTest(); });
|
addTest("Click and Move", [](){return new ClickAndMoveTest(); });
|
||||||
addTest("Configuration", []() { return new ConfigurationTests(); });
|
addTest("Configuration", []() { return new ConfigurationTests(); });
|
||||||
addTest("Console", []() { return new ConsoleTests(); });
|
addTest("Console", []() { return new ConsoleTests(); });
|
||||||
#if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) && (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID)
|
#if (CC_TARGET_PLATFORM != CC_PLATFORM_MAC) && (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) && (CC_TARGET_PLATFORM != CC_PLATFORM_ANDROID)
|
||||||
// android and ios don't use CURL
|
// android and ios don't use CURL
|
||||||
addTest("Curl", []() { return new CurlTests(); });
|
addTest("Curl", []() { return new CurlTests(); });
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -72,7 +72,7 @@
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<AdditionalIncludeDirectories>..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;COCOS2DXWIN32_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;CURL_STATICLIB;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;COCOS2DXWIN32_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
<PrecompiledHeader>
|
<PrecompiledHeader>
|
||||||
|
@ -88,7 +88,7 @@
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
<AdditionalDependencies>libcurl_imp.lib;websockets.lib;opengl32.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>libcurl_a.lib;libssl.lib;libcrypto.lib;opengl32.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>
|
<Command>
|
||||||
|
@ -111,7 +111,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
|
||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<AdditionalIncludeDirectories>..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\Classes;$(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\chipmunk\include;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;CURL_STATICLIB;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
@ -121,7 +121,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
|
||||||
<MinimalRebuild>false</MinimalRebuild>
|
<MinimalRebuild>false</MinimalRebuild>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>libcurl_imp.lib;websockets.lib;opengl32.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>libcurl_a.lib;libssl.lib;libcrypto.lib;opengl32.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
|
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
|
||||||
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||||
|
|
|
@ -104,7 +104,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*"
|
||||||
xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
|
xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
|
||||||
</PreLinkEvent>
|
</PreLinkEvent>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>libcurl_imp.lib;mozjs-33.lib;ws2_32.lib;sqlite3.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>mozjs-33.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
|
@ -166,7 +166,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*"
|
||||||
xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
|
xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
|
||||||
</PreLinkEvent>
|
</PreLinkEvent>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>libcurl_imp.lib;mozjs-33.lib;ws2_32.lib;sqlite3.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>mozjs-33.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
|
|
|
@ -99,7 +99,7 @@
|
||||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>libcurl_imp.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
|
@ -150,7 +150,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
|
||||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
</ResourceCompile>
|
</ResourceCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>libcurl_imp.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
|
|
|
@ -86,7 +86,7 @@
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<AdditionalDependencies>libcurl_imp.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
|
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
|
||||||
</Link>
|
</Link>
|
||||||
<ResourceCompile>
|
<ResourceCompile>
|
||||||
|
@ -138,7 +138,7 @@ xcopy "$(OutDir)..\*.dll" "$(OutDir)" /D /Y</Command>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<TargetMachine>MachineX86</TargetMachine>
|
<TargetMachine>MachineX86</TargetMachine>
|
||||||
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(OutDir);$(SolutionDir)$(Configuration).win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<AdditionalDependencies>libcurl_imp.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
|
<IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
|
||||||
</Link>
|
</Link>
|
||||||
|
|
|
@ -430,7 +430,7 @@ static int s_fatal_signals[] = {
|
||||||
SIGSEGV,
|
SIGSEGV,
|
||||||
SIGTRAP,
|
SIGTRAP,
|
||||||
SIGTERM,
|
SIGTERM,
|
||||||
SIGKILL,
|
SIGKILL
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -125,7 +125,7 @@ xcopy "$(ProjectDir)..\Resources" "$(OutDir)" /D /E /I /F /Y
|
||||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalDependencies>libcurl_imp.lib;websockets.lib;%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END)</AdditionalDependencies>
|
<AdditionalDependencies>%(AdditionalDependencies);$(_COCOS_LIB_WIN32_BEGIN);$(_COCOS_LIB_WIN32_END)</AdditionalDependencies>
|
||||||
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
|
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
|
||||||
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories);$(_COCOS_LIB_PATH_WIN32_BEGIN);$(_COCOS_LIB_PATH_WIN32_END)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories);$(_COCOS_LIB_PATH_WIN32_BEGIN);$(_COCOS_LIB_PATH_WIN32_END)</AdditionalLibraryDirectories>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
|
|
@ -7,8 +7,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
COCOS2DX_ROOT="$DIR"/../..
|
COCOS2DX_ROOT="$DIR"/../..
|
||||||
HOST_NAME=""
|
HOST_NAME=""
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function install_android_ndk()
|
function install_android_ndk()
|
||||||
{
|
{
|
||||||
mkdir -p $HOME/bin
|
mkdir -p $HOME/bin
|
||||||
|
@ -34,6 +32,37 @@ function install_android_ndk()
|
||||||
|
|
||||||
function install_linux_environment()
|
function install_linux_environment()
|
||||||
{
|
{
|
||||||
|
mkdir -p $HOME/bin
|
||||||
|
pushd $HOME/bin
|
||||||
|
|
||||||
|
echo "GCC version: `gcc --version`"
|
||||||
|
# install new version cmake
|
||||||
|
CMAKE_VERSION="3.7.2"
|
||||||
|
CMAKE_DOWNLOAD_URL="https://cmake.org/files/v3.7/cmake-${CMAKE_VERSION}.tar.gz"
|
||||||
|
echo "Download ${CMAKE_DOWNLOAD_URL}"
|
||||||
|
curl -O ${CMAKE_DOWNLOAD_URL}
|
||||||
|
tar -zxf "cmake-${CMAKE_VERSION}.tar.gz"
|
||||||
|
cd "cmake-${CMAKE_VERSION}"
|
||||||
|
./configure > /dev/null
|
||||||
|
make -j2 > /dev/null
|
||||||
|
sudo make install > /dev/null
|
||||||
|
echo "CMake Version: `cmake --version`"
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
# install new version binutils
|
||||||
|
BINUTILS_VERSION="2.27"
|
||||||
|
BINUTILS_URL="http://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VERSION}.tar.gz"
|
||||||
|
echo "Download ${BINUTILS_URL}"
|
||||||
|
curl -O ${BINUTILS_URL}
|
||||||
|
tar -zxf "binutils-${BINUTILS_VERSION}.tar.gz"
|
||||||
|
cd "binutils-${BINUTILS_VERSION}"
|
||||||
|
./configure > /dev/null
|
||||||
|
make -j2 > /dev/null
|
||||||
|
sudo make install > /dev/null
|
||||||
|
echo "ld Version: `ld --version`"
|
||||||
|
echo "which ld: `which ld`"
|
||||||
|
sudo rm /usr/bin/ld
|
||||||
|
popd
|
||||||
bash $COCOS2DX_ROOT/build/install-deps-linux.sh
|
bash $COCOS2DX_ROOT/build/install-deps-linux.sh
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ install_glfw()
|
||||||
mkdir $GLFW_INSTALL
|
mkdir $GLFW_INSTALL
|
||||||
cd $GLFW_INSTALL
|
cd $GLFW_INSTALL
|
||||||
wget --passive -c -p -O $GLFW_ZIP $GLFW_SOURCE
|
wget --passive -c -p -O $GLFW_ZIP $GLFW_SOURCE
|
||||||
unzip ${GLFW_ZIP}
|
unzip ${GLFW_ZIP} > /dev/null
|
||||||
make_and_install
|
make_and_install
|
||||||
cd ..
|
cd ..
|
||||||
clean_tmp_file
|
clean_tmp_file
|
||||||
|
|
|
@ -5,15 +5,18 @@ set -e
|
||||||
|
|
||||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
COCOS2DX_ROOT="$DIR"/../..
|
COCOS2DX_ROOT="$DIR"/../..
|
||||||
|
CPU_CORES=4
|
||||||
|
|
||||||
function build_linux()
|
function build_linux()
|
||||||
{
|
{
|
||||||
|
CPU_CORES=`grep -c ^processor /proc/cpuinfo`
|
||||||
echo "Building tests ..."
|
echo "Building tests ..."
|
||||||
cd $COCOS2DX_ROOT/build
|
cd $COCOS2DX_ROOT/build
|
||||||
mkdir -p linux-build
|
mkdir -p linux-build
|
||||||
cd linux-build
|
cd linux-build
|
||||||
cmake ../..
|
cmake ../..
|
||||||
make -j2
|
echo "cpu cores: ${CPU_CORES}"
|
||||||
|
make -j${CPU_CORES}
|
||||||
}
|
}
|
||||||
|
|
||||||
function build_mac()
|
function build_mac()
|
||||||
|
|
Loading…
Reference in New Issue