diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb435e5aa2e7753eac5dab0528fb7c0a503b419c..8883824195f35e3dffa82398fb0bbeb9f1ad2642 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8...3.12.0)
+cmake_minimum_required(VERSION 2.8)
project(mainapp)
@@ -93,6 +93,24 @@ if (CMAKE_SYSTEM_NAME MATCHES "Android")
add_definitions("-DANDROID")
set(UNIX_OS true)
set(ANDROID_OS true)
+
+
+ if (${ANDROID_ABI} STREQUAL "x86_64")
+ include_directories(${ANDROID_SYSROOT}/usr/include/x86_64-linux-android)
+ elseif (${ANDROID_ABI} STREQUAL "x86")
+ include_directories(${ANDROID_SYSROOT}/usr/include/i686-linux-android)
+ elseif (${ANDROID_ABI} STREQUAL "armeabi-v7a")
+ include_directories(${ANDROID_SYSROOT}/usr/include/arm-linux-androideabi)
+ elseif (${ANDROID_ABI} STREQUAL "arm64-v8a")
+ include_directories(${ANDROID_SYSROOT}/usr/include/aarch64-linux-android)
+ elseif (${ANDROID_ABI} STREQUAL "armeabi")
+ include_directories(${ANDROID_SYSROOT}/usr/include/arm-linux-androideabi)
+ elseif (${ANDROID_ABI} STREQUAL "mips")
+ #include_directories(${ANDROID_SYSROOT}/usr/include/mipsel-linux-android)
+ elseif (${ANDROID_ABI} STREQUAL "mips64")
+ #include_directories(${ANDROID_SYSROOT}/usr/include/mips64el-linux-android)
+ endif()
+
message("-- ANDROID Cpu: ${ANDROID_ABI}")
set(compile_os "Android")
elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
diff --git a/container/objectrun.cpp b/container/objectrun.cpp
index cb4e8d68663d4da52ce0d6c745ecce9047d5b9e9..54f09dc5282799bfec5394fc974b72bc688fdba1 100644
--- a/container/objectrun.cpp
+++ b/container/objectrun.cpp
@@ -565,9 +565,6 @@ HRESULT CObjectRunImpl::DoPluginsStartFunc(UINT uType)
m_RunPlugin = m_PluginsClsid[uloop].ClsId;
- logi("object:%s=>run_plugin=>%s=>%s\n",
- m_strObjectName.c_str(),
- m_PluginsClsid[uloop].szComponent.c_str(), guid);
RunPlugin_Start(pUnknown, uType);
}
diff --git a/framwork.xcodeproj/project.xcworkspace/xcuserdata/com.app.xcuserdatad/UserInterfaceState.xcuserstate b/framwork.xcodeproj/project.xcworkspace/xcuserdata/com.app.xcuserdatad/UserInterfaceState.xcuserstate
index 280502a8f1fd56e3a875d75dd85cf65b7f013f7a..8928aa49c86c3f44f87c7de952d3eac93f5dfc13 100644
Binary files a/framwork.xcodeproj/project.xcworkspace/xcuserdata/com.app.xcuserdatad/UserInterfaceState.xcuserstate and b/framwork.xcodeproj/project.xcworkspace/xcuserdata/com.app.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/framwork.xcodeproj/xcuserdata/com.app.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/framwork.xcodeproj/xcuserdata/com.app.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 5883bd13b01aa3a15685f337399fd4831f75a653..f8ad75a5f8b1a8381909bec5a18ee2b9f739126e 100644
--- a/framwork.xcodeproj/xcuserdata/com.app.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/framwork.xcodeproj/xcuserdata/com.app.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -215,34 +215,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/framwork.xcodeproj/xcuserdata/com.app.xcuserdatad/xcschemes/xcschememanagement.plist b/framwork.xcodeproj/xcuserdata/com.app.xcuserdatad/xcschemes/xcschememanagement.plist
index 6de646a274f309b59bec9ef693175a189b43decd..996e10eaebfacbd9afc867606cbf797d47a4f241 100644
--- a/framwork.xcodeproj/xcuserdata/com.app.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/framwork.xcodeproj/xcuserdata/com.app.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
access.xcscheme_^#shared#^_
orderHint
- 7
+ 11
asynio.xcscheme_^#shared#^_
@@ -22,17 +22,17 @@
guidgen.xcscheme_^#shared#^_
orderHint
- 14
+ 15
license.xcscheme_^#shared#^_
orderHint
- 12
+ 7
logs.xcscheme_^#shared#^_
orderHint
- 15
+ 14
mainui.xcscheme_^#shared#^_
@@ -47,12 +47,12 @@
mainview.xcscheme_^#shared#^_
orderHint
- 11
+ 12
mempool.xcscheme_^#shared#^_
orderHint
- 6
+ 13
msgbus.xcscheme_^#shared#^_
@@ -67,12 +67,12 @@
render.xcscheme_^#shared#^_
orderHint
- 9
+ 6
res.xcscheme_^#shared#^_
orderHint
- 10
+ 9
std_com.xcscheme_^#shared#^_
@@ -87,7 +87,7 @@
stdcrt_test.xcscheme_^#shared#^_
orderHint
- 13
+ 10
SuppressBuildableAutocreation
diff --git a/mainui/AppDelegate.m b/mainui/AppDelegate.m
index debe4b2780d9684c6807147f563ef239a9a8accb..34cb190615645255357f0b98ab8e983131bab00c 100644
--- a/mainui/AppDelegate.m
+++ b/mainui/AppDelegate.m
@@ -25,12 +25,13 @@
-(BOOL) applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)app {
- return YES;
+
+ return NO;
}
-(void)windowWillClose:(NSNotification *)notification{
- //[NSApp terminate:self];
+ //[NSApp terminate:self];
}
@end
diff --git a/mainui/appviewimpl.cpp b/mainui/appviewimpl.cpp
index 762da8d18c09278e501a3fa9da15c9241dd443bf..405959f6b5dc281c4738a548855f25e374e4e8c9 100644
--- a/mainui/appviewimpl.cpp
+++ b/mainui/appviewimpl.cpp
@@ -48,6 +48,7 @@ HRESULT CAppViewImpl::Start(_pinstance hInstance, UINT uType)
_atomic_set(value2, &value);
_atomic_uninit(&value);
+
/*
NetPtr pINet;
@@ -72,7 +73,7 @@ HRESULT CAppViewImpl::Start(_pinstance hInstance, UINT uType)
s_strlen("/")
};
- m_pIHttp->Open(addrPtr, PortPtr,443);
+ m_pIHttp->Open(addrPtr, PortPtr, 443);
CSemHandle handle;
handle.Wait();
*/
diff --git a/mainuiapp/main.mm b/mainuiapp/main.mm
index c71d539b1285a9ef5c524b45fa88c6a302718f71..f35758608f1d7aa143e3ec4a14d09c36cfec6e2d 100644
--- a/mainuiapp/main.mm
+++ b/mainuiapp/main.mm
@@ -49,8 +49,8 @@ int RunContainer(int argc, char* argv[], const char* path) {
containercode.len = s_strlen(code);
SafeStringPtr appname;
- appname.ptr = "macosxapp";
- appname.len = s_strlen("macosxapp");
+ appname.ptr = "iosapp";
+ appname.len = s_strlen("iosapp");
logi("test_main_LoadContainer");
hr = com.LoadContainer(&containerpath);
diff --git a/stdcrt/string/compat_utf8.c b/stdcrt/string/compat_utf8.c
index 752a64c8a9e91c902228dbfbef4de711fb783e09..df72e9452c63ad85fce3b21c1a71ad1d0b318a81 100644
--- a/stdcrt/string/compat_utf8.c
+++ b/stdcrt/string/compat_utf8.c
@@ -236,12 +236,12 @@ char* wchartochar(const wchar_t *in, size_t len)
rc_assert(ptr != NULL, NULL)
WideCharToMultiByte(CP_ACP, 0, in, -1, ptr, size, NULL, false);
#elif (TARGET_OS == OS_POSIX)
- size_t size = wcstombs(ptr, in, 0);
+ size_t size = wcstombs(NULL, in, 0);
ptr = (char*)calloc(size + 1, sizeof(char));
rc_assert(ptr != NULL, NULL)
wcstombs(ptr, in, size);
#elif (TARGET_OS == OS_DARWIN)
- size_t size = wcstombs(ptr, in, 0);
+ size_t size = wcstombs(NULL, in, 0);
ptr = (char*)calloc(size + 1, sizeof(char));
rc_assert(ptr != NULL, NULL)
wcstombs(ptr, in, size);
@@ -260,13 +260,13 @@ wchar_t* char_to_wchar(const char *in, size_t len)
rc_assert(ptr != NULL, NULL)
MultiByteToWideChar(CP_ACP, 0, in, -1, ptr, size);
#elif (TARGET_OS == OS_POSIX)
- size_t size = wcstombs(ptr, in, 0);
- ptr = (char*)heap_calloc(size + 1, sizeof(wchar_t));
+ size_t size = mbstowcs(NULL, in, 0);
+ ptr = (wchar_t*)heap_calloc(size + 1, sizeof(wchar_t));
rc_assert(ptr != NULL, NULL)
mbstowcs(ptr, in, size);
#elif (TARGET_OS == OS_DARWIN)
- size_t size = wcstombs(ptr, in, 0);
- ptr = (char*)heap_calloc(size + 1, sizeof(wchar_t));
+ size_t size = mbstowcs(NULL, in, 0);
+ ptr = (wchar_t*)heap_calloc(size + 1, sizeof(wchar_t));
rc_assert(ptr != NULL, NULL)
mbstowcs(ptr, in, size);
#endif
diff --git a/testmain/appviewimpl.cpp b/testmain/appviewimpl.cpp
index a1b84d2b55bb6af532ba61faacfda80f2965394e..d0721d5f6ebe2e767261eed40af4c06f0cc4de91 100644
--- a/testmain/appviewimpl.cpp
+++ b/testmain/appviewimpl.cpp
@@ -25,26 +25,7 @@ HRESULT CAppViewImpl::Start(_pinstance hInstance, UINT uType)
{
HRESULT hr = S_OK;
-
- _atomic_t value;
- long v1 = 0;
- _atomic_init(&value);
-
- v1 = _atomic_add(&value);
- v1 = _atomic_add(&value);
- v1 = _atomic_add(&value);
-
- v1 = _atomic_del(&value);
-
- long comp = 2;
- long value2 = 300;
- bool ret = _atomic_cmp(comp, &value);
-
- _atomic_set(value2, &value);
-
- _atomic_uninit(&value);
-
- //InitBus();
+ InitBus();
//_lComPtr pINet;
//m_pRot->GetObject(CLSID_INet, IID_INet, (IBase**)&pINet.m_p);