Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dave Griffiths
jellyfish
Commits
65f8cbe2
Commit
65f8cbe2
authored
Feb 11, 2015
by
Dave Griffiths
Browse files
linux fixes
parent
4a89ae67
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
113 additions
and
107 deletions
+113
-107
configure
configure
+94
-100
configure.ac
configure.ac
+0
-1
src/rpi/graphics.cpp
src/rpi/graphics.cpp
+6
-1
src/rpi/graphics.h
src/rpi/graphics.h
+4
-0
src/rpi/input.cpp
src/rpi/input.cpp
+5
-2
src/rpi/input.h
src/rpi/input.h
+4
-3
No files found.
configure
View file @
65f8cbe2
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.6
9
for jellyfish version-0.1.
# Generated by GNU Autoconf 2.6
8
for jellyfish version-0.1.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
# Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
...
...
@@ -132,31 +134,6 @@ export LANGUAGE
# CDPATH.
(
unset
CDPATH
)
>
/dev/null 2>&1
&&
unset
CDPATH
# Use a proper internal environment variable to ensure we don't fall
# into an infinite loop, continuously re-executing ourselves.
if
test
x
"
${
_as_can_reexec
}
"
!=
xno
&&
test
"x
$CONFIG_SHELL
"
!=
x
;
then
_as_can_reexec
=
no
;
export
_as_can_reexec
;
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
# Preserve -v and -x to the replacement shell.
BASH_ENV
=
/dev/null
ENV
=
/dev/null
(
unset
BASH_ENV
)
>
/dev/null 2>&1
&&
unset
BASH_ENV ENV
case
$-
in
# ((((
*
v
*
x
*
|
*
x
*
v
*
)
as_opts
=
-vx
;;
*
v
*
)
as_opts
=
-v
;;
*
x
*
)
as_opts
=
-x
;;
*
)
as_opts
=
;;
esac
exec
$CONFIG_SHELL
$as_opts
"
$as_myself
"
${
1
+
"
$@
"
}
# Admittedly, this is quite paranoid, since all the known shells bail
# out after a failed `exec'.
$as_echo
"
$0
: could not re-execute with
$CONFIG_SHELL
"
>
&2
as_fn_exit 255
fi
# We don't want this to propagate to other subprocesses.
{
_as_can_reexec
=
;
unset
_as_can_reexec
;
}
if
test
"x
$CONFIG_SHELL
"
=
x
;
then
as_bourne_compatible
=
"if test -n
\"\$
{ZSH_VERSION+set}
\"
&& (emulate sh) >/dev/null 2>&1; then :
emulate sh
...
...
@@ -190,8 +167,7 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
test x
\$
exitcode = x0 || exit 1
test -x / || exit 1"
test x
\$
exitcode = x0 || exit 1"
as_suggested
=
" as_lineno_1="
;
as_suggested
=
$as_suggested$LINENO
;
as_suggested
=
$as_suggested
" as_lineno_1a=
\$
LINENO
as_lineno_2="
;
as_suggested
=
$as_suggested$LINENO
;
as_suggested
=
$as_suggested
" as_lineno_2a=
\$
LINENO
eval 'test
\"
x
\$
as_lineno_1'
\$
as_run'
\"
!=
\"
x
\$
as_lineno_2'
\$
as_run'
\"
&&
...
...
@@ -236,25 +212,21 @@ IFS=$as_save_IFS
if
test
"x
$CONFIG_SHELL
"
!=
x
;
then
:
export
CONFIG_SHELL
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
# Preserve -v and -x to the replacement shell.
BASH_ENV
=
/dev/null
ENV
=
/dev/null
(
unset
BASH_ENV
)
>
/dev/null 2>&1
&&
unset
BASH_ENV ENV
case
$-
in
# ((((
*
v
*
x
*
|
*
x
*
v
*
)
as_opts
=
-vx
;;
*
v
*
)
as_opts
=
-v
;;
*
x
*
)
as_opts
=
-x
;;
*
)
as_opts
=
;;
esac
exec
$CONFIG_SHELL
$as_opts
"
$as_myself
"
${
1
+
"
$@
"
}
# Admittedly, this is quite paranoid, since all the known shells bail
# out after a failed `exec'.
$as_echo
"
$0
: could not re-execute with
$CONFIG_SHELL
"
>
&2
exit
255
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
# Preserve -v and -x to the replacement shell.
BASH_ENV
=
/dev/null
ENV
=
/dev/null
(
unset
BASH_ENV
)
>
/dev/null 2>&1
&&
unset
BASH_ENV ENV
export
CONFIG_SHELL
case
$-
in
# ((((
*
v
*
x
*
|
*
x
*
v
*
)
as_opts
=
-vx
;;
*
v
*
)
as_opts
=
-v
;;
*
x
*
)
as_opts
=
-x
;;
*
)
as_opts
=
;;
esac
exec
"
$CONFIG_SHELL
"
$as_opts
"
$as_myself
"
${
1
+
"
$@
"
}
fi
if
test
x
$as_have_required
=
xno
;
then
:
...
...
@@ -356,14 +328,6 @@ $as_echo X"$as_dir" |
}
# as_fn_mkdir_p
# as_fn_executable_p FILE
# -----------------------
# Test if FILE is an executable regular file.
as_fn_executable_p
()
{
test
-f
"
$1
"
&&
test
-x
"
$1
"
}
# as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
...
...
@@ -485,10 +449,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod
+x
"
$as_me
.lineno"
||
{
$as_echo
"
$as_me
: error: cannot create
$as_me
.lineno; rerun with a POSIX shell"
>
&2
;
as_fn_exit 1
;
}
# If we had to re-execute with $CONFIG_SHELL, we're ensured to have
# already done that, so ensure we don't try to do so again and fall
# in an infinite loop. This has already happened in practice.
_as_can_reexec
=
no
;
export
_as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
...
...
@@ -523,16 +483,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
# In both cases, we have to default to `cp -p
R
'.
# In both cases, we have to default to `cp -p'.
ln
-s
conf
$$
.file conf
$$
.dir 2>/dev/null
&&
test
!
-f
conf
$$
.exe
||
as_ln_s
=
'cp -p
R
'
as_ln_s
=
'cp -p'
elif
ln
conf
$$
.file conf
$$
2>/dev/null
;
then
as_ln_s
=
ln
else
as_ln_s
=
'cp -p
R
'
as_ln_s
=
'cp -p'
fi
else
as_ln_s
=
'cp -p
R
'
as_ln_s
=
'cp -p'
fi
rm
-f
conf
$$
conf
$$
.exe conf
$$
.dir/conf
$$
.file conf
$$
.file
rmdir
conf
$$
.dir 2>/dev/null
...
...
@@ -544,8 +504,28 @@ else
as_mkdir_p
=
false
fi
as_test_x
=
'test -x'
as_executable_p
=
as_fn_executable_p
if
test
-x
/
>
/dev/null 2>&1
;
then
as_test_x
=
'test -x'
else
if
ls
-dL
/
>
/dev/null 2>&1
;
then
as_ls_L_option
=
L
else
as_ls_L_option
=
fi
as_test_x
=
'
eval sh -c '
\'
'
if test -d "$1"; then
test -d "$1/.";
else
case $1 in #(
-*)set "./$1";;
esac;
case `ls -ld'
$as_ls_L_option
' "$1" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'
\'
' sh
'
fi
as_executable_p
=
$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp
=
"eval sed 'y%*
$as_cr_letters
%P
$as_cr_LETTERS
%;s%[^_
$as_cr_alnum
]%_%g'"
...
...
@@ -1142,6 +1122,8 @@ target=$target_alias
if
test
"x
$host_alias
"
!=
x
;
then
if
test
"x
$build_alias
"
=
x
;
then
cross_compiling
=
maybe
$as_echo
"
$as_me
: WARNING: if you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used"
>
&2
elif
test
"x
$build_alias
"
!=
"x
$host_alias
"
;
then
cross_compiling
=
yes
fi
...
...
@@ -1371,9 +1353,9 @@ test -n "$ac_init_help" && exit $ac_status
if
$ac_init_version
;
then
cat
<<
\
_ACEOF
jellyfish configure version-0.1
generated by GNU Autoconf 2.6
9
generated by GNU Autoconf 2.6
8
Copyright (C) 201
2
Free Software Foundation, Inc.
Copyright (C) 201
0
Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
...
...
@@ -1449,7 +1431,7 @@ $as_echo "$ac_try_echo"; } >&5
test
!
-s
conftest.err
}
&&
test
-s
conftest
$ac_exeext
&&
{
test
"
$cross_compiling
"
=
yes
||
test
-
x
conftest
$ac_exeext
$as_
test
_
x
conftest
$ac_exeext
}
;
then
:
ac_retval
=
0
else
...
...
@@ -1707,7 +1689,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by jellyfish
$as_me
version-0.1, which was
generated by GNU Autoconf 2.6
9
. Invocation command line was
generated by GNU Autoconf 2.6
8
. Invocation command line was
$ $0
$@
...
...
@@ -2076,7 +2058,7 @@ do
IFS
=
$as_save_IFS
test
-z
"
$as_dir
"
&&
as_dir
=
.
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
if
as_fn_executable_p
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
then
if
{
test
-f
"
$as_dir
/
$ac_word$ac_exec_ext
"
&&
$as_test_x
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
}
;
then
ac_cv_prog_CC
=
"
${
ac_tool_prefix
}
gcc"
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: found
$as_dir
/
$ac_word$ac_exec_ext
"
>
&5
break
2
...
...
@@ -2116,7 +2098,7 @@ do
IFS
=
$as_save_IFS
test
-z
"
$as_dir
"
&&
as_dir
=
.
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
if
as_fn_executable_p
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
then
if
{
test
-f
"
$as_dir
/
$ac_word$ac_exec_ext
"
&&
$as_test_x
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
}
;
then
ac_cv_prog_ac_ct_CC
=
"gcc"
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: found
$as_dir
/
$ac_word$ac_exec_ext
"
>
&5
break
2
...
...
@@ -2169,7 +2151,7 @@ do
IFS
=
$as_save_IFS
test
-z
"
$as_dir
"
&&
as_dir
=
.
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
if
as_fn_executable_p
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
then
if
{
test
-f
"
$as_dir
/
$ac_word$ac_exec_ext
"
&&
$as_test_x
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
}
;
then
ac_cv_prog_CC
=
"
${
ac_tool_prefix
}
cc"
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: found
$as_dir
/
$ac_word$ac_exec_ext
"
>
&5
break
2
...
...
@@ -2210,7 +2192,7 @@ do
IFS
=
$as_save_IFS
test
-z
"
$as_dir
"
&&
as_dir
=
.
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
if
as_fn_executable_p
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
then
if
{
test
-f
"
$as_dir
/
$ac_word$ac_exec_ext
"
&&
$as_test_x
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
}
;
then
if
test
"
$as_dir
/
$ac_word$ac_exec_ext
"
=
"/usr/ucb/cc"
;
then
ac_prog_rejected
=
yes
continue
...
...
@@ -2268,7 +2250,7 @@ do
IFS
=
$as_save_IFS
test
-z
"
$as_dir
"
&&
as_dir
=
.
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
if
as_fn_executable_p
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
then
if
{
test
-f
"
$as_dir
/
$ac_word$ac_exec_ext
"
&&
$as_test_x
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
}
;
then
ac_cv_prog_CC
=
"
$ac_tool_prefix$ac_prog
"
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: found
$as_dir
/
$ac_word$ac_exec_ext
"
>
&5
break
2
...
...
@@ -2312,7 +2294,7 @@ do
IFS
=
$as_save_IFS
test
-z
"
$as_dir
"
&&
as_dir
=
.
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
if
as_fn_executable_p
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
then
if
{
test
-f
"
$as_dir
/
$ac_word$ac_exec_ext
"
&&
$as_test_x
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
}
;
then
ac_cv_prog_ac_ct_CC
=
"
$ac_prog
"
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: found
$as_dir
/
$ac_word$ac_exec_ext
"
>
&5
break
2
...
...
@@ -2758,7 +2740,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
struct stat;
#include <sys/types.h>
#include <sys/stat.h>
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
...
...
@@ -2845,7 +2828,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CFLAGS
=
"
$CFLAGS
-I/opt/vc/include/"
LDFLAGS
=
"
$LDFLAGS
-L/opt/vc/lib"
LIBS
=
"
$LIBS
-lvcos -lvchiq_arm"
{
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: checking for bcm_host_init in -lbcm_host"
>
&5
$as_echo_n
"checking for bcm_host_init in -lbcm_host... "
>
&6
;
}
...
...
@@ -3401,7 +3383,7 @@ do
IFS
=
$as_save_IFS
test
-z
"
$as_dir
"
&&
as_dir
=
.
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
if
as_fn_executable_p
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
then
if
{
test
-f
"
$as_dir
/
$ac_word$ac_exec_ext
"
&&
$as_test_x
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
}
;
then
ac_cv_prog_CXX
=
"
$ac_tool_prefix$ac_prog
"
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: found
$as_dir
/
$ac_word$ac_exec_ext
"
>
&5
break
2
...
...
@@ -3445,7 +3427,7 @@ do
IFS
=
$as_save_IFS
test
-z
"
$as_dir
"
&&
as_dir
=
.
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
if
as_fn_executable_p
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
then
if
{
test
-f
"
$as_dir
/
$ac_word$ac_exec_ext
"
&&
$as_test_x
"
$as_dir
/
$ac_word$ac_exec_ext
"
;
}
;
then
ac_cv_prog_ac_ct_CXX
=
"
$ac_prog
"
$as_echo
"
$as_me
:
${
as_lineno
-
$LINENO
}
: found
$as_dir
/
$ac_word$ac_exec_ext
"
>
&5
break
2
...
...
@@ -3787,7 +3769,7 @@ do
for
ac_prog
in
grep
ggrep
;
do
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
ac_path_GREP
=
"
$as_dir
/
$ac_prog$ac_exec_ext
"
as_fn_executable_p
"
$ac_path_GREP
"
||
continue
{
test
-f
"
$ac_path_GREP
"
&&
$as_test_x
"
$ac_path_GREP
"
;
}
||
continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case
`
"
$ac_path_GREP
"
--version
2>&1
`
in
...
...
@@ -3853,7 +3835,7 @@ do
for
ac_prog
in
egrep
;
do
for
ac_exec_ext
in
''
$ac_executable_extensions
;
do
ac_path_EGREP
=
"
$as_dir
/
$ac_prog$ac_exec_ext
"
as_fn_executable_p
"
$ac_path_EGREP
"
||
continue
{
test
-f
"
$ac_path_EGREP
"
&&
$as_test_x
"
$ac_path_EGREP
"
;
}
||
continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case
`
"
$ac_path_EGREP
"
--version
2>&1
`
in
...
...
@@ -4454,16 +4436,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
# In both cases, we have to default to `cp -p
R
'.
# In both cases, we have to default to `cp -p'.
ln -s conf
$$
.file conf
$$
.dir 2>/dev/null && test ! -f conf
$$
.exe ||
as_ln_s='cp -p
R
'
as_ln_s='cp -p'
elif ln conf
$$
.file conf
$$
2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p
R
'
as_ln_s='cp -p'
fi
else
as_ln_s='cp -p
R
'
as_ln_s='cp -p'
fi
rm -f conf
$$
conf
$$
.exe conf
$$
.dir/conf
$$
.file conf
$$
.file
rmdir conf
$$
.dir 2>/dev/null
...
...
@@ -4523,16 +4505,28 @@ else
as_mkdir_p=false
fi
# as_fn_executable_p FILE
# -----------------------
# Test if FILE is an executable regular file.
as_fn_executable_p ()
{
test -f "
$1
" && test -x "
$1
"
} # as_fn_executable_p
as_test_x='test -x'
as_executable_p=as_fn_executable_p
if test -x / >/dev/null 2>&1; then
as_test_x='test -x'
else
if ls -dL / >/dev/null 2>&1; then
as_ls_L_option=L
else
as_ls_L_option=
fi
as_test_x='
eval sh -c '
\'
'
if test -d "
$1
"; then
test -d "
$1
/.";
else
case
$1
in #(
-*)set "./
$1
";;
esac;
case `ls -ld'
$as_ls_L_option
' "
$1
" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'
\'
' sh
'
fi
as_executable_p=
$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*
$as_cr_letters
%P
$as_cr_LETTERS
%;s%[^_
$as_cr_alnum
]%_%g'"
...
...
@@ -4554,7 +4548,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by jellyfish
$as_me
version-0.1, which was
generated by GNU Autoconf 2.6
9
. Invocation command line was
generated by GNU Autoconf 2.6
8
. Invocation command line was
CONFIG_FILES =
$CONFIG_FILES
CONFIG_HEADERS =
$CONFIG_HEADERS
...
...
@@ -4616,10 +4610,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`
$as_echo
"
$ac_configure_args
" | sed 's/^ //; s/[
\\
""
\`\$
]/
\\\\
&/g'`"
ac_cs_version="
\\
jellyfish config.status version-0.1
configured by
$0
, generated by GNU Autoconf 2.6
9
,
configured by
$0
, generated by GNU Autoconf 2.6
8
,
with options
\\
"
\$
ac_cs_config
\\
"
Copyright (C) 201
2
Free Software Foundation, Inc.
Copyright (C) 201
0
Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
...
...
@@ -4707,7 +4701,7 @@ fi
_ACEOF
cat
>>
$CONFIG_STATUS
<<
_ACEOF
|| ac_write_fail=1
if
\$
ac_cs_recheck; then
set X
$SHELL
'
$0
'
$ac_configure_args
\$
ac_configure_extra_args --no-create --no-recursion
set X
'
$SHELL
'
'
$0
'
$ac_configure_args
\$
ac_configure_extra_args --no-create --no-recursion
shift
\$
as_echo "running CONFIG_SHELL=
$SHELL
\$
*" >&6
CONFIG_SHELL='
$SHELL
'
...
...
configure.ac
View file @
65f8cbe2
...
...
@@ -4,7 +4,6 @@ CFLAGS="$CFLAGS -I/opt/vc/include/"
LDFLAGS="$LDFLAGS -L/opt/vc/lib"
dnl FIXME: EGL of RPi depends on GLESv1 or GLESv2
dnl FIXME: GLESv2 of RPi depends on EGL... WTF!
LIBS="$LIBS -lvcos -lvchiq_arm"
AC_CHECK_LIB([bcm_host], [bcm_host_init], [
CFLAGS="$CFLAGS -DFLX_RPI -I/opt/vc/include/interface/vcos/pthreads/ -I/opt/vc/include/interface/vmcs_host/linux/"
...
...
src/rpi/graphics.cpp
View file @
65f8cbe2
#include "bcm_host.h"
#include "graphics.h"
#include <assert.h>
#ifdef FLX_RPI
#include "bcm_host.h"
void
init_ogl_rpi
(
RPI_STATE_T
*
state
)
{
int32_t
success
=
0
;
...
...
@@ -87,3 +90,5 @@ void init_ogl_rpi(RPI_STATE_T *state)
// Enable back face culling.
glEnable(GL_CULL_FACE); */
}
#endif
src/rpi/graphics.h
View file @
65f8cbe2
#include "engine/importgl.h"
#ifdef FLX_RPI
typedef
struct
{
uint32_t
screen_width
;
...
...
@@ -14,3 +16,5 @@ static volatile int terminate_prog;
static
RPI_STATE_T
_state
,
*
state
=&
_state
;
void
init_ogl_rpi
(
RPI_STATE_T
*
state
);
#endif
src/rpi/input.cpp
View file @
65f8cbe2
#ifdef FLX_RPI
// code adapted from https://github.com/chriscamacho/gles2framework
...
...
@@ -32,7 +33,7 @@ void restoreKbd() {
}
}
void
doEvents
(
int
__display_width
,
int
__display_height
,
void
doEvents
(
int
__display_width
,
int
__display_height
,
void
(
*
KeyDownCallback
)(
unsigned
char
,
int
,
int
),
void
(
*
KeyUpCallback
)(
unsigned
char
,
int
,
int
))
{
...
...
@@ -62,7 +63,7 @@ void doEvents(int __display_width, int __display_height,
//printf(" %i %i %i\n",ev.type,ev.code,ev.value);
// should probably handle MSC and SYN as well - meh
if
(
ev
.
type
==
EV_KEY
)
{
if
(
ev
.
value
==
1
)
{
//printf("%d\n",lc_map[ev.code]);
KeyDownCallback
(
lc_map
[
ev
.
code
&
0xff
],
0
,
0
);
...
...
@@ -192,3 +193,5 @@ void getKeys()
}
}
#endif
src/rpi/input.h
View file @
65f8cbe2
// https://github.com/chriscamacho/gles2framework
void
doEvents
(
int
__display_width
,
int
__display_height
,
#ifdef FLX_RPI
void
doEvents
(
int
__display_width
,
int
__display_height
,
void
(
*
KeyDownCallback
)(
unsigned
char
,
int
,
int
),
void
(
*
KeyUpCallback
)(
unsigned
char
,
int
,
int
));
...
...
@@ -8,5 +10,4 @@ int *getMouse();
void
getKeys
();
void
setMouseRelative
(
bool
mode
);
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment