diff options
| author | Dan Gudmundsson <[email protected]> | 2010-10-11 11:00:38 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2010-11-15 10:13:07 +0100 |
| commit | 8577598667bff43f503f3cae87934c3e9918d135 (patch) | |
| tree | 7769951ae687f9c266ee938f0df221e291699529 /lib/wx/api_gen | |
| parent | ac433c8318566261a74ffe7fd0824fb99610bed3 (diff) | |
| download | otp-8577598667bff43f503f3cae87934c3e9918d135.tar.gz otp-8577598667bff43f503f3cae87934c3e9918d135.tar.bz2 otp-8577598667bff43f503f3cae87934c3e9918d135.zip | |
Windows and Mac build issues
Diffstat (limited to 'lib/wx/api_gen')
| -rw-r--r-- | lib/wx/api_gen/gl_gen_c.erl | 8 | ||||
| -rw-r--r-- | lib/wx/api_gen/gl_gen_erl.erl | 4 | ||||
| -rw-r--r-- | lib/wx/api_gen/wxapi.conf | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/wx/api_gen/gl_gen_c.erl b/lib/wx/api_gen/gl_gen_c.erl index 99dd2e58ea..2fe3226978 100644 --- a/lib/wx/api_gen/gl_gen_c.erl +++ b/lib/wx/api_gen/gl_gen_c.erl @@ -304,7 +304,7 @@ build_return_vals(Type,As) -> true -> w(" int AP = 0; ErlDrvTermData rt[6];~n",[]), w(" rt[AP++]=ERL_DRV_ATOM;" - " rt[AP++]=driver_mk_atom((char *) \"_wxe_result_\");~n",[]), + " rt[AP++]=driver_mk_atom((char *) \"_egl_result_\");~n",[]), w(" rt[AP++]=ERL_DRV_ATOM;" " rt[AP++]=driver_mk_atom((char *) \"ok\");~n",[]), w(" rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;~n",[]), @@ -324,7 +324,7 @@ build_return_vals(Type,As) -> "driver_alloc(sizeof(ErlDrvTermData)*(~s));~n", [Sz]), Sz end, - w(" rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) \"_wxe_result_\");~n",[]), + w(" rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) \"_egl_result_\");~n",[]), FreeList = build_ret_types(Type,As), case Cnt of 1 -> ok; @@ -332,8 +332,8 @@ build_return_vals(Type,As) -> w(" rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = ~p;~n",[Cnt]) end, w(" rt[AP++] = ERL_DRV_TUPLE; rt[AP++] = 2;~n",[]), - w(" if (AP != ~s ) fprintf(stderr, \"%d: ERROR AP mismatch %d %d\\r\\n\",__LINE__,AP,~s);~n", - [CSize,CSize]), + %%w(" if (AP != ~s ) fprintf(stderr, \"%d: ERROR AP mismatch %d %d\\r\\n\",__LINE__,AP,~s);~n", + %% [CSize,CSize]), w(" driver_send_term(port,caller,rt,AP);~n",[]), case Vars of none -> ignore; diff --git a/lib/wx/api_gen/gl_gen_erl.erl b/lib/wx/api_gen/gl_gen_erl.erl index 8e712b6739..1dbec5d229 100644 --- a/lib/wx/api_gen/gl_gen_erl.erl +++ b/lib/wx/api_gen/gl_gen_erl.erl @@ -122,8 +122,8 @@ gl_api(Fs) -> w("rec() ->~n", []), w(" receive ~n", []), w(" {'_egl_result_', Res} -> Res;~n", []), - w(" {'_egl_error_', Res} -> error({error,Res})~n", []), - w(" end.~n", []), + w(" {'_egl_error_', Op, Res} -> error({error,Res,Op})~n", []), + w(" end. ~n", []), w("~n", []), w("%% @hidden~n", []), w("send_bin(Bin) when is_binary(Bin) ->~n", []), diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf index 14f5f7e267..63b136e075 100644 --- a/lib/wx/api_gen/wxapi.conf +++ b/lib/wx/api_gen/wxapi.conf @@ -1147,7 +1147,7 @@ {class, wxGLCanvas, wxWindow, [{skip, [{'SetCurrent', 2}]}], %% NA MAC [{'wxGLCanvas', [{"attribList", [in, {single,array}]}, - {pre_hook, {erl, "wxe_master:init_opengl(),"}}]}, + {pre_hook, {erl, "{ok, _} = wxe_master:init_opengl(),"}}]}, 'GetContext', {'SetCurrent', [{post_hook,{c, "if(This->GetContext()) setActiveGL(Ecmd.caller,This)"}}]}, %%{'SetColour', [{"colour", [in, {single,array}]}]}, |