Fix dl on windows
This commit is contained in:
parent
abb126c400
commit
887dc7ff8d
@ -52,7 +52,7 @@ function log_fatal()
|
|||||||
$fatal = [E_ERROR, E_PARSE, E_RECOVERABLE_ERROR];
|
$fatal = [E_ERROR, E_PARSE, E_RECOVERABLE_ERROR];
|
||||||
|
|
||||||
// Log error.
|
// Log error.
|
||||||
if(in_array($error['type'], $fatal))
|
//if(in_array($error['type'], $fatal))
|
||||||
{
|
{
|
||||||
file_put_contents('errors.txt', print_r($error, TRUE), FILE_APPEND);
|
file_put_contents('errors.txt', print_r($error, TRUE), FILE_APPEND);
|
||||||
}
|
}
|
||||||
@ -66,12 +66,19 @@ register_shutdown_function('OpenSQLManager\log_fatal');
|
|||||||
if ( ! class_exists('wxApp'))
|
if ( ! class_exists('wxApp'))
|
||||||
{
|
{
|
||||||
// Try to load wxphp if possible
|
// Try to load wxphp if possible
|
||||||
if (function_exists('dl') && in_array(php_sapi_name(), ['cli', 'embed']))
|
// Windows is special
|
||||||
|
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
|
||||||
{
|
{
|
||||||
$name = 'wxwidgets.'.PHP_SHLIB_SUFFIX;
|
$name = 'php_wxwidgets.dll';
|
||||||
dl($name);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
$name .= 'wxwidgets.'.PHP_SHLIB_SUFFIX;
|
||||||
|
}
|
||||||
|
|
||||||
|
$res = dl($name);
|
||||||
|
|
||||||
|
if ( ! $res)
|
||||||
{
|
{
|
||||||
trigger_error("wxPHP not found. Please load the wxPHP extension in your php.ini", E_USER_ERROR);
|
trigger_error("wxPHP not found. Please load the wxPHP extension in your php.ini", E_USER_ERROR);
|
||||||
die();
|
die();
|
||||||
|
Reference in New Issue
Block a user