[DEV] set it work on MacOs & IOs again
This commit is contained in:
parent
15c1764854
commit
7e2cae472e
2
build
2
build
@ -1 +1 @@
|
|||||||
Subproject commit 03e67ae8d6ab62536437c246548d047bbd2565a4
|
Subproject commit 512651e746dfe3318308ffae94aeca731078baff
|
2
external/etk
vendored
2
external/etk
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 44dd675eb8c2b2a635f3bd691b015b792b1be8bd
|
Subproject commit e6a829fd2aff0f55022c92192a95a35ff8993be1
|
2
external/ewolsa
vendored
2
external/ewolsa
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 23467923b4917aa7db24f262b3129ac5f58803c5
|
Subproject commit af355c40510498c052e9fab8b5f2ea134e752235
|
@ -232,6 +232,7 @@ void IOs::foreground() {
|
|||||||
|
|
||||||
static int l_argc = 0;
|
static int l_argc = 0;
|
||||||
static const char **l_argv = nullptr;
|
static const char **l_argv = nullptr;
|
||||||
|
static ewol::context::Application* l_application;
|
||||||
/**
|
/**
|
||||||
* @brief Main of the program
|
* @brief Main of the program
|
||||||
* @param std IO
|
* @param std IO
|
||||||
@ -240,14 +241,16 @@ static const char **l_argv = nullptr;
|
|||||||
int ewol::run(ewol::context::Application* _application, int _argc, const char *_argv[]) {
|
int ewol::run(ewol::context::Application* _application, int _argc, const char *_argv[]) {
|
||||||
l_argc = _argc;
|
l_argc = _argc;
|
||||||
l_argv = _argv;
|
l_argv = _argv;
|
||||||
return mm_main(_application, _argc, _argv);
|
l_application = _application;
|
||||||
|
return mm_main(_argc, _argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Creat and relaese ewol::Context interface:
|
// Creat and relaese ewol::Context interface:
|
||||||
void IOs::createInterface() {
|
void IOs::createInterface() {
|
||||||
etk::setArgZero(l_argv[0]);
|
etk::setArgZero(l_argv[0]);
|
||||||
EWOL_INFO("Create new interface");
|
EWOL_INFO("Create new interface");
|
||||||
interface = new MacOSInterface(l_argc, l_argv);
|
interface = new MacOSInterface(l_application, l_argc, l_argv);
|
||||||
|
l_application = nullptr;
|
||||||
if (nullptr == interface) {
|
if (nullptr == interface) {
|
||||||
EWOL_CRITICAL("Can not create the X11 interface ... MEMORY allocation error");
|
EWOL_CRITICAL("Can not create the X11 interface ... MEMORY allocation error");
|
||||||
return;
|
return;
|
||||||
@ -255,10 +258,9 @@ void IOs::createInterface() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void IOs::releaseInterface() {
|
void IOs::releaseInterface() {
|
||||||
if (interface == nullptr) {
|
if (interface != nullptr) {
|
||||||
return;
|
|
||||||
}
|
|
||||||
EWOL_INFO("Remove interface");
|
EWOL_INFO("Remove interface");
|
||||||
|
}
|
||||||
delete(interface);
|
delete(interface);
|
||||||
interface = nullptr;
|
interface = nullptr;
|
||||||
}
|
}
|
||||||
|
@ -15,7 +15,8 @@
|
|||||||
int mm_main(int argc, const char *argv[]) {
|
int mm_main(int argc, const char *argv[]) {
|
||||||
@autoreleasepool {
|
@autoreleasepool {
|
||||||
return UIApplicationMain(argc, (char**)argv, nil, NSStringFromClass([AppDelegate class]));
|
return UIApplicationMain(argc, (char**)argv, nil, NSStringFromClass([AppDelegate class]));
|
||||||
} // return no error
|
}
|
||||||
|
// return no error
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -24,6 +25,7 @@ void mm_exit(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void mm_openURL(const char *_url) {
|
void mm_openURL(const char *_url) {
|
||||||
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:_url]];
|
NSString* url = [[NSString alloc] initWithUTF8String:_url];
|
||||||
|
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:url]];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,8 +34,8 @@
|
|||||||
int deltaDisplay;
|
int deltaDisplay;
|
||||||
int displayCounter;
|
int displayCounter;
|
||||||
}
|
}
|
||||||
- ()stopDisplayLink;
|
- (void)stopDisplayLink;
|
||||||
- ()startDisplayLink;
|
- (void)startDisplayLink;
|
||||||
- ()speedSlow;
|
- (void)speedSlow;
|
||||||
- ()speedNormal;
|
- (void)speedNormal;
|
||||||
@end
|
@end
|
||||||
|
@ -14,7 +14,7 @@ extern "C" {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
int mm_main(int argc, const char *argv[]);
|
int mm_main(int argc, const char *argv[]);
|
||||||
int mm_run();
|
int mm_run(void);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
@ -84,7 +84,7 @@ int mm_main(int argc, const char *argv[]) {
|
|||||||
//[window addChildWindow:view];
|
//[window addChildWindow:view];
|
||||||
//[window makeKeyAndVisible];
|
//[window makeKeyAndVisible];
|
||||||
|
|
||||||
[window setDelegate:view];
|
//[window setDelegate:view];
|
||||||
#else
|
#else
|
||||||
@autoreleasepool
|
@autoreleasepool
|
||||||
{
|
{
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
}
|
}
|
||||||
+ (id)alloc;
|
+ (id)alloc;
|
||||||
- (id)init;
|
- (id)init;
|
||||||
+ ()dealloc;
|
+ (void)dealloc;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@
|
|||||||
//[window addChildWindow:view];
|
//[window addChildWindow:view];
|
||||||
//[window makeKeyAndVisible];
|
//[window makeKeyAndVisible];
|
||||||
|
|
||||||
[windowsID setDelegate:view];
|
//[windowsID setDelegate:view];
|
||||||
EWOL_DEBUG("ALLOCATE ...");
|
EWOL_DEBUG("ALLOCATE ...");
|
||||||
return windowsID;
|
return windowsID;
|
||||||
}
|
}
|
||||||
|
@ -149,9 +149,15 @@ namespace ewol {
|
|||||||
renderTriangle = GL_TRIANGLES,
|
renderTriangle = GL_TRIANGLES,
|
||||||
renderTriangleStrip = GL_TRIANGLE_STRIP, //!< Not supported in EWOL (TODO : Later)
|
renderTriangleStrip = GL_TRIANGLE_STRIP, //!< Not supported in EWOL (TODO : Later)
|
||||||
renderTriangleFan = GL_TRIANGLE_FAN, //!< Not supported in EWOL (TODO : Later)
|
renderTriangleFan = GL_TRIANGLE_FAN, //!< Not supported in EWOL (TODO : Later)
|
||||||
|
#if (!defined(__TARGET_OS__IOs) && !defined(__TARGET_OS__Android))
|
||||||
renderQuad = GL_QUADS, //!< Not supported in OpenGL-ES2
|
renderQuad = GL_QUADS, //!< Not supported in OpenGL-ES2
|
||||||
renderQuadStrip = GL_QUAD_STRIP, //!< Not supported in OpenGL-ES2
|
renderQuadStrip = GL_QUAD_STRIP, //!< Not supported in OpenGL-ES2
|
||||||
renderPolygon = GL_POLYGON //!< Not supported in OpenGL-ES2
|
renderPolygon = GL_POLYGON //!< Not supported in OpenGL-ES2
|
||||||
|
#else
|
||||||
|
renderQuad, //!< Not supported in OpenGL-ES2
|
||||||
|
renderQuadStrip, //!< Not supported in OpenGL-ES2
|
||||||
|
renderPolygon //!< Not supported in OpenGL-ES2
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user