atria-soft/gale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] MacOs build back

Browse Source
This commit is contained in:
Edouard DUPIN 2016-09-16 23:17:09 +02:00
parent eb6a39e757
commit c7be90d128
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gale/context/IOs/Context.cpp
View File

@ -69,7 +69,7 @@ public:
} }
void MAC_SetMouseState(int32_t _id, bool _isDown, float _x, float _y) { void MAC_SetMouseState(int32_t _id, bool _isDown, float _x, float _y) {
OS_SetInput(gale::key::type::mouse, OS_SetInput(gale::key::type::mouse,
(_isDown==true?gale::key::status::down:gale::key::status_up), (_isDown==true?gale::key::status::down:gale::key::status::up),
_id, _id,
vec2(_x, _y)); vec2(_x, _y));
} }
@ -81,7 +81,7 @@ public:
} }
void MAC_SetInputState(int32_t _id, bool _isDown, float _x, float _y) { void MAC_SetInputState(int32_t _id, bool _isDown, float _x, float _y) {
OS_SetInput(gale::key::type::finger, OS_SetInput(gale::key::type::finger,
(_isDown==true?gale::key::status::down:gale::key::status_up), (_isDown==true?gale::key::status::down:gale::key::status::up),
_id, _id,
vec2(_x, _y)); vec2(_x, _y));
} }
@ -119,12 +119,12 @@ public:
} }
OS_setKeyboard(_special, OS_setKeyboard(_special,
move, move,
(_isDown==false?gale::key::status::down:gale::key::status_up), (_isDown==false?gale::key::status::down:gale::key::status::up),
_isARepeateKey); _isARepeateKey);
} else { } else {
OS_setKeyboard(_special, OS_setKeyboard(_special,
gale::key::keyboard::character, gale::key::keyboard::character,
(_isDown==false?gale::key::status::down:gale::key::status_up), (_isDown==false?gale::key::status::down:gale::key::status::up),
_isARepeateKey, _isARepeateKey,
_unichar); _unichar);
} }
@ -134,7 +134,7 @@ public:
bool _isDown) { bool _isDown) {
OS_setKeyboard(_special, OS_setKeyboard(_special,
_move, _move,
(_isDown==true?gale::key::status::down:gale::key::status_up)); (_isDown==true?gale::key::status::down:gale::key::status::up));
} }
void openURL(const std::string& _url) { void openURL(const std::string& _url) {
mm_openURL(_url.c_str()); mm_openURL(_url.c_str());

8
gale/context/MacOs/Context.mm
View File

@ -67,7 +67,7 @@ class MacOSInterface : public gale::Context {
} }
void MAC_SetMouseState(int32_t _id, bool _isDown, float _x, float _y) { void MAC_SetMouseState(int32_t _id, bool _isDown, float _x, float _y) {
OS_SetInput(gale::key::type::mouse, OS_SetInput(gale::key::type::mouse,
(_isDown==true?gale::key::status::down:gale::key::status_up), (_isDown==true?gale::key::status::down:gale::key::status::up),
_id, _id,
vec2(_x, _y)); vec2(_x, _y));
} }
@ -103,16 +103,16 @@ class MacOSInterface : public gale::Context {
move = gale::key::keyboard::right; move = gale::key::keyboard::right;
break; break;
} }
OS_setKeyboard(_special, move, (_isDown==false?gale::key::status::down:gale::key::status_up), _isAReapeateKey); OS_setKeyboard(_special, move, (_isDown==false?gale::key::status::down:gale::key::status::up), _isAReapeateKey);
} else { } else {
OS_setKeyboard(_special, gale::key::keyboard::character, (_isDown==false?gale::key::status::down:gale::key::status_up), _isAReapeateKey, _unichar); OS_setKeyboard(_special, gale::key::keyboard::character, (_isDown==false?gale::key::status::down:gale::key::status::up), _isAReapeateKey, _unichar);
} }
} }
void MAC_SetKeyboardMove(gale::key::Special& _special, void MAC_SetKeyboardMove(gale::key::Special& _special,
enum gale::key::keyboard _move, enum gale::key::keyboard _move,
bool _isDown, bool _isDown,
bool _isAReapeateKey) { bool _isAReapeateKey) {
OS_setKeyboard(_special, _move, (_isDown==true?gale::key::status::down:gale::key::status_up), _isAReapeateKey); OS_setKeyboard(_special, _move, (_isDown==true?gale::key::status::down:gale::key::status::up), _isAReapeateKey);
} }
void openURL(const std::string& _url) { void openURL(const std::string& _url) {
std::string req = "open " + _url; std::string req = "open " + _url;

1
gale/context/MacOs/Windows.mm
View File

@ -10,6 +10,7 @@
#include <gale/key/key.h> #include <gale/key/key.h>
#include <gale/debug.h> #include <gale/debug.h>
#include <etk/stdTools.h>
@implementation GaleMainWindows @implementation GaleMainWindows

14
lutin_gale.py
View File

@ -145,7 +145,7 @@ def create(target, module_name):
my_module.add_path(tools.get_current_path(__file__)) my_module.add_path(tools.get_current_path(__file__))
my_module.add_flag('c++', [ my_module.add_flag('c++', [
"-DGALE_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" "-DGALE_VERSION=\"\\\"" + tools.version_to_string(my_module.get_pkg("VERSION")) + "\\\"\""
]) ])
if "Linux" in target.get_type(): if "Linux" in target.get_type():
@ -156,22 +156,24 @@ def create(target, module_name):
target.add_action("BINARY", 50, "gale-auto-wrapper", tool_generate_main_java_class) target.add_action("BINARY", 50, "gale-auto-wrapper", tool_generate_main_java_class)
# TODO : Add the same for BINARY to create a console interface ? # TODO : Add the same for BINARY to create a console interface ?
elif "Windows" in target.get_type(): elif "Windows" in target.get_type():
#my_module.add_depend("glew") my_module.add_depend("glew")
pass pass
elif "MacOs" in target.get_type(): elif "MacOs" in target.get_type():
my_module.add_export_flag('link', [ my_module.add_flag('link', [
"-framework Cocoa", "-framework Cocoa",
"-framework QuartzCore", "-framework QuartzCore",
"-framework AppKit" "-framework AppKit"
]) ],
export=True)
elif "IOs" in target.get_type(): elif "IOs" in target.get_type():
my_module.add_export_flag('link', [ my_module.add_flag('link', [
"-framework CoreGraphics", "-framework CoreGraphics",
"-framework UIKit", "-framework UIKit",
"-framework GLKit", "-framework GLKit",
"-framework Foundation", "-framework Foundation",
"-framework QuartzCore" "-framework QuartzCore"
]) ],
export=True)
return my_module return my_module