From f71053f2f6be6756cb0b5741151a437e71663aaf Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 25 Apr 2013 00:57:47 +0200 Subject: [PATCH] [DEV] MacOS support work again --- build | 2 +- external/etk | 2 +- sources/ewol/ewol.cpp | 3 +++ sources/lutin_ewol.py | 11 +++++++++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/build b/build index 6c1649f3..d0356e2f 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 6c1649f36f63f6ab5d8c99ed1aa566d2ecec627c +Subproject commit d0356e2fd0ef6e8f34fd0ab673a016fc8b6b5b42 diff --git a/external/etk b/external/etk index 6d94d06e..4f761c47 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 6d94d06efa8df92fe002f411118797ed6679e956 +Subproject commit 4f761c4705abf7e2688f670e1117e2f18f4c7379 diff --git a/sources/ewol/ewol.cpp b/sources/ewol/ewol.cpp index dc4a8db7..826fa4fc 100644 --- a/sources/ewol/ewol.cpp +++ b/sources/ewol/ewol.cpp @@ -25,6 +25,9 @@ void ewol::SetFontSourcesFolder(bool inOsSystem) int32_t ewol::Run(int32_t argc, const char* argv[]) { + if (NULL!=argv) { + etk::SetArgZero(argv[0]); + } // init display convertions: ewol::dimension::Init(); diff --git a/sources/lutin_ewol.py b/sources/lutin_ewol.py index 2d421977..07621352 100755 --- a/sources/lutin_ewol.py +++ b/sources/lutin_ewol.py @@ -198,6 +198,17 @@ def Create(target): elif target.name=="Windows": myModule.AddModuleDepend("glew") myModule.AddSrcFile("ewol/renderer/os/gui.Windows.cpp") + elif target.name=="MacOs": + myModule.AddExportflag_LD([ + "-framework Cocoa", + "-framework OpenGL", + "-framework QuartzCore", + "-framework AppKit"]) + myModule.AddSrcFile([ + "ewol/renderer/os/gui.MacOs.cpp", + "ewol/renderer/os/gui.MacOs.Interface.mm", + "ewol/renderer/os/gui.MacOs.AppDelegate.mm", + "ewol/renderer/os/gui.MacOs.OpenglView.mm"]) else: debug.error("unknow mode...")