From 6a6d37f734e1bebd28215a47989feed1e6c38e62 Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Tue, 7 Apr 2015 12:03:16 -0700 Subject: [PATCH] Use safe name for registering statics, use 'lime_legacy_' for legacy prims to avoid conflicting names --- haxe/Timer.hx | 2 +- legacy/project/src/ExternalInterface.cpp | 864 +++++++++---------- legacy/templates/emscripten/cpp/Main.cpp | 4 +- legacy/templates/iphone/PROJ/Classes/Main.mm | 4 +- lime/project/HXProject.hx | 13 +- lime/utils/ByteArray.hx | 2 +- svg.n | Bin 524964 -> 527825 bytes templates/cpp/static/Main.cpp | 4 +- templates/emscripten/cpp/Main.cpp | 4 +- templates/iphone/PROJ/Classes/Main.mm | 4 +- 10 files changed, 456 insertions(+), 445 deletions(-) diff --git a/haxe/Timer.hx b/haxe/Timer.hx index 23c69cfb3..ce08f4623 100644 --- a/haxe/Timer.hx +++ b/haxe/Timer.hx @@ -384,7 +384,7 @@ class Timer { #if lime_legacy - static var lime_time_stamp = flash.Lib.load ("lime-legacy", "lime_time_stamp", 0); + static var lime_time_stamp = flash.Lib.load ("lime-legacy", "lime_legacy_time_stamp", 0); #end diff --git a/legacy/project/src/ExternalInterface.cpp b/legacy/project/src/ExternalInterface.cpp index f46e861a6..9e997b297 100644 --- a/legacy/project/src/ExternalInterface.cpp +++ b/legacy/project/src/ExternalInterface.cpp @@ -5,39 +5,39 @@ #ifdef STATIC_LINK -#define DEFINE_LIME_PRIM_MULT(func) value nme_##func(value *arg, int args); \ -int __reg_lime_##func = hx_register_prim("lime_" #func "__MULT",(void *)(&nme_##func)); \ +#define DEFINE_LIME_LEGACY_PRIM_MULT(func) value nme_##func(value *arg, int args); \ +int __reg_lime_legacy_##func = hx_register_prim("lime_legacy_" #func "__MULT",(void *)(&nme_##func)); \ -#define DEFINE_LIME_PRIM(func,nargs) \ -int __reg_lime_##func = hx_register_prim("lime_" #func "__" #nargs,(void *)(&nme_##func)); \ +#define DEFINE_LIME_LEGACY_PRIM(func,nargs) \ +int __reg_lime_legacy_##func = hx_register_prim("lime_legacy_" #func "__" #nargs,(void *)(&nme_##func)); \ -#define DEFINE_LIME_PRIM_MULT_NATIVE(func,ext) \ -int __reg_lime_##func = hx_register_prim("lime_" #func "__" MULT,(void *)(&nme_##func)) + \ - hx_register_prim("lime_" #func "__" #ext,(void *)(&nme_##func##_##ext)) ; +#define DEFINE_LIME_LEGACY_PRIM_MULT_NATIVE(func,ext) \ +int __reg_lime_legacy_##func = hx_register_prim("lime_legacy_" #func "__" MULT,(void *)(&nme_##func)) + \ + hx_register_prim("lime_legacy_" #func "__" #ext,(void *)(&nme_##func##_##ext)) ; -#define DEFINE_LIME_PRIM_NATIVE(func,nargs,ext) \ -int __reg_lime_##func = hx_register_prim("lime_" #func "__" #nargs,(void *)(&nme_##func)) + \ - hx_register_prim("lime_" #func "__" #ext,(void *)(&nme_##func##_##ext)) ; +#define DEFINE_LIME_LEGACY_PRIM_NATIVE(func,nargs,ext) \ +int __reg_lime_legacy_##func = hx_register_prim("lime_legacy_" #func "__" #nargs,(void *)(&nme_##func)) + \ + hx_register_prim("lime_legacy_" #func "__" #ext,(void *)(&nme_##func##_##ext)) ; #else -#define DEFINE_LIME_PRIM_MULT(func) value nme_##func(value *arg, int args); \ +#define DEFINE_LIME_LEGACY_PRIM_MULT(func) value nme_##func(value *arg, int args); \ extern "C" { \ - EXPORT void *lime_##func##__MULT() { return (void*)(&nme_##func); } \ + EXPORT void *lime_legacy_##func##__MULT() { return (void*)(&nme_##func); } \ } -#define DEFINE_LIME_PRIM(func,nargs) extern "C" { \ - EXPORT void *lime_##func##__##nargs() { return (void*)(&nme_##func); } \ +#define DEFINE_LIME_LEGACY_PRIM(func,nargs) extern "C" { \ + EXPORT void *lime_legacy_##func##__##nargs() { return (void*)(&nme_##func); } \ } -#define DEFINE_LIME_PRIM_MULT_NATIVE(func,ext) extern "C" { \ - EXPORT void *lime_##func##__MULT() { return (void*)(&nme_##func); } \ - EXPORT void *lime_##func##__##ext() { return (void*)(&nme_##func##_##ext); } \ +#define DEFINE_LIME_LEGACY_PRIM_MULT_NATIVE(func,ext) extern "C" { \ + EXPORT void *lime_legacy_##func##__MULT() { return (void*)(&nme_##func); } \ + EXPORT void *lime_legacy_##func##__##ext() { return (void*)(&nme_##func##_##ext); } \ } -#define DEFINE_LIME_PRIM_NATIVE(func,nargs,ext) extern "C" { \ - EXPORT void *lime_##func##__##nargs() { return (void*)(&nme_##func); } \ - EXPORT void *lime_##func##__##ext() { return (void*)(&nme_##func##_##ext); } \ +#define DEFINE_LIME_LEGACY_PRIM_NATIVE(func,nargs,ext) extern "C" { \ + EXPORT void *lime_legacy_##func##__##nargs() { return (void*)(&nme_##func); } \ + EXPORT void *lime_legacy_##func##__##ext() { return (void*)(&nme_##func##_##ext); } \ } #endif @@ -45,109 +45,109 @@ extern "C" { \ // Forward declare common CFFI calls, and expose to Haxe -#define DEFINE_LIME_PRIM_0(func) value nme_##func(); \ - DEFINE_LIME_PRIM(func,0) +#define DEFINE_LIME_LEGACY_PRIM_0(func) value nme_##func(); \ + DEFINE_LIME_LEGACY_PRIM(func,0) -#define DEFINE_LIME_PRIM_1(func) value nme_##func(value p1); \ - DEFINE_LIME_PRIM(func,1) +#define DEFINE_LIME_LEGACY_PRIM_1(func) value nme_##func(value p1); \ + DEFINE_LIME_LEGACY_PRIM(func,1) -#define DEFINE_LIME_PRIM_2(func) value nme_##func(value p1, value p2); \ - DEFINE_LIME_PRIM(func,2) +#define DEFINE_LIME_LEGACY_PRIM_2(func) value nme_##func(value p1, value p2); \ + DEFINE_LIME_LEGACY_PRIM(func,2) -#define DEFINE_LIME_PRIM_3(func) value nme_##func(value p1, value p2, value p3); \ - DEFINE_LIME_PRIM(func,3) +#define DEFINE_LIME_LEGACY_PRIM_3(func) value nme_##func(value p1, value p2, value p3); \ + DEFINE_LIME_LEGACY_PRIM(func,3) -#define DEFINE_LIME_PRIM_4(func) value nme_##func(value p1, value p2, value p3, value p4); \ - DEFINE_LIME_PRIM(func,4) +#define DEFINE_LIME_LEGACY_PRIM_4(func) value nme_##func(value p1, value p2, value p3, value p4); \ + DEFINE_LIME_LEGACY_PRIM(func,4) -#define DEFINE_LIME_PRIM_5(func) value nme_##func(value p1, value p2, value p3, value p4, value p5); \ - DEFINE_LIME_PRIM(func,5) +#define DEFINE_LIME_LEGACY_PRIM_5(func) value nme_##func(value p1, value p2, value p3, value p4, value p5); \ + DEFINE_LIME_LEGACY_PRIM(func,5) -#define DEFINE_LIME_PRIM_6(func) value nme_##func(value p1, value p2, value p3, value p4, value p5, value p6); \ - DEFINE_LIME_PRIM(func,6) +#define DEFINE_LIME_LEGACY_PRIM_6(func) value nme_##func(value p1, value p2, value p3, value p4, value p5, value p6); \ + DEFINE_LIME_LEGACY_PRIM(func,6) -#define DEFINE_LIME_PROP_READ(obj,prop) DEFINE_LIME_PRIM_1(obj##_get_##prop) +#define DEFINE_LIME_PROP_READ(obj,prop) DEFINE_LIME_LEGACY_PRIM_1(obj##_get_##prop) -#define DEFINE_LIME_PROP(obj,prop) DEFINE_LIME_PRIM_1(obj##_get_##prop) \ - DEFINE_LIME_PRIM_2(obj##_set_##prop) +#define DEFINE_LIME_PROP(obj,prop) DEFINE_LIME_LEGACY_PRIM_1(obj##_get_##prop) \ + DEFINE_LIME_LEGACY_PRIM_2(obj##_set_##prop) // Define common CFFI NME calls #ifdef ANDROID -DEFINE_LIME_PRIM_1(jni_init_callback); -DEFINE_LIME_PRIM_4(jni_create_field); -DEFINE_LIME_PRIM_1(jni_get_static); -DEFINE_LIME_PRIM_2(jni_set_static); -DEFINE_LIME_PRIM_2(jni_get_member); -DEFINE_LIME_PRIM_3(jni_set_member); -DEFINE_LIME_PRIM_5(jni_create_method); -DEFINE_LIME_PRIM_2(jni_call_static); -DEFINE_LIME_PRIM_3(jni_call_member); -DEFINE_LIME_PRIM_0(jni_get_env); -DEFINE_LIME_PRIM_1(jni_get_jobject); -DEFINE_LIME_PRIM_1(post_ui_callback); +DEFINE_LIME_LEGACY_PRIM_1(jni_init_callback); +DEFINE_LIME_LEGACY_PRIM_4(jni_create_field); +DEFINE_LIME_LEGACY_PRIM_1(jni_get_static); +DEFINE_LIME_LEGACY_PRIM_2(jni_set_static); +DEFINE_LIME_LEGACY_PRIM_2(jni_get_member); +DEFINE_LIME_LEGACY_PRIM_3(jni_set_member); +DEFINE_LIME_LEGACY_PRIM_5(jni_create_method); +DEFINE_LIME_LEGACY_PRIM_2(jni_call_static); +DEFINE_LIME_LEGACY_PRIM_3(jni_call_member); +DEFINE_LIME_LEGACY_PRIM_0(jni_get_env); +DEFINE_LIME_LEGACY_PRIM_1(jni_get_jobject); +DEFINE_LIME_LEGACY_PRIM_1(post_ui_callback); #endif -DEFINE_LIME_PRIM_0(time_stamp); -DEFINE_LIME_PRIM_1(error_output); -DEFINE_LIME_PRIM_0(get_ndll_version); -DEFINE_LIME_PRIM_0(get_nme_state_version); -DEFINE_LIME_PRIM_0(get_bits); -DEFINE_LIME_PRIM_4(byte_array_init); -DEFINE_LIME_PRIM_2(byte_array_overwrite_file); -DEFINE_LIME_PRIM_1(byte_array_read_file); -DEFINE_LIME_PRIM_1(byte_array_get_native_pointer); -DEFINE_LIME_PRIM_2(weak_ref_create); -DEFINE_LIME_PRIM_1(weak_ref_get); -DEFINE_LIME_PRIM_0(get_unique_device_identifier); -DEFINE_LIME_PRIM_1(set_icon); -DEFINE_LIME_PRIM_0(sys_get_exe_name); -DEFINE_LIME_PRIM_0(capabilities_get_screen_resolutions); -DEFINE_LIME_PRIM_0(capabilities_get_screen_modes); -DEFINE_LIME_PRIM_0(capabilities_get_pixel_aspect_ratio); -DEFINE_LIME_PRIM_0(capabilities_get_screen_dpi); -DEFINE_LIME_PRIM_0(capabilities_get_screen_resolution_x); -DEFINE_LIME_PRIM_0(capabilities_get_screen_resolution_y); -DEFINE_LIME_PRIM_0(capabilities_get_language); -DEFINE_LIME_PRIM_0(get_resource_path); -DEFINE_LIME_PRIM_1(filesystem_get_special_dir); -DEFINE_LIME_PRIM_2(filesystem_get_volumes); -DEFINE_LIME_PRIM_1(get_url); -DEFINE_LIME_PRIM_2(haptic_vibrate); -DEFINE_LIME_PRIM_2(set_user_preference); -DEFINE_LIME_PRIM_1(get_user_preference); -DEFINE_LIME_PRIM_1(clear_user_preference); -DEFINE_LIME_PRIM_1(stage_set_fixed_orientation); -//DEFINE_LIME_PRIM_0(init_sdl_audio); -DEFINE_LIME_PRIM_1(get_frame_stage); -DEFINE_LIME_PRIM_4(set_package); -DEFINE_LIME_PRIM_MULT(create_main_frame); -DEFINE_LIME_PRIM_1(set_asset_base); -DEFINE_LIME_PRIM_0(terminate); -DEFINE_LIME_PRIM_0(close); -DEFINE_LIME_PRIM_0(start_animation); -DEFINE_LIME_PRIM_0(pause_animation); -DEFINE_LIME_PRIM_0(resume_animation); -DEFINE_LIME_PRIM_0(stop_animation); -DEFINE_LIME_PRIM_2(stage_set_next_wake); -DEFINE_LIME_PRIM_4(set_stage_handler); -DEFINE_LIME_PRIM_1(render_stage); -DEFINE_LIME_PRIM_1(set_render_gc_free); -DEFINE_LIME_PRIM_3(stage_resize_window); -DEFINE_LIME_PRIM_3(stage_set_resolution); -DEFINE_LIME_PRIM_5(stage_set_screenmode); -DEFINE_LIME_PRIM_2(stage_set_fullscreen); -DEFINE_LIME_PRIM_1(stage_get_focus_id); -DEFINE_LIME_PRIM_3(stage_set_focus); -DEFINE_LIME_PRIM_2(stage_get_joystick_name); -DEFINE_LIME_PRIM_1(stage_is_opengl); -DEFINE_LIME_PRIM_0(stage_request_render); -DEFINE_LIME_PRIM_2(stage_show_cursor); -DEFINE_LIME_PRIM_2(stage_constrain_cursor_to_window_frame); -DEFINE_LIME_PRIM_3(stage_set_cursor_position_in_window); -DEFINE_LIME_PRIM_3(stage_set_window_position); -DEFINE_LIME_PRIM_0(stage_get_orientation); -DEFINE_LIME_PRIM_0(stage_get_normal_orientation); +DEFINE_LIME_LEGACY_PRIM_0(time_stamp); +DEFINE_LIME_LEGACY_PRIM_1(error_output); +DEFINE_LIME_LEGACY_PRIM_0(get_ndll_version); +DEFINE_LIME_LEGACY_PRIM_0(get_nme_state_version); +DEFINE_LIME_LEGACY_PRIM_0(get_bits); +DEFINE_LIME_LEGACY_PRIM_4(byte_array_init); +DEFINE_LIME_LEGACY_PRIM_2(byte_array_overwrite_file); +DEFINE_LIME_LEGACY_PRIM_1(byte_array_read_file); +DEFINE_LIME_LEGACY_PRIM_1(byte_array_get_native_pointer); +DEFINE_LIME_LEGACY_PRIM_2(weak_ref_create); +DEFINE_LIME_LEGACY_PRIM_1(weak_ref_get); +DEFINE_LIME_LEGACY_PRIM_0(get_unique_device_identifier); +DEFINE_LIME_LEGACY_PRIM_1(set_icon); +DEFINE_LIME_LEGACY_PRIM_0(sys_get_exe_name); +DEFINE_LIME_LEGACY_PRIM_0(capabilities_get_screen_resolutions); +DEFINE_LIME_LEGACY_PRIM_0(capabilities_get_screen_modes); +DEFINE_LIME_LEGACY_PRIM_0(capabilities_get_pixel_aspect_ratio); +DEFINE_LIME_LEGACY_PRIM_0(capabilities_get_screen_dpi); +DEFINE_LIME_LEGACY_PRIM_0(capabilities_get_screen_resolution_x); +DEFINE_LIME_LEGACY_PRIM_0(capabilities_get_screen_resolution_y); +DEFINE_LIME_LEGACY_PRIM_0(capabilities_get_language); +DEFINE_LIME_LEGACY_PRIM_0(get_resource_path); +DEFINE_LIME_LEGACY_PRIM_1(filesystem_get_special_dir); +DEFINE_LIME_LEGACY_PRIM_2(filesystem_get_volumes); +DEFINE_LIME_LEGACY_PRIM_1(get_url); +DEFINE_LIME_LEGACY_PRIM_2(haptic_vibrate); +DEFINE_LIME_LEGACY_PRIM_2(set_user_preference); +DEFINE_LIME_LEGACY_PRIM_1(get_user_preference); +DEFINE_LIME_LEGACY_PRIM_1(clear_user_preference); +DEFINE_LIME_LEGACY_PRIM_1(stage_set_fixed_orientation); +//DEFINE_LIME_LEGACY_PRIM_0(init_sdl_audio); +DEFINE_LIME_LEGACY_PRIM_1(get_frame_stage); +DEFINE_LIME_LEGACY_PRIM_4(set_package); +DEFINE_LIME_LEGACY_PRIM_MULT(create_main_frame); +DEFINE_LIME_LEGACY_PRIM_1(set_asset_base); +DEFINE_LIME_LEGACY_PRIM_0(terminate); +DEFINE_LIME_LEGACY_PRIM_0(close); +DEFINE_LIME_LEGACY_PRIM_0(start_animation); +DEFINE_LIME_LEGACY_PRIM_0(pause_animation); +DEFINE_LIME_LEGACY_PRIM_0(resume_animation); +DEFINE_LIME_LEGACY_PRIM_0(stop_animation); +DEFINE_LIME_LEGACY_PRIM_2(stage_set_next_wake); +DEFINE_LIME_LEGACY_PRIM_4(set_stage_handler); +DEFINE_LIME_LEGACY_PRIM_1(render_stage); +DEFINE_LIME_LEGACY_PRIM_1(set_render_gc_free); +DEFINE_LIME_LEGACY_PRIM_3(stage_resize_window); +DEFINE_LIME_LEGACY_PRIM_3(stage_set_resolution); +DEFINE_LIME_LEGACY_PRIM_5(stage_set_screenmode); +DEFINE_LIME_LEGACY_PRIM_2(stage_set_fullscreen); +DEFINE_LIME_LEGACY_PRIM_1(stage_get_focus_id); +DEFINE_LIME_LEGACY_PRIM_3(stage_set_focus); +DEFINE_LIME_LEGACY_PRIM_2(stage_get_joystick_name); +DEFINE_LIME_LEGACY_PRIM_1(stage_is_opengl); +DEFINE_LIME_LEGACY_PRIM_0(stage_request_render); +DEFINE_LIME_LEGACY_PRIM_2(stage_show_cursor); +DEFINE_LIME_LEGACY_PRIM_2(stage_constrain_cursor_to_window_frame); +DEFINE_LIME_LEGACY_PRIM_3(stage_set_cursor_position_in_window); +DEFINE_LIME_LEGACY_PRIM_3(stage_set_window_position); +DEFINE_LIME_LEGACY_PRIM_0(stage_get_orientation); +DEFINE_LIME_LEGACY_PRIM_0(stage_get_normal_orientation); DEFINE_LIME_PROP(stage,focus_rect); DEFINE_LIME_PROP(stage,scale_mode); #ifdef NME_S3D @@ -155,8 +155,8 @@ DEFINE_LIME_PROP(stage,autos3d); #else value nme_stage_get_autos3d(value inHandle) { return alloc_bool(false); } value nme_stage_set_autos3d(value inHandle, value inVal) { return inVal; } -DEFINE_LIME_PRIM(stage_get_autos3d,1); -DEFINE_LIME_PRIM(stage_set_autos3d,2); +DEFINE_LIME_LEGACY_PRIM(stage_get_autos3d,1); +DEFINE_LIME_LEGACY_PRIM(stage_set_autos3d,2); #endif DEFINE_LIME_PROP(stage,align); DEFINE_LIME_PROP(stage,quality); @@ -167,40 +167,40 @@ DEFINE_LIME_PROP_READ(stage,stage_width); DEFINE_LIME_PROP_READ(stage,stage_height); DEFINE_LIME_PROP_READ(stage,dpi_scale); DEFINE_LIME_PROP_READ(stage,multitouch_supported); -DEFINE_LIME_PRIM_2(sv_create); -DEFINE_LIME_PRIM_1(sv_destroy); -DEFINE_LIME_PRIM_2(sv_action); -DEFINE_LIME_PRIM_4(sv_play); -DEFINE_LIME_PRIM_2(sv_seek); -DEFINE_LIME_PRIM_1(sv_get_time); -DEFINE_LIME_PRIM_5(sv_viewport); -DEFINE_LIME_PRIM_3(sv_pan); -DEFINE_LIME_PRIM_3(sv_zoom); -DEFINE_LIME_PRIM_3(sv_set_sound_transform); -DEFINE_LIME_PRIM_1(sv_get_buffered_percent); -DEFINE_LIME_PRIM_3(managed_stage_create); -DEFINE_LIME_PRIM_2(managed_stage_pump_event); -DEFINE_LIME_PRIM_0(input_get_acceleration); -DEFINE_LIME_PRIM_0(create_display_object); -DEFINE_LIME_PRIM_1(display_object_get_graphics); -DEFINE_LIME_PRIM_MULT(display_object_draw_to_surface); -DEFINE_LIME_PRIM_1(display_object_get_id); -DEFINE_LIME_PRIM_2(display_object_global_to_local); -DEFINE_LIME_PRIM_1(type); -DEFINE_LIME_PRIM_2(display_object_local_to_global); -DEFINE_LIME_PRIM_5(display_object_hit_test_point); -DEFINE_LIME_PRIM_2(display_object_set_filters); -DEFINE_LIME_PRIM_2(display_object_set_scale9_grid); -DEFINE_LIME_PRIM_2(display_object_set_scroll_rect); -DEFINE_LIME_PRIM_2(display_object_set_mask); -DEFINE_LIME_PRIM_2(display_object_set_matrix); -DEFINE_LIME_PRIM_3(display_object_get_matrix); -DEFINE_LIME_PRIM_2(display_object_set_color_transform); -DEFINE_LIME_PRIM_3(display_object_get_color_transform); -DEFINE_LIME_PRIM_2(display_object_get_pixel_bounds); -DEFINE_LIME_PRIM_4(display_object_get_bounds); -DEFINE_LIME_PRIM_1(display_object_request_soft_keyboard); -DEFINE_LIME_PRIM_1(display_object_dismiss_soft_keyboard); +DEFINE_LIME_LEGACY_PRIM_2(sv_create); +DEFINE_LIME_LEGACY_PRIM_1(sv_destroy); +DEFINE_LIME_LEGACY_PRIM_2(sv_action); +DEFINE_LIME_LEGACY_PRIM_4(sv_play); +DEFINE_LIME_LEGACY_PRIM_2(sv_seek); +DEFINE_LIME_LEGACY_PRIM_1(sv_get_time); +DEFINE_LIME_LEGACY_PRIM_5(sv_viewport); +DEFINE_LIME_LEGACY_PRIM_3(sv_pan); +DEFINE_LIME_LEGACY_PRIM_3(sv_zoom); +DEFINE_LIME_LEGACY_PRIM_3(sv_set_sound_transform); +DEFINE_LIME_LEGACY_PRIM_1(sv_get_buffered_percent); +DEFINE_LIME_LEGACY_PRIM_3(managed_stage_create); +DEFINE_LIME_LEGACY_PRIM_2(managed_stage_pump_event); +DEFINE_LIME_LEGACY_PRIM_0(input_get_acceleration); +DEFINE_LIME_LEGACY_PRIM_0(create_display_object); +DEFINE_LIME_LEGACY_PRIM_1(display_object_get_graphics); +DEFINE_LIME_LEGACY_PRIM_MULT(display_object_draw_to_surface); +DEFINE_LIME_LEGACY_PRIM_1(display_object_get_id); +DEFINE_LIME_LEGACY_PRIM_2(display_object_global_to_local); +DEFINE_LIME_LEGACY_PRIM_1(type); +DEFINE_LIME_LEGACY_PRIM_2(display_object_local_to_global); +DEFINE_LIME_LEGACY_PRIM_5(display_object_hit_test_point); +DEFINE_LIME_LEGACY_PRIM_2(display_object_set_filters); +DEFINE_LIME_LEGACY_PRIM_2(display_object_set_scale9_grid); +DEFINE_LIME_LEGACY_PRIM_2(display_object_set_scroll_rect); +DEFINE_LIME_LEGACY_PRIM_2(display_object_set_mask); +DEFINE_LIME_LEGACY_PRIM_2(display_object_set_matrix); +DEFINE_LIME_LEGACY_PRIM_3(display_object_get_matrix); +DEFINE_LIME_LEGACY_PRIM_2(display_object_set_color_transform); +DEFINE_LIME_LEGACY_PRIM_3(display_object_get_color_transform); +DEFINE_LIME_LEGACY_PRIM_2(display_object_get_pixel_bounds); +DEFINE_LIME_LEGACY_PRIM_4(display_object_get_bounds); +DEFINE_LIME_LEGACY_PRIM_1(display_object_request_soft_keyboard); +DEFINE_LIME_LEGACY_PRIM_1(display_object_dismiss_soft_keyboard); DEFINE_LIME_PROP(display_object,x); DEFINE_LIME_PROP(display_object,y); #ifdef NME_S3D @@ -208,8 +208,8 @@ DEFINE_LIME_PROP(display_object,z); #else value nme_display_object_get_z(value inHandle) { return alloc_int(0); } value nme_display_object_set_z(value inHandle, value inVal) { return inVal; } -DEFINE_LIME_PRIM(display_object_get_z,1); -DEFINE_LIME_PRIM(display_object_set_z,2); +DEFINE_LIME_LEGACY_PRIM(display_object_get_z,1); +DEFINE_LIME_LEGACY_PRIM(display_object_set_z,2); #endif DEFINE_LIME_PROP(display_object,scale_x); DEFINE_LIME_PROP(display_object,scale_y); @@ -229,64 +229,64 @@ DEFINE_LIME_PROP(display_object,needs_soft_keyboard); DEFINE_LIME_PROP(display_object,moves_for_soft_keyboard); DEFINE_LIME_PROP_READ(display_object,mouse_x); DEFINE_LIME_PROP_READ(display_object,mouse_y); -DEFINE_LIME_PRIM_0(direct_renderer_create); -DEFINE_LIME_PRIM_2(direct_renderer_set); -DEFINE_LIME_PRIM_0(simple_button_create); -DEFINE_LIME_PRIM_3(simple_button_set_state); +DEFINE_LIME_LEGACY_PRIM_0(direct_renderer_create); +DEFINE_LIME_LEGACY_PRIM_2(direct_renderer_set); +DEFINE_LIME_LEGACY_PRIM_0(simple_button_create); +DEFINE_LIME_LEGACY_PRIM_3(simple_button_set_state); DEFINE_LIME_PROP(simple_button,enabled); DEFINE_LIME_PROP(simple_button,hand_cursor); -DEFINE_LIME_PRIM_0(create_display_object_container); -DEFINE_LIME_PRIM_2(doc_add_child); -DEFINE_LIME_PRIM_3(doc_swap_children); -DEFINE_LIME_PRIM_2(doc_remove_child); -DEFINE_LIME_PRIM_3(doc_set_child_index); +DEFINE_LIME_LEGACY_PRIM_0(create_display_object_container); +DEFINE_LIME_LEGACY_PRIM_2(doc_add_child); +DEFINE_LIME_LEGACY_PRIM_3(doc_swap_children); +DEFINE_LIME_LEGACY_PRIM_2(doc_remove_child); +DEFINE_LIME_LEGACY_PRIM_3(doc_set_child_index); DEFINE_LIME_PROP(doc,mouse_children); -DEFINE_LIME_PRIM_2(external_interface_add_callback); -DEFINE_LIME_PRIM_0(external_interface_available); -DEFINE_LIME_PRIM_2(external_interface_call); -DEFINE_LIME_PRIM_0(external_interface_register_callbacks); -DEFINE_LIME_PRIM_1(gfx_clear); -DEFINE_LIME_PRIM_3(gfx_begin_fill); -DEFINE_LIME_PRIM_5(gfx_begin_bitmap_fill); -DEFINE_LIME_PRIM_5(gfx_line_bitmap_fill); -DEFINE_LIME_PRIM_MULT(gfx_begin_gradient_fill); -DEFINE_LIME_PRIM_MULT(gfx_line_gradient_fill); -DEFINE_LIME_PRIM_1(gfx_end_fill); -DEFINE_LIME_PRIM_MULT(gfx_line_style); -DEFINE_LIME_PRIM_3(gfx_move_to); -DEFINE_LIME_PRIM_3(gfx_line_to); -DEFINE_LIME_PRIM_5(gfx_curve_to); -DEFINE_LIME_PRIM_5(gfx_arc_to); -DEFINE_LIME_PRIM_5(gfx_draw_ellipse); -DEFINE_LIME_PRIM_5(gfx_draw_rect); -DEFINE_LIME_PRIM_4(gfx_draw_path); -DEFINE_LIME_PRIM_MULT(gfx_draw_round_rect); -DEFINE_LIME_PRIM_MULT(gfx_draw_triangles); -DEFINE_LIME_PRIM_2(gfx_draw_data); -DEFINE_LIME_PRIM_2(gfx_draw_datum); -DEFINE_LIME_PRIM_5(gfx_draw_tiles); -DEFINE_LIME_PRIM_MULT(gfx_draw_points); -DEFINE_LIME_PRIM_3(graphics_path_create); -DEFINE_LIME_PRIM_5(graphics_path_curve_to); -DEFINE_LIME_PRIM_3(graphics_path_line_to); -DEFINE_LIME_PRIM_3(graphics_path_move_to); -DEFINE_LIME_PRIM_3(graphics_path_wline_to); -DEFINE_LIME_PRIM_3(graphics_path_wmove_to); -DEFINE_LIME_PRIM_2(graphics_path_get_commands); -DEFINE_LIME_PRIM_2(graphics_path_set_commands); -DEFINE_LIME_PRIM_2(graphics_path_get_data); -DEFINE_LIME_PRIM_2(graphics_path_set_data); -DEFINE_LIME_PRIM_2(graphics_solid_fill_create); -DEFINE_LIME_PRIM_0(graphics_end_fill_create); -DEFINE_LIME_PRIM_MULT(graphics_stroke_create); -DEFINE_LIME_PRIM_0(text_field_create); -DEFINE_LIME_PRIM_2(text_field_set_def_text_format); -DEFINE_LIME_PRIM_4(text_field_get_text_format); -DEFINE_LIME_PRIM_4(text_field_set_text_format); -DEFINE_LIME_PRIM_2(text_field_get_def_text_format); -DEFINE_LIME_PRIM_3(text_field_get_line_metrics); -DEFINE_LIME_PRIM_2(text_field_get_line_text); -DEFINE_LIME_PRIM_2(text_field_get_line_offset); +DEFINE_LIME_LEGACY_PRIM_2(external_interface_add_callback); +DEFINE_LIME_LEGACY_PRIM_0(external_interface_available); +DEFINE_LIME_LEGACY_PRIM_2(external_interface_call); +DEFINE_LIME_LEGACY_PRIM_0(external_interface_register_callbacks); +DEFINE_LIME_LEGACY_PRIM_1(gfx_clear); +DEFINE_LIME_LEGACY_PRIM_3(gfx_begin_fill); +DEFINE_LIME_LEGACY_PRIM_5(gfx_begin_bitmap_fill); +DEFINE_LIME_LEGACY_PRIM_5(gfx_line_bitmap_fill); +DEFINE_LIME_LEGACY_PRIM_MULT(gfx_begin_gradient_fill); +DEFINE_LIME_LEGACY_PRIM_MULT(gfx_line_gradient_fill); +DEFINE_LIME_LEGACY_PRIM_1(gfx_end_fill); +DEFINE_LIME_LEGACY_PRIM_MULT(gfx_line_style); +DEFINE_LIME_LEGACY_PRIM_3(gfx_move_to); +DEFINE_LIME_LEGACY_PRIM_3(gfx_line_to); +DEFINE_LIME_LEGACY_PRIM_5(gfx_curve_to); +DEFINE_LIME_LEGACY_PRIM_5(gfx_arc_to); +DEFINE_LIME_LEGACY_PRIM_5(gfx_draw_ellipse); +DEFINE_LIME_LEGACY_PRIM_5(gfx_draw_rect); +DEFINE_LIME_LEGACY_PRIM_4(gfx_draw_path); +DEFINE_LIME_LEGACY_PRIM_MULT(gfx_draw_round_rect); +DEFINE_LIME_LEGACY_PRIM_MULT(gfx_draw_triangles); +DEFINE_LIME_LEGACY_PRIM_2(gfx_draw_data); +DEFINE_LIME_LEGACY_PRIM_2(gfx_draw_datum); +DEFINE_LIME_LEGACY_PRIM_5(gfx_draw_tiles); +DEFINE_LIME_LEGACY_PRIM_MULT(gfx_draw_points); +DEFINE_LIME_LEGACY_PRIM_3(graphics_path_create); +DEFINE_LIME_LEGACY_PRIM_5(graphics_path_curve_to); +DEFINE_LIME_LEGACY_PRIM_3(graphics_path_line_to); +DEFINE_LIME_LEGACY_PRIM_3(graphics_path_move_to); +DEFINE_LIME_LEGACY_PRIM_3(graphics_path_wline_to); +DEFINE_LIME_LEGACY_PRIM_3(graphics_path_wmove_to); +DEFINE_LIME_LEGACY_PRIM_2(graphics_path_get_commands); +DEFINE_LIME_LEGACY_PRIM_2(graphics_path_set_commands); +DEFINE_LIME_LEGACY_PRIM_2(graphics_path_get_data); +DEFINE_LIME_LEGACY_PRIM_2(graphics_path_set_data); +DEFINE_LIME_LEGACY_PRIM_2(graphics_solid_fill_create); +DEFINE_LIME_LEGACY_PRIM_0(graphics_end_fill_create); +DEFINE_LIME_LEGACY_PRIM_MULT(graphics_stroke_create); +DEFINE_LIME_LEGACY_PRIM_0(text_field_create); +DEFINE_LIME_LEGACY_PRIM_2(text_field_set_def_text_format); +DEFINE_LIME_LEGACY_PRIM_4(text_field_get_text_format); +DEFINE_LIME_LEGACY_PRIM_4(text_field_set_text_format); +DEFINE_LIME_LEGACY_PRIM_2(text_field_get_def_text_format); +DEFINE_LIME_LEGACY_PRIM_3(text_field_get_line_metrics); +DEFINE_LIME_LEGACY_PRIM_2(text_field_get_line_text); +DEFINE_LIME_LEGACY_PRIM_2(text_field_get_line_offset); DEFINE_LIME_PROP(text_field,text); DEFINE_LIME_PROP(text_field,html_text); DEFINE_LIME_PROP(text_field,text_color); @@ -310,245 +310,245 @@ DEFINE_LIME_PROP_READ(text_field,max_scroll_h); DEFINE_LIME_PROP_READ(text_field,max_scroll_v); DEFINE_LIME_PROP_READ(text_field,bottom_scroll_v); DEFINE_LIME_PROP_READ(text_field,num_lines); -DEFINE_LIME_PRIM_MULT(bitmap_data_create); -DEFINE_LIME_PRIM_1(bitmap_data_width); -DEFINE_LIME_PRIM_1(bitmap_data_height); -DEFINE_LIME_PRIM_1(bitmap_data_get_prem_alpha); -DEFINE_LIME_PRIM_2(bitmap_data_set_prem_alpha); -DEFINE_LIME_PRIM_2(bitmap_data_clear); -DEFINE_LIME_PRIM_1(bitmap_data_get_transparent); -DEFINE_LIME_PRIM_2(bitmap_data_set_flags); -DEFINE_LIME_PRIM_4(bitmap_data_fill); -DEFINE_LIME_PRIM_2(bitmap_data_load); -DEFINE_LIME_PRIM_2(bitmap_data_set_format); -DEFINE_LIME_PRIM_2(bitmap_data_from_bytes); -DEFINE_LIME_PRIM_3(bitmap_data_encode); -DEFINE_LIME_PRIM_1(bitmap_data_clone); -DEFINE_LIME_PRIM_3(bitmap_data_color_transform); -DEFINE_LIME_PRIM_5(bitmap_data_apply_filter); -DEFINE_LIME_PRIM_5(bitmap_data_copy); -DEFINE_LIME_PRIM_MULT(bitmap_data_copy_channel); -DEFINE_LIME_PRIM_2(bitmap_data_get_pixels); -DEFINE_LIME_PRIM_3(bitmap_data_get_array); -DEFINE_LIME_PRIM_5(bitmap_data_get_color_bounds_rect); -DEFINE_LIME_PRIM_3(bitmap_data_get_pixel); -DEFINE_LIME_PRIM_3(bitmap_data_get_pixel32); -DEFINE_LIME_PRIM_3(bitmap_data_get_pixel_rgba); -DEFINE_LIME_PRIM_3(bitmap_data_scroll); -DEFINE_LIME_PRIM_4(bitmap_data_set_pixel); -DEFINE_LIME_PRIM_4(bitmap_data_set_pixel32); -DEFINE_LIME_PRIM_4(bitmap_data_set_pixel_rgba); -DEFINE_LIME_PRIM_4(bitmap_data_set_bytes); -DEFINE_LIME_PRIM_3(bitmap_data_set_array); -DEFINE_LIME_PRIM_3(bitmap_data_generate_filter_rect); -DEFINE_LIME_PRIM_MULT(bitmap_data_noise); -DEFINE_LIME_PRIM_4(bitmap_data_flood_fill); -DEFINE_LIME_PRIM_1(bitmap_data_unmultiply_alpha); -DEFINE_LIME_PRIM_1(bitmap_data_multiply_alpha); -DEFINE_LIME_PRIM_MULT(render_surface_to_surface); -DEFINE_LIME_PRIM_1(bitmap_data_dispose); -DEFINE_LIME_PRIM_1(bitmap_data_destroy_hardware_surface); -DEFINE_LIME_PRIM_1(bitmap_data_create_hardware_surface); -DEFINE_LIME_PRIM_1(bitmap_data_dump_bits); -DEFINE_LIME_PRIM_2(video_create); -DEFINE_LIME_PRIM_2(video_load); -DEFINE_LIME_PRIM_1(video_play); -DEFINE_LIME_PRIM_1(video_clear); -DEFINE_LIME_PRIM_2(video_set_smoothing); -DEFINE_LIME_PRIM_2(sound_from_file); -DEFINE_LIME_PRIM_3(sound_from_data); -DEFINE_LIME_PRIM_2(sound_get_id3); -DEFINE_LIME_PRIM_1(sound_get_length); -DEFINE_LIME_PRIM_1(sound_close); -DEFINE_LIME_PRIM_1(sound_get_status); -DEFINE_LIME_PRIM_1(sound_channel_is_complete); -DEFINE_LIME_PRIM_1(sound_channel_get_left); -DEFINE_LIME_PRIM_1(sound_channel_get_right); -DEFINE_LIME_PRIM_1(sound_channel_get_position); -DEFINE_LIME_PRIM_2(sound_channel_set_position); -DEFINE_LIME_PRIM_1(sound_channel_stop); -DEFINE_LIME_PRIM_2(sound_channel_set_transform); -DEFINE_LIME_PRIM_2(sound_channel_set_pitch); -DEFINE_LIME_PRIM_4(sound_channel_create); -DEFINE_LIME_PRIM_1(sound_channel_needs_data); -DEFINE_LIME_PRIM_2(sound_channel_add_data); -DEFINE_LIME_PRIM_1(sound_channel_get_data_position); -DEFINE_LIME_PRIM_2(sound_channel_create_dynamic); -DEFINE_LIME_PRIM_1(tilesheet_create); -DEFINE_LIME_PRIM_3(tilesheet_add_rect); -DEFINE_LIME_PRIM_1(curl_initialize); -DEFINE_LIME_PRIM_1(curl_create); -DEFINE_LIME_PRIM_0(curl_process_loaders); -DEFINE_LIME_PRIM_2(curl_update_loader); -DEFINE_LIME_PRIM_1(curl_get_error_message); -DEFINE_LIME_PRIM_1(curl_get_code); -DEFINE_LIME_PRIM_1(curl_get_data); -DEFINE_LIME_PRIM_1(curl_get_cookies); -DEFINE_LIME_PRIM_1(curl_get_headers); -DEFINE_LIME_PRIM_1(lzma_encode); -DEFINE_LIME_PRIM_1(lzma_decode); -DEFINE_LIME_PRIM_2(file_dialog_folder); -DEFINE_LIME_PRIM_3(file_dialog_open); -DEFINE_LIME_PRIM_3(file_dialog_save); -DEFINE_LIME_PRIM_1(font_iterate_device_fonts); +DEFINE_LIME_LEGACY_PRIM_MULT(bitmap_data_create); +DEFINE_LIME_LEGACY_PRIM_1(bitmap_data_width); +DEFINE_LIME_LEGACY_PRIM_1(bitmap_data_height); +DEFINE_LIME_LEGACY_PRIM_1(bitmap_data_get_prem_alpha); +DEFINE_LIME_LEGACY_PRIM_2(bitmap_data_set_prem_alpha); +DEFINE_LIME_LEGACY_PRIM_2(bitmap_data_clear); +DEFINE_LIME_LEGACY_PRIM_1(bitmap_data_get_transparent); +DEFINE_LIME_LEGACY_PRIM_2(bitmap_data_set_flags); +DEFINE_LIME_LEGACY_PRIM_4(bitmap_data_fill); +DEFINE_LIME_LEGACY_PRIM_2(bitmap_data_load); +DEFINE_LIME_LEGACY_PRIM_2(bitmap_data_set_format); +DEFINE_LIME_LEGACY_PRIM_2(bitmap_data_from_bytes); +DEFINE_LIME_LEGACY_PRIM_3(bitmap_data_encode); +DEFINE_LIME_LEGACY_PRIM_1(bitmap_data_clone); +DEFINE_LIME_LEGACY_PRIM_3(bitmap_data_color_transform); +DEFINE_LIME_LEGACY_PRIM_5(bitmap_data_apply_filter); +DEFINE_LIME_LEGACY_PRIM_5(bitmap_data_copy); +DEFINE_LIME_LEGACY_PRIM_MULT(bitmap_data_copy_channel); +DEFINE_LIME_LEGACY_PRIM_2(bitmap_data_get_pixels); +DEFINE_LIME_LEGACY_PRIM_3(bitmap_data_get_array); +DEFINE_LIME_LEGACY_PRIM_5(bitmap_data_get_color_bounds_rect); +DEFINE_LIME_LEGACY_PRIM_3(bitmap_data_get_pixel); +DEFINE_LIME_LEGACY_PRIM_3(bitmap_data_get_pixel32); +DEFINE_LIME_LEGACY_PRIM_3(bitmap_data_get_pixel_rgba); +DEFINE_LIME_LEGACY_PRIM_3(bitmap_data_scroll); +DEFINE_LIME_LEGACY_PRIM_4(bitmap_data_set_pixel); +DEFINE_LIME_LEGACY_PRIM_4(bitmap_data_set_pixel32); +DEFINE_LIME_LEGACY_PRIM_4(bitmap_data_set_pixel_rgba); +DEFINE_LIME_LEGACY_PRIM_4(bitmap_data_set_bytes); +DEFINE_LIME_LEGACY_PRIM_3(bitmap_data_set_array); +DEFINE_LIME_LEGACY_PRIM_3(bitmap_data_generate_filter_rect); +DEFINE_LIME_LEGACY_PRIM_MULT(bitmap_data_noise); +DEFINE_LIME_LEGACY_PRIM_4(bitmap_data_flood_fill); +DEFINE_LIME_LEGACY_PRIM_1(bitmap_data_unmultiply_alpha); +DEFINE_LIME_LEGACY_PRIM_1(bitmap_data_multiply_alpha); +DEFINE_LIME_LEGACY_PRIM_MULT(render_surface_to_surface); +DEFINE_LIME_LEGACY_PRIM_1(bitmap_data_dispose); +DEFINE_LIME_LEGACY_PRIM_1(bitmap_data_destroy_hardware_surface); +DEFINE_LIME_LEGACY_PRIM_1(bitmap_data_create_hardware_surface); +DEFINE_LIME_LEGACY_PRIM_1(bitmap_data_dump_bits); +DEFINE_LIME_LEGACY_PRIM_2(video_create); +DEFINE_LIME_LEGACY_PRIM_2(video_load); +DEFINE_LIME_LEGACY_PRIM_1(video_play); +DEFINE_LIME_LEGACY_PRIM_1(video_clear); +DEFINE_LIME_LEGACY_PRIM_2(video_set_smoothing); +DEFINE_LIME_LEGACY_PRIM_2(sound_from_file); +DEFINE_LIME_LEGACY_PRIM_3(sound_from_data); +DEFINE_LIME_LEGACY_PRIM_2(sound_get_id3); +DEFINE_LIME_LEGACY_PRIM_1(sound_get_length); +DEFINE_LIME_LEGACY_PRIM_1(sound_close); +DEFINE_LIME_LEGACY_PRIM_1(sound_get_status); +DEFINE_LIME_LEGACY_PRIM_1(sound_channel_is_complete); +DEFINE_LIME_LEGACY_PRIM_1(sound_channel_get_left); +DEFINE_LIME_LEGACY_PRIM_1(sound_channel_get_right); +DEFINE_LIME_LEGACY_PRIM_1(sound_channel_get_position); +DEFINE_LIME_LEGACY_PRIM_2(sound_channel_set_position); +DEFINE_LIME_LEGACY_PRIM_1(sound_channel_stop); +DEFINE_LIME_LEGACY_PRIM_2(sound_channel_set_transform); +DEFINE_LIME_LEGACY_PRIM_2(sound_channel_set_pitch); +DEFINE_LIME_LEGACY_PRIM_4(sound_channel_create); +DEFINE_LIME_LEGACY_PRIM_1(sound_channel_needs_data); +DEFINE_LIME_LEGACY_PRIM_2(sound_channel_add_data); +DEFINE_LIME_LEGACY_PRIM_1(sound_channel_get_data_position); +DEFINE_LIME_LEGACY_PRIM_2(sound_channel_create_dynamic); +DEFINE_LIME_LEGACY_PRIM_1(tilesheet_create); +DEFINE_LIME_LEGACY_PRIM_3(tilesheet_add_rect); +DEFINE_LIME_LEGACY_PRIM_1(curl_initialize); +DEFINE_LIME_LEGACY_PRIM_1(curl_create); +DEFINE_LIME_LEGACY_PRIM_0(curl_process_loaders); +DEFINE_LIME_LEGACY_PRIM_2(curl_update_loader); +DEFINE_LIME_LEGACY_PRIM_1(curl_get_error_message); +DEFINE_LIME_LEGACY_PRIM_1(curl_get_code); +DEFINE_LIME_LEGACY_PRIM_1(curl_get_data); +DEFINE_LIME_LEGACY_PRIM_1(curl_get_cookies); +DEFINE_LIME_LEGACY_PRIM_1(curl_get_headers); +DEFINE_LIME_LEGACY_PRIM_1(lzma_encode); +DEFINE_LIME_LEGACY_PRIM_1(lzma_decode); +DEFINE_LIME_LEGACY_PRIM_2(file_dialog_folder); +DEFINE_LIME_LEGACY_PRIM_3(file_dialog_open); +DEFINE_LIME_LEGACY_PRIM_3(file_dialog_save); +DEFINE_LIME_LEGACY_PRIM_1(font_iterate_device_fonts); namespace nme { - DEFINE_LIME_PRIM_1(font_set_factory); - DEFINE_LIME_PRIM_2(font_register_font); - DEFINE_LIME_PRIM_0(gl_get_error); - DEFINE_LIME_PRIM_1(gl_get_extension); - DEFINE_LIME_PRIM_0(gl_finish); - DEFINE_LIME_PRIM_0(gl_flush); - DEFINE_LIME_PRIM_0(gl_version); - DEFINE_LIME_PRIM_1(gl_enable); - DEFINE_LIME_PRIM_1(gl_disable); - DEFINE_LIME_PRIM_2(gl_hint); - DEFINE_LIME_PRIM_1(gl_line_width); - DEFINE_LIME_PRIM_0(gl_get_context_attributes); - DEFINE_LIME_PRIM_1(gl_get_supported_extensions); - DEFINE_LIME_PRIM_1(gl_front_face); - DEFINE_LIME_PRIM_1(gl_get_parameter); - DEFINE_LIME_PRIM_1(gl_is_enabled); - DEFINE_LIME_PRIM_0(gl_create_program); - DEFINE_LIME_PRIM_1(gl_create_shader); - DEFINE_LIME_PRIM_3(gl_stencil_func); - DEFINE_LIME_PRIM_4(gl_stencil_func_separate); - DEFINE_LIME_PRIM_1(gl_stencil_mask); - DEFINE_LIME_PRIM_2(gl_stencil_mask_separate); - DEFINE_LIME_PRIM_3(gl_stencil_op); - DEFINE_LIME_PRIM_4(gl_stencil_op_separate); - DEFINE_LIME_PRIM_4(gl_blend_color); - DEFINE_LIME_PRIM_1(gl_blend_equation); - DEFINE_LIME_PRIM_2(gl_blend_equation_separate); - DEFINE_LIME_PRIM_2(gl_blend_func); - DEFINE_LIME_PRIM_4(gl_blend_func_separate); - DEFINE_LIME_PRIM_1(gl_link_program); - DEFINE_LIME_PRIM_1(gl_validate_program); - DEFINE_LIME_PRIM_1(gl_get_program_info_log); - DEFINE_LIME_PRIM_3(gl_bind_attrib_location); - DEFINE_LIME_PRIM_2(gl_get_attrib_location); - DEFINE_LIME_PRIM_2(gl_get_uniform_location); - DEFINE_LIME_PRIM_2(gl_get_uniform); - DEFINE_LIME_PRIM_2(gl_get_program_parameter); - DEFINE_LIME_PRIM_1(gl_use_program); - DEFINE_LIME_PRIM_2(gl_get_active_attrib); - DEFINE_LIME_PRIM_2(gl_get_active_uniform); - DEFINE_LIME_PRIM_4(gl_uniform_matrix); - DEFINE_LIME_PRIM_2(gl_uniform1iv); - DEFINE_LIME_PRIM_2(gl_uniform2iv); - DEFINE_LIME_PRIM_2(gl_uniform3iv); - DEFINE_LIME_PRIM_2(gl_uniform4iv); - DEFINE_LIME_PRIM_2(gl_uniform1fv); - DEFINE_LIME_PRIM_2(gl_uniform2fv); - DEFINE_LIME_PRIM_2(gl_uniform3fv); - DEFINE_LIME_PRIM_2(gl_uniform4fv); - DEFINE_LIME_PRIM_2(gl_vertex_attrib1f); - DEFINE_LIME_PRIM_3(gl_vertex_attrib2f); - DEFINE_LIME_PRIM_4(gl_vertex_attrib3f); - DEFINE_LIME_PRIM_5(gl_vertex_attrib4f); - DEFINE_LIME_PRIM_2(gl_vertex_attrib1fv); - DEFINE_LIME_PRIM_2(gl_vertex_attrib2fv); - DEFINE_LIME_PRIM_2(gl_vertex_attrib3fv); - DEFINE_LIME_PRIM_2(gl_vertex_attrib4fv); - DEFINE_LIME_PRIM_2(gl_shader_source); - DEFINE_LIME_PRIM_2(gl_attach_shader); - DEFINE_LIME_PRIM_2(gl_detach_shader); - DEFINE_LIME_PRIM_1(gl_compile_shader); - DEFINE_LIME_PRIM_2(gl_get_shader_parameter); - DEFINE_LIME_PRIM_1(gl_get_shader_info_log); - DEFINE_LIME_PRIM_1(gl_get_shader_source); - DEFINE_LIME_PRIM_2(gl_get_shader_precision_format); - DEFINE_LIME_PRIM_2(gl_bind_buffer); - DEFINE_LIME_PRIM_5(gl_buffer_data); - DEFINE_LIME_PRIM_5(gl_buffer_sub_data); - DEFINE_LIME_PRIM_2(gl_get_vertex_attrib_offset); - DEFINE_LIME_PRIM_2(gl_get_vertex_attrib); - DEFINE_LIME_PRIM_MULT(gl_vertex_attrib_pointer); - DEFINE_LIME_PRIM_1(gl_enable_vertex_attrib_array); - DEFINE_LIME_PRIM_1(gl_disable_vertex_attrib_array); - DEFINE_LIME_PRIM_2(gl_get_buffer_paramerter); - DEFINE_LIME_PRIM_2(gl_get_buffer_parameter); - DEFINE_LIME_PRIM_2(gl_bind_framebuffer); - DEFINE_LIME_PRIM_2(gl_bind_renderbuffer); - DEFINE_LIME_PRIM_1(gl_delete_render_buffer); - DEFINE_LIME_PRIM_4(gl_framebuffer_renderbuffer); - DEFINE_LIME_PRIM_5(gl_framebuffer_texture2D); - DEFINE_LIME_PRIM_4(gl_renderbuffer_storage); - DEFINE_LIME_PRIM_1(gl_check_framebuffer_status); - DEFINE_LIME_PRIM_3(gl_get_framebuffer_attachment_parameter); - DEFINE_LIME_PRIM_2(gl_get_render_buffer_parameter); - DEFINE_LIME_PRIM_3(gl_draw_arrays); - DEFINE_LIME_PRIM_4(gl_draw_elements); - DEFINE_LIME_PRIM_4(gl_viewport); - DEFINE_LIME_PRIM_4(gl_scissor); - DEFINE_LIME_PRIM_1(gl_clear); - DEFINE_LIME_PRIM_4(gl_clear_color); - DEFINE_LIME_PRIM_1(gl_clear_depth); - DEFINE_LIME_PRIM_1(gl_clear_stencil); - DEFINE_LIME_PRIM_4(gl_color_mask); - DEFINE_LIME_PRIM_1(gl_depth_func); - DEFINE_LIME_PRIM_1(gl_depth_mask); - DEFINE_LIME_PRIM_2(gl_depth_range); - DEFINE_LIME_PRIM_1(gl_cull_face); - DEFINE_LIME_PRIM_2(gl_polygon_offset); - DEFINE_LIME_PRIM_MULT(gl_read_pixels); - DEFINE_LIME_PRIM_2(gl_pixel_storei); - DEFINE_LIME_PRIM_2(gl_sample_coverage); - DEFINE_LIME_PRIM_1(gl_active_texture); - DEFINE_LIME_PRIM_2(gl_bind_texture); - DEFINE_LIME_PRIM_1(gl_bind_bitmap_data_texture); - DEFINE_LIME_PRIM_MULT(gl_tex_image_2d); - DEFINE_LIME_PRIM_MULT(gl_tex_sub_image_2d); - DEFINE_LIME_PRIM_MULT(gl_compressed_tex_image_2d); - DEFINE_LIME_PRIM_MULT(gl_compressed_tex_sub_image_2d); - DEFINE_LIME_PRIM_3(gl_tex_parameterf); - DEFINE_LIME_PRIM_3(gl_tex_parameteri); - DEFINE_LIME_PRIM_MULT(gl_copy_tex_image_2d); - DEFINE_LIME_PRIM_MULT(gl_copy_tex_sub_image_2d); - DEFINE_LIME_PRIM_1(gl_generate_mipmap); - DEFINE_LIME_PRIM_2(gl_get_tex_parameter); - DEFINE_LIME_PRIM_1(gl_is_buffer); - DEFINE_LIME_PRIM_1(gl_is_program); - DEFINE_LIME_PRIM_1(gl_is_renderbuffer); - DEFINE_LIME_PRIM_1(gl_is_framebuffer); - DEFINE_LIME_PRIM_1(gl_is_shader); - DEFINE_LIME_PRIM_1(gl_is_texture); - DEFINE_LIME_PRIM_1(gl_delete_texture); - DEFINE_LIME_PRIM_1(gl_delete_shader); - DEFINE_LIME_PRIM_1(gl_delete_program); - DEFINE_LIME_PRIM_1(gl_delete_framebuffer); - DEFINE_LIME_PRIM_1(gl_delete_renderbuffer); - DEFINE_LIME_PRIM_1(gl_delete_buffer); - DEFINE_LIME_PRIM_0(gl_create_texture); - DEFINE_LIME_PRIM_0(gl_create_buffer); - DEFINE_LIME_PRIM_0(gl_create_framebuffer); - DEFINE_LIME_PRIM_0(gl_create_render_buffer); - DEFINE_LIME_PRIM_2(gl_uniform1i); - DEFINE_LIME_PRIM_2(gl_uniform1f); - DEFINE_LIME_PRIM_3(gl_uniform2i); - DEFINE_LIME_PRIM_3(gl_uniform2f); - DEFINE_LIME_PRIM_4(gl_uniform3i); - DEFINE_LIME_PRIM_4(gl_uniform3f); - DEFINE_LIME_PRIM_5(gl_uniform4i); - DEFINE_LIME_PRIM_5(gl_uniform4f); + DEFINE_LIME_LEGACY_PRIM_1(font_set_factory); + DEFINE_LIME_LEGACY_PRIM_2(font_register_font); + DEFINE_LIME_LEGACY_PRIM_0(gl_get_error); + DEFINE_LIME_LEGACY_PRIM_1(gl_get_extension); + DEFINE_LIME_LEGACY_PRIM_0(gl_finish); + DEFINE_LIME_LEGACY_PRIM_0(gl_flush); + DEFINE_LIME_LEGACY_PRIM_0(gl_version); + DEFINE_LIME_LEGACY_PRIM_1(gl_enable); + DEFINE_LIME_LEGACY_PRIM_1(gl_disable); + DEFINE_LIME_LEGACY_PRIM_2(gl_hint); + DEFINE_LIME_LEGACY_PRIM_1(gl_line_width); + DEFINE_LIME_LEGACY_PRIM_0(gl_get_context_attributes); + DEFINE_LIME_LEGACY_PRIM_1(gl_get_supported_extensions); + DEFINE_LIME_LEGACY_PRIM_1(gl_front_face); + DEFINE_LIME_LEGACY_PRIM_1(gl_get_parameter); + DEFINE_LIME_LEGACY_PRIM_1(gl_is_enabled); + DEFINE_LIME_LEGACY_PRIM_0(gl_create_program); + DEFINE_LIME_LEGACY_PRIM_1(gl_create_shader); + DEFINE_LIME_LEGACY_PRIM_3(gl_stencil_func); + DEFINE_LIME_LEGACY_PRIM_4(gl_stencil_func_separate); + DEFINE_LIME_LEGACY_PRIM_1(gl_stencil_mask); + DEFINE_LIME_LEGACY_PRIM_2(gl_stencil_mask_separate); + DEFINE_LIME_LEGACY_PRIM_3(gl_stencil_op); + DEFINE_LIME_LEGACY_PRIM_4(gl_stencil_op_separate); + DEFINE_LIME_LEGACY_PRIM_4(gl_blend_color); + DEFINE_LIME_LEGACY_PRIM_1(gl_blend_equation); + DEFINE_LIME_LEGACY_PRIM_2(gl_blend_equation_separate); + DEFINE_LIME_LEGACY_PRIM_2(gl_blend_func); + DEFINE_LIME_LEGACY_PRIM_4(gl_blend_func_separate); + DEFINE_LIME_LEGACY_PRIM_1(gl_link_program); + DEFINE_LIME_LEGACY_PRIM_1(gl_validate_program); + DEFINE_LIME_LEGACY_PRIM_1(gl_get_program_info_log); + DEFINE_LIME_LEGACY_PRIM_3(gl_bind_attrib_location); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_attrib_location); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_uniform_location); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_uniform); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_program_parameter); + DEFINE_LIME_LEGACY_PRIM_1(gl_use_program); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_active_attrib); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_active_uniform); + DEFINE_LIME_LEGACY_PRIM_4(gl_uniform_matrix); + DEFINE_LIME_LEGACY_PRIM_2(gl_uniform1iv); + DEFINE_LIME_LEGACY_PRIM_2(gl_uniform2iv); + DEFINE_LIME_LEGACY_PRIM_2(gl_uniform3iv); + DEFINE_LIME_LEGACY_PRIM_2(gl_uniform4iv); + DEFINE_LIME_LEGACY_PRIM_2(gl_uniform1fv); + DEFINE_LIME_LEGACY_PRIM_2(gl_uniform2fv); + DEFINE_LIME_LEGACY_PRIM_2(gl_uniform3fv); + DEFINE_LIME_LEGACY_PRIM_2(gl_uniform4fv); + DEFINE_LIME_LEGACY_PRIM_2(gl_vertex_attrib1f); + DEFINE_LIME_LEGACY_PRIM_3(gl_vertex_attrib2f); + DEFINE_LIME_LEGACY_PRIM_4(gl_vertex_attrib3f); + DEFINE_LIME_LEGACY_PRIM_5(gl_vertex_attrib4f); + DEFINE_LIME_LEGACY_PRIM_2(gl_vertex_attrib1fv); + DEFINE_LIME_LEGACY_PRIM_2(gl_vertex_attrib2fv); + DEFINE_LIME_LEGACY_PRIM_2(gl_vertex_attrib3fv); + DEFINE_LIME_LEGACY_PRIM_2(gl_vertex_attrib4fv); + DEFINE_LIME_LEGACY_PRIM_2(gl_shader_source); + DEFINE_LIME_LEGACY_PRIM_2(gl_attach_shader); + DEFINE_LIME_LEGACY_PRIM_2(gl_detach_shader); + DEFINE_LIME_LEGACY_PRIM_1(gl_compile_shader); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_shader_parameter); + DEFINE_LIME_LEGACY_PRIM_1(gl_get_shader_info_log); + DEFINE_LIME_LEGACY_PRIM_1(gl_get_shader_source); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_shader_precision_format); + DEFINE_LIME_LEGACY_PRIM_2(gl_bind_buffer); + DEFINE_LIME_LEGACY_PRIM_5(gl_buffer_data); + DEFINE_LIME_LEGACY_PRIM_5(gl_buffer_sub_data); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_vertex_attrib_offset); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_vertex_attrib); + DEFINE_LIME_LEGACY_PRIM_MULT(gl_vertex_attrib_pointer); + DEFINE_LIME_LEGACY_PRIM_1(gl_enable_vertex_attrib_array); + DEFINE_LIME_LEGACY_PRIM_1(gl_disable_vertex_attrib_array); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_buffer_paramerter); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_buffer_parameter); + DEFINE_LIME_LEGACY_PRIM_2(gl_bind_framebuffer); + DEFINE_LIME_LEGACY_PRIM_2(gl_bind_renderbuffer); + DEFINE_LIME_LEGACY_PRIM_1(gl_delete_render_buffer); + DEFINE_LIME_LEGACY_PRIM_4(gl_framebuffer_renderbuffer); + DEFINE_LIME_LEGACY_PRIM_5(gl_framebuffer_texture2D); + DEFINE_LIME_LEGACY_PRIM_4(gl_renderbuffer_storage); + DEFINE_LIME_LEGACY_PRIM_1(gl_check_framebuffer_status); + DEFINE_LIME_LEGACY_PRIM_3(gl_get_framebuffer_attachment_parameter); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_render_buffer_parameter); + DEFINE_LIME_LEGACY_PRIM_3(gl_draw_arrays); + DEFINE_LIME_LEGACY_PRIM_4(gl_draw_elements); + DEFINE_LIME_LEGACY_PRIM_4(gl_viewport); + DEFINE_LIME_LEGACY_PRIM_4(gl_scissor); + DEFINE_LIME_LEGACY_PRIM_1(gl_clear); + DEFINE_LIME_LEGACY_PRIM_4(gl_clear_color); + DEFINE_LIME_LEGACY_PRIM_1(gl_clear_depth); + DEFINE_LIME_LEGACY_PRIM_1(gl_clear_stencil); + DEFINE_LIME_LEGACY_PRIM_4(gl_color_mask); + DEFINE_LIME_LEGACY_PRIM_1(gl_depth_func); + DEFINE_LIME_LEGACY_PRIM_1(gl_depth_mask); + DEFINE_LIME_LEGACY_PRIM_2(gl_depth_range); + DEFINE_LIME_LEGACY_PRIM_1(gl_cull_face); + DEFINE_LIME_LEGACY_PRIM_2(gl_polygon_offset); + DEFINE_LIME_LEGACY_PRIM_MULT(gl_read_pixels); + DEFINE_LIME_LEGACY_PRIM_2(gl_pixel_storei); + DEFINE_LIME_LEGACY_PRIM_2(gl_sample_coverage); + DEFINE_LIME_LEGACY_PRIM_1(gl_active_texture); + DEFINE_LIME_LEGACY_PRIM_2(gl_bind_texture); + DEFINE_LIME_LEGACY_PRIM_1(gl_bind_bitmap_data_texture); + DEFINE_LIME_LEGACY_PRIM_MULT(gl_tex_image_2d); + DEFINE_LIME_LEGACY_PRIM_MULT(gl_tex_sub_image_2d); + DEFINE_LIME_LEGACY_PRIM_MULT(gl_compressed_tex_image_2d); + DEFINE_LIME_LEGACY_PRIM_MULT(gl_compressed_tex_sub_image_2d); + DEFINE_LIME_LEGACY_PRIM_3(gl_tex_parameterf); + DEFINE_LIME_LEGACY_PRIM_3(gl_tex_parameteri); + DEFINE_LIME_LEGACY_PRIM_MULT(gl_copy_tex_image_2d); + DEFINE_LIME_LEGACY_PRIM_MULT(gl_copy_tex_sub_image_2d); + DEFINE_LIME_LEGACY_PRIM_1(gl_generate_mipmap); + DEFINE_LIME_LEGACY_PRIM_2(gl_get_tex_parameter); + DEFINE_LIME_LEGACY_PRIM_1(gl_is_buffer); + DEFINE_LIME_LEGACY_PRIM_1(gl_is_program); + DEFINE_LIME_LEGACY_PRIM_1(gl_is_renderbuffer); + DEFINE_LIME_LEGACY_PRIM_1(gl_is_framebuffer); + DEFINE_LIME_LEGACY_PRIM_1(gl_is_shader); + DEFINE_LIME_LEGACY_PRIM_1(gl_is_texture); + DEFINE_LIME_LEGACY_PRIM_1(gl_delete_texture); + DEFINE_LIME_LEGACY_PRIM_1(gl_delete_shader); + DEFINE_LIME_LEGACY_PRIM_1(gl_delete_program); + DEFINE_LIME_LEGACY_PRIM_1(gl_delete_framebuffer); + DEFINE_LIME_LEGACY_PRIM_1(gl_delete_renderbuffer); + DEFINE_LIME_LEGACY_PRIM_1(gl_delete_buffer); + DEFINE_LIME_LEGACY_PRIM_0(gl_create_texture); + DEFINE_LIME_LEGACY_PRIM_0(gl_create_buffer); + DEFINE_LIME_LEGACY_PRIM_0(gl_create_framebuffer); + DEFINE_LIME_LEGACY_PRIM_0(gl_create_render_buffer); + DEFINE_LIME_LEGACY_PRIM_2(gl_uniform1i); + DEFINE_LIME_LEGACY_PRIM_2(gl_uniform1f); + DEFINE_LIME_LEGACY_PRIM_3(gl_uniform2i); + DEFINE_LIME_LEGACY_PRIM_3(gl_uniform2f); + DEFINE_LIME_LEGACY_PRIM_4(gl_uniform3i); + DEFINE_LIME_LEGACY_PRIM_4(gl_uniform3f); + DEFINE_LIME_LEGACY_PRIM_5(gl_uniform4i); + DEFINE_LIME_LEGACY_PRIM_5(gl_uniform4f); namespace S3D { #ifdef NME_S3D - DEFINE_LIME_PRIM_0(get_s3d_enabled); - DEFINE_LIME_PRIM_1(set_s3d_enabled); - DEFINE_LIME_PRIM_0(get_s3d_supported); + DEFINE_LIME_LEGACY_PRIM_0(get_s3d_enabled); + DEFINE_LIME_LEGACY_PRIM_1(set_s3d_enabled); + DEFINE_LIME_LEGACY_PRIM_0(get_s3d_supported); #else value nme_get_s3d_enabled() { return alloc_bool(false); } value nme_set_s3d_enabled(value inVal) { return inVal; } value nme_get_s3d_supported() { return alloc_bool(false); } - DEFINE_LIME_PRIM_0(get_s3d_enabled); - DEFINE_LIME_PRIM_1(set_s3d_enabled); - DEFINE_LIME_PRIM_0(get_s3d_supported); + DEFINE_LIME_LEGACY_PRIM_0(get_s3d_enabled); + DEFINE_LIME_LEGACY_PRIM_1(set_s3d_enabled); + DEFINE_LIME_LEGACY_PRIM_0(get_s3d_supported); #endif @@ -556,10 +556,10 @@ namespace nme { #ifdef NME_S3D - DEFINE_LIME_PRIM_0(gl_s3d_get_eye_separation); - DEFINE_LIME_PRIM_1(gl_s3d_set_eye_separation); - DEFINE_LIME_PRIM_0(gl_s3d_get_focal_length); - DEFINE_LIME_PRIM_1(gl_s3d_set_focal_length); + DEFINE_LIME_LEGACY_PRIM_0(gl_s3d_get_eye_separation); + DEFINE_LIME_LEGACY_PRIM_1(gl_s3d_set_eye_separation); + DEFINE_LIME_LEGACY_PRIM_0(gl_s3d_get_focal_length); + DEFINE_LIME_LEGACY_PRIM_1(gl_s3d_set_focal_length); #endif @@ -568,7 +568,7 @@ namespace nme { extern "C" int nme_register_prims(); -extern "C" int lime_register_prims() +extern "C" int lime_legacy_register_prims() { nme_register_prims(); return 0; diff --git a/legacy/templates/emscripten/cpp/Main.cpp b/legacy/templates/emscripten/cpp/Main.cpp index c6ab66805..ae9ef7402 100644 --- a/legacy/templates/emscripten/cpp/Main.cpp +++ b/legacy/templates/emscripten/cpp/Main.cpp @@ -12,7 +12,7 @@ extern "C" void hxcpp_set_top_of_stack(); ::foreach ndlls:: ::if (registerStatics):: - extern "C" int ::name::_register_prims(); + extern "C" int ::nameSafe::_register_prims(); ::end:: ::end:: @@ -23,7 +23,7 @@ extern "C" int main(int argc, char *argv[]) ::foreach ndlls:: ::if (registerStatics):: - ::name::_register_prims(); + ::nameSafe::_register_prims(); ::end:: ::end:: diff --git a/legacy/templates/iphone/PROJ/Classes/Main.mm b/legacy/templates/iphone/PROJ/Classes/Main.mm index c6ab66805..ae9ef7402 100644 --- a/legacy/templates/iphone/PROJ/Classes/Main.mm +++ b/legacy/templates/iphone/PROJ/Classes/Main.mm @@ -12,7 +12,7 @@ extern "C" void hxcpp_set_top_of_stack(); ::foreach ndlls:: ::if (registerStatics):: - extern "C" int ::name::_register_prims(); + extern "C" int ::nameSafe::_register_prims(); ::end:: ::end:: @@ -23,7 +23,7 @@ extern "C" int main(int argc, char *argv[]) ::foreach ndlls:: ::if (registerStatics):: - ::name::_register_prims(); + ::nameSafe::_register_prims(); ::end:: ::end:: diff --git a/lime/project/HXProject.hx b/lime/project/HXProject.hx index 28c083910..ec316ac9c 100644 --- a/lime/project/HXProject.hx +++ b/lime/project/HXProject.hx @@ -936,7 +936,18 @@ class HXProject { } - Reflect.setField (context, "ndlls", ndlls); + context.ndlls = new Array (); + + for (ndll in ndlls) { + + var templateNDLL:Dynamic = { }; + ObjectHelper.copyFields (ndll, templateNDLL); + templateNDLL.nameSafe = StringTools.replace (ndll.name, "-", "_"); + context.ndlls.push (templateNDLL); + + } + + //Reflect.setField (context, "ndlls", ndlls); //Reflect.setField (context, "sslCaCert", sslCaCert); context.sslCaCert = ""; diff --git a/lime/utils/ByteArray.hx b/lime/utils/ByteArray.hx index 5bf80179c..be67ff9a7 100644 --- a/lime/utils/ByteArray.hx +++ b/lime/utils/ByteArray.hx @@ -110,7 +110,7 @@ class ByteArray #if !js extends Bytes implements ArrayAccess implements IDa init (factory, slen, resize, bytes); #if lime_hybrid - var init = System.load ("lime-legacy", "lime_byte_array_init", 4); + var init = System.load ("lime-legacy", "lime_legacy_byte_array_init", 4); init (factory, slen, resize, bytes); #end diff --git a/svg.n b/svg.n index 583255761a3e1463a60eec5fc0a90ec90d77352b..69cc098dd628e873f494231ab7c2651a922d4216 100644 GIT binary patch delta 21244 zcmai+2Vhh6_Q&tNY12j1657(HkPZqIC~ax6)Pk2?hK$leQC3Ksqz$A=Owxr&iue!_ z5V=Yau(i-#O>E$Nk+AR{tmd z#FBW$u>MaDFAZfFdozYnXKYn$WZQLM(ni_!HhbD6i@mg5o7PWXp*LBqWqPwCZJ@SF zpJpC;x7Vk1K%7?L$6eTlZXS~wf^Nra!Mk#S6F8eyD_WyT5bwtPCvwuE80MTDzM z7|yRtdU|?lI>Y@5jV!WhHX4WCR%SG79eS?iQlUq*IwW@~!*avlMAFHEKDx@;TH;=8 z)5BL&rZt*12Aj4_&ux7Z{(EYfAX#&%r^#a1bBC58Bmd=aiCWHZTr5c)mqX_yyg<>F zkWg_u_YQg7B>mq6#R}9sy=`iGdKZT4wgR5Z2y0fr)^;VN0zxHWsbG&8;oL`J^eTWS z3|j@q34|9`A>$<^?IYS{*D<*cDx)*w2DU~j zA6FvOs$$q@g&nFf^1!#CRSVIvsp0)d)V&3V7vDl*ON7GMj3o00C|@9K*Z}3n8_=Y0 z35tz~=5B=dv%=f4Ng*3HqAnbhmd5=ld=;A_-~Tom^_dXbs$J}#n~}Wd7KWo~lZsZQ zrlxVPAkG~UhP7%J5?Tj)?YqD>!PzRQ)m0K#Z$}6CGpS~s$t06Aopt)6@)GV)-QHGy zEIV1)-@0vw?H{0sLA%gT95XGAo3Tr*!MJ!t$F&D0q;S7O$NeBE)uZG|dzk=;W$N^( z6Cc7;#uS(7;FVSk=oL*|fA)Z|CN3u=^f2P|oxeiG4zCm|gsJoXt3&wfV9K11{>Mbl3~>PFyC!7z}dp#;Y%CwPIxPN#wN z(=cx&e194h{+$r}InbRj=ySL{O?Zwl^KV$UAi(jCh1DUawqDlHVfP^)s(;KwqCI{Dt3{%MP zDoHCy+Cex#(W_shF&!=oG)EuuxAjOT>_e464Kh_b?x500k?Wg#Co?2;5b`PI#HHhOnD(;VQb;{~DxT1no6c zwSw?6VL4$t;Sk~cH7EEJiOsG934|;{9zjp2A-qmlO876~9N`W@eglXlJV{tZ*g?2L z_~Qnu(B(Ve8NznLKZK~8KGb9Dy0>TKbZowtt7BXr?2Z4WrOTWVea+7~YE;D{d0rv<6cahjec=av}ZxQz0 zh2i{NCWur2fjw{JUzn7ug{jH?hwl6f@m>F*kbQ*D3FisiJ)k8a$s{}*K3W^R1&J-4McaCMa5gaS$ULt7&NvAp1pOedwCK14EH$ol)?@X_V5tc=GnGr~~06roMWnI&VwVb+ABCU29ppKue9DVTmn8+NCB zy;-NX>1|wx<}hs|oF)832v!0elt|4J3J9eH3*iOAOG;F7s}SDl1NNNoX{S!j#RtMw3oB-#M>sDy-aKf+3C#Sm|jYNVt)eb=hwLlodd5zDFX0wpwlF%afA;1f;3Ui>%q7&3^KO#%6Aq`NE5o`7zoyS*pAe>YdCu9V3)Dk0 zfYlkW#bu(mKFVZ6x$3UK$6cWt_!tK2r^nbZZf6$ItQ)dSBJ>~>60C$(gmZ-72wXOx zB6KB;&4#Lyq*qAVn2jR0XZHesBeC1#z!1U+LM34Z;RxX}!7m4hA@n5-B@_ueGTNrj zAyL^Kc_(y7g^!Tbrw8yZVP6ke|LFlkB9CZ+5R#c3;w13{9?G=>pV=pJMITh^^Zrn- z$_365;)K^T+hpw-0P)O|$RlM4+}{}r$Hl{-+ep|u42I(X4xt4OEzS;?hQZ5O_hV)e z>)e#bvRE(~84R~Ak7Y>A#I-CBS^NkSCm(^-A%yS|h;}0sk3jn6grj8mjPM2FJmK;P zq`gM?o}xb!{v@#ZKp-IukOeVAEfq?mzOTt><)TQPL?{z3J@!V|*U2N88E(~^2Mj4R z>MOa$WZX?^G^12&)pOsHCaM7735CMutoF`nByKK1El(Dp3YQ6gQS`}?Fc?QdauOC$ zbR$VeN0Q4(w5IDQNJWI_0qTk@hTAj>KJ|osgu|n-asMCrY%WApJ{sNEYXEKGflS`; z0%2sg<{_!0VIDXdIZhC)-IBxSjYe625ZXM2$!izZck36v`YFVxJ`H^OG#kQI3V(M? z9JqT7;>lxy{IT$Sh0s9J(_>NCEket2K;by(ULa1VeUO zucPDP)Mo;g#-s^QZX*0R0cl>;0K+E28lnZdY7wmf{JLaiW~X*V|7p?4k;3Wh_$MwG zA=UU|;FDr(+W|~pi>bWK9MAnqI;#%&Qit@@^~mX6Jqimq00Rur{UBsKp6s-g!m_Uv z@h=HK5rU0C3?YLsl2B|!W1U7gFQw@FMr3`GqE{(8WfCxMGGLhu!|KT}>?Z6doG08M z+$OXz0dXccZ!*!Ydxpfjgz7Tjkn&RKwy zgsX&~2>%d*t#FAEzRS7i>}^FJ8Y>z-*NS{sSmY$O~d+#@8~;F4`aE>DwWA!$BIYi-DHKS^gvx=WJ6?nIIfc8ERgkj9W?CCnr& zC2X^^L7dzHYXYH%1JU^o(Sa7UIG283S{y=;RxX>;T|En66iu0Oc+n7s6>i6mFUVh3GWe( zk?soN4?=hq(4Nqv3f3`INM@nv3xp*U-9pmGRZj36#qSXOs?h{>HKaDxNY|B6Pz{$- zf|Cp{k+hspPtn7KudC6~+!Qo5aSA0PIa84HI*NWkI5q_t+yI>1J&Lz@ z7HCiCOVALWCAbK6gkywno<-K-Qz7-73duxxgYXIA=c!oH?Vkh265f6e{r=~3a1Nh_ zDx^+>)Q3<=Q3px0oWv#5P`Sf|zsM3posvfA?}YVfCv=q*T}aqYI7RrGtU)zM)~*K8 zK{beuClnE^gmS`^8r1DA!pDT;gtLSzHEay+eglRK7w?X_A4&T+W!7xE5Ysc=*=;%$ z{ij1w49G&5TzUjnRBkZflsb=$OUbyCi~&rZ%~Aq8_bnNICfu9OvYg_1xO4+#%^3F) z*ONif^Kh|}bsph;L~%=kO9W2A+y%tia^I67c!rq$NPU%~+@|Lqn}K9~q2siKIl>P; zC$RH{A-y`XYlO;PxskVLqED{82(Q3dKrBHcoa~h*pE(ON<&F^0J0T?LC1_uI37)?S znZ2{dwV93hl-a0nEnz3&bJG1q2!9!9OGqK~CTt}9JqJ0=n+xeHKs@*paZ$cS%AxZx zc&CMrd%qMXe+6;PE68>;;Y*4#^MT~~XvH9*tWPvMNtoFuRsQR%uurJl*$4aa%mwgR zDYWaCJm3(Cu>x#s0d%HKZ?}}&iuJ?jv1HO~Fzh8o3CV z{l;b|x}Y=?<`T9Nj=12{brA~bP8dKKwg@@{VH#nfklcT`^UX!br}z!v)i6txr>M$i$KE=AhkNJ@SaC?X`)VvvKFB4bH^v(BhBbMMqb`!V54 zEox$42E4Kya2{9=W!DuD2N8Z=fnx5F6uSzr6ArIJ3B6WBdW~?JaFYP!`JwQqWGJUlH*}qAsYk*F^54iIoGRhH_4(fne{mG!@s6X~2`>*~B z@CSfeLdZeEZ*cF()PqRc`VdleKZJ@D9zwK87&Evm`^X`9Ejf(%^1~?Toljx@`%~mx zcm&?-jzIV05m>t&Mf7Dt;W6yG_k??c(<1YZ!~4DC@cHuu5PuSAEA)Nx~)AS^uv=hmm;yy7$rADu?@OM?IB zh_?S6QW0VP=jh(%Ou2co*-~kaw;Of(ctB`s8&Af=L{h9tYo5hCbbtv{U;rom5O1uO-d5LN(WDZSi zzVs3-4TP(tR9+SgL*trfUxs28;qYZ-82*j0aA=$Gp5H+60pZ#==;SQn;LxEtrB@L5 z{}vekEzU}t0a*)X?4aRd@%=0C=0-9$yV6RzAu zL+%mUeh)*}pU~p}{DSDXU+FBY@7x7XUJm{S?ZjX_@oy6a_$2_BQ#f4gyKyqwsPF&b zb<3x{IfffGoa4Bbd5}ILd`}2jl#e8R3xKOa!|*ic6IwWB6p`m7MkTn-VJ2zL5-}!_z`O7 zvOTb@CLG!W%MF5ZFQOgxLec`bv7!nGF@?SJ2lehVq<;Z7n`}D?-@sMIGTpg34JiBa zKHz6U%!fdGLRUf_q2fa{qn2>!LlkffV8fAlH##Xywm3?0QutK}&eyh%{|IB?#~6$z zJ>IM6j5h9RXt*PUtHP}OHmUbWY_%UqCG-NQo_OHIF_lHAQ6=}|e$+4hV_=lo#GkC(I+&icgSaA4#VGS!~l6gTf|lJbS(F zs5X;zwrpz9&{Hm}wsx``xq914*Ur1#NPDr?q}Nn= zSx~ym>R9PSa6^r!1YC5?wf zCu}W=3@eef@ouWH+~6N7)gohIFSJQMz84H~FD?2018rL$Uv)`}hKFV~^>wYNWIHKj5*>1k z5Ui!qp+4giSz)vri?DM@E%5&r3$_}3Oknp~3eQ#0QjjbUL1l~&m1>Z)3vgaeR|L}cM2P(kV*AapDop-@6@yx(c=ly z(!}9vAsz#z!{y4UVATp)XRqWc*K^O(ej(M1&3~3vC}irU{tG5YIHlWGk@$W}qtiOH z8k0qRPE5)WztVLnmQGm^jh1$*&jDq%zBw*HcLv;TCJvPjeF>& zo1^OsC)=vC*S0Gu8}AdOISc0}t5P1_V3cB#HrS<|#zuwNrMrNr^qMN9i}u>mL_b&9 ze_4O;;ds^5CRH*Jk|x`WZ5C8Sy7SyIVKb6$F?UQcUMmYu-88n6BCRyBG_OppZ$nEtj^2Re4P_;Y3+P=SROHof zu&oOIM=J~_ZHZkvp(QQVn~Nb4XvLFQG5iXx>N{?(%0^ zIwfZ^4Y`|)W_{zl6B9|6w&>!{5fAuuM%?kavzAPg2N_A7qP;8U)L_!MGw`jrSQERW z8W&^fX_=}i4uiw;5Q~@$7N5d2#pO1P9ZdHRyiWR_P^_)iR!kP@7EA@{Y}!hV-h>xi zSXk1@a^FlBC7Evn#H6s5mpv+>lUB~7j8-i+pGV~Cz|D=_>)3z4I#!F(?67;S()(5$ zU9vHeQLwsM(*Y5B+auabdm24v(zri-lpd`Gvps6C^gFwBF{`FwueL zzqt8HCX8#vEVgCoqx{A0m5xl4yeyNA=!!>}OZ8L{ub!%F<*;!BrQ1HOT=5P|gKx8R zc-G}Lf84v9=O#>&RM=P1!s}B}cSe+@w%lQ{XX?DJ1#Y`|YiB7gw`*|hliVnJYC;(p z$U)lo9_xeTHhnk-Q?itWUX@Xu9+s!kuCd^SY>C%q;Ns`fJ%waYg!z@xPU#-^pyE2K zQ6t_)Ny}|gH}_3e8C~ckRcq3?CN2-FD_ZE(Xidfv^CP>*ZIz5ilPWw@4!fh;YcqW? zI*oSe7T2VaM!{Uw%(ksHUs>u9@HPNPjrd)4tyfS*NM|UZ>88=SRYbtTM zuvAL>Nw`xLmHx17#i@!#sWxNnu}X%i4XrhtLt9*`v5RkuyiTGuQ)0aCtCvk_J;ZBMHQ{=PEz$ih%4?XAzi1Sn z!FW6*gW^hG%|;r%CTL@-#ya~JXrc>WvBiYJ@M$n^KVih=ao_w)?nGV3SFy1jy>?0} zPE2DcHy2A6v1`RDwq+;p%Lx3%H+SOgl-C$EJR9NFWoMsl?Ua0huR(ziJ#Ki^o`(6f zT1=zS>8-f1NjL1q3^AKNfsk89;y?wH8j}=?WthgdJ&H+h}2`i?yh{B_= z61^tF`}TUp)OhbB5EW#trrD;spGY#R#l|?#9YYiido5q zdaqdO4tH9s`%S9Xv>x$XjMwe)gA|^1;4`Z{88%Kyuj3I4EH{}n25qt4cW88alO9)f zNjm}>e~oeExt3nHP^gP1#Y1bqa0MIfd}JYys=g=3#_D^W#Hd8fDvh`R9$^!wj%QAe zb^nxvM!}uXMqgwofPo!=Tn?(^h*QR;Ui{ zL#Cd7`(pP#+naDm7E6&l6mwl)#;Tw2^)(pHMtiBuXT2IsYLm2uz9^OhOnb7{dCM#7HHuqWH zQ z>M70H_`^|J{+`b4isF1uNFE!`n7Ck7`K~m2YS*~0NbUeB;|knriqAe8J?^iniH#$I zNN2JK*i&@%M8;&qO;ZW(MWheC+~#8X5wA35lZ3c?ci_2<4#qwHMjgI0{uTgyNC6%;M!kaG@dey-|=S3TyJ!8kV;V~Aj_mZA* z)fL|gX~eTLa>Uh6oDP!HurPCWoJKl~rYU7woEgN2jSsQt z^rA(24XeaQb|}Ko_;fn>FHREd? zsqhZWh0w`*)YT#h`bO7m?em86!{O6)E$0Ge0Qyel>@Ihav}Lwh`oQP+ea3}X0| z_@DTPh;kwnC+D?G4`Ng`p_H|HU?{VJ=W7>0Ht>q1oTOA}luyZ-3w%}&q3iB!XR;C= zNvZRjBdFcXtGlKSMAk|M$ZAkf6%<<(j4IxrnTbpmE?6*o!AgGHgbDm4K6s)(S~Ew9 zK)tju2QGYKyqr-&P^Zh8tY`)Eo^oVxAd+YMF}3E+e9;DVo{X7k<`;`~Ht>Umo4bQT zp`%`rBg|MNuzO;ii#W7~W6V51L4hwfRmu3lvivs7D6fYzIqbOWfy{!1sLf7uM~KRS z_-|1VN>G8yMS)C4U?5{CGQ29fCF-OUmLGm%_X zQlZif7{S4*DSP;ByfTUJxTQIxvO+b6AIw*DoQPO94KYJFfRRg_Psjr@4umm#_zAok zq0*`lW`CL)JrNz1OkIvjWI#|dh^S^Y6Hb5H$63{kQDN37(^2d~bux$=fl>JF@5Nw- z&*j$^rKa$OW6-mosBdE?kbPox^yvDko_zKMym=NyMKjiH2L5jj>kU_CscT4g%#OKV~5xoTQvZ zvW(Pn1WGFgmgg1O2r_PC2&eI5)H@I+)&P7|U^MiL(6>CVj1Fhi(O4Z=4#z_n%&sDJ zRS2qOhL9c1ICw;3kEhtEh-Z;>;JRrv3?jH%7&70u+%wryLCNp5b!2`fpX zNRMVz$Hj6I@k59`i}{)Aq`|h@%@{LO11e<$Lq)6ZCNk)rB0lkYBBSh;$jsyO`TWKF zo++VICYjN|j_HYvYKvM}arCVg%hiku$7_D=m@$S#2+HtQb>ok94$h87%c-@A)Kor- z+M1Y+35}nKC>vxH{nd60bP0>ccOCxNNzw|8hc7HrCM&KO~=t zk)2&TtpXXLqYD#LrkUNbUj9PRHwlq&Qet&29w8 zE%;Z+xH&7y%;&4OaN>9sMlE;Oi$@I>>|D$zH*4zz(?NF%waUE~hs*x*Gwc6Twv)-HyOC%!(+9k;qe zRYQx=s9(gn z<9Y5-9_cpF_vacry#riq|PDzd`~zKJwS2nvtsxK#*X6HPo1KWjFBM)*0~sBzKJ1rQZd9b z5W{3oco8E+{_8!V)g7wtdU|k{JLLJ`Ku@0px|=9(z%-?lha%z<8n{^ zN*<<#d6SEQXP=vQ)afDGJ!Ru~mvG-&7{yhHtx#0(S=8My z$>)1QY9!*Rfu48+>VvonJD{jHDb~9_evDnz0Xv%FDI~;xCWhF}#1NaA7}B&NdtUv_ zEOuiUJI9rg%Z>_lS6l45;4kW5%VnprK{RyuQ#I7b4rE8N!Bkc3nd}%{ef1#rvaD+Z zLnl_xU#hNMl3~N7Nqpg?j>nbooWkRZ@A*H^j$4F%K^5Js{*|F@DI0^XvsKU^&LLwc z%$iS!8a~%`DUXeH-Ogj15kg%DN3gA26Nj^PTym@W$UHWRbNw=kO_XJ&`_=c!X9Hvb zHDZtFy0(sBqg|z=*m3@^@xgfk^#@0>!>R^W+eZ&&^p1j3OSwsxPv7I~5zQAr+Ykl% zhg$mL=?1<|fR>)&>%8?tEOv*h(@}Pif+X<R~i2EtB?8Be|K(@qx(=)wm%3B<)4SV3DO^|o z-en5^6W0Da3iYpk5+~Xt`ktlm{hb>gqj39`&@2i^NBb)%ym`Ya#&5h3af#x4k1qLz z!WoaVffRn58}}uJJ-=Fa3ZZ|`KJ|$i^@DrJ^=H@+*OnFmdUufK>K_r11-W_0fH>EZ zh=AUW^4}2w&o|1okpW#ia{aByfP@G(q#g-!StyZLn(M_*VkRWl|IjI5bO?=k?-l{E zuKKoIRDET)fMb!|U9NuM(14$Yxl(EauGZ%)4fu%-P)3L~b3L;(poKhAtiD^05}W9j zTlS>xbIZ|U7r5mZv0L1-O6*Fv94mI4TW;0!Cv>G-ZY_4NTULu*?v~?v(m=Z9c=w=* P^+^y1^1WpNtBe01GS$XB delta 17102 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 a?(s0E@yE>`4_VP`v&YTG7i&G17XLpoNIR(j diff --git a/templates/cpp/static/Main.cpp b/templates/cpp/static/Main.cpp index 8a7a36efd..5a92451a7 100644 --- a/templates/cpp/static/Main.cpp +++ b/templates/cpp/static/Main.cpp @@ -8,7 +8,7 @@ extern "C" const char *hxRunLibrary (); extern "C" void hxcpp_set_top_of_stack (); ::foreach ndlls::::if (registerStatics):: -extern "C" int ::name::_register_prims ();::end::::end:: +extern "C" int ::nameSafe::_register_prims ();::end::::end:: #ifdef HX_WINDOWS @@ -20,7 +20,7 @@ extern "C" int main(int argc, char *argv[]) { hxcpp_set_top_of_stack (); ::foreach ndlls::::if (registerStatics):: - ::name::_register_prims ();::end::::end:: + ::nameSafe::_register_prims ();::end::::end:: const char *err = NULL; err = hxRunLibrary (); diff --git a/templates/emscripten/cpp/Main.cpp b/templates/emscripten/cpp/Main.cpp index 1ba99afcb..1405524c5 100644 --- a/templates/emscripten/cpp/Main.cpp +++ b/templates/emscripten/cpp/Main.cpp @@ -12,7 +12,7 @@ extern "C" void hxcpp_set_top_of_stack (); extern "C" int zlib_register_prims (); extern "C" int lime_openal_register_prims (); -::foreach ndlls::::if (registerStatics)::extern "C" int ::name::_register_prims ();::end:: +::foreach ndlls::::if (registerStatics)::extern "C" int ::nameSafe::_register_prims ();::end:: ::end:: @@ -22,7 +22,7 @@ extern "C" int main (int argc, char *argv[]) { zlib_register_prims (); lime_openal_register_prims (); - ::foreach ndlls::::if (registerStatics)::::name::_register_prims ();::end:: + ::foreach ndlls::::if (registerStatics)::::nameSafe::_register_prims ();::end:: ::end:: const char *err = NULL; diff --git a/templates/iphone/PROJ/Classes/Main.mm b/templates/iphone/PROJ/Classes/Main.mm index cc8c03810..4b4b265dd 100644 --- a/templates/iphone/PROJ/Classes/Main.mm +++ b/templates/iphone/PROJ/Classes/Main.mm @@ -12,7 +12,7 @@ extern "C" void hxcpp_set_top_of_stack (); extern "C" int zlib_register_prims (); extern "C" int lime_openal_register_prims (); -::foreach ndlls::::if (registerStatics)::extern "C" int ::name::_register_prims ();::end:: +::foreach ndlls::::if (registerStatics)::extern "C" int ::nameSafe::_register_prims ();::end:: ::end:: @@ -22,7 +22,7 @@ extern "C" int SDL_main (int argc, char *argv[]) { zlib_register_prims (); lime_openal_register_prims (); - ::foreach ndlls::::if (registerStatics)::::name::_register_prims ();::end:: + ::foreach ndlls::::if (registerStatics)::::nameSafe::_register_prims ();::end:: ::end:: const char *err = NULL;