From b66cf0967b0960801adfc352e9618595f82a6f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Tue, 16 Sep 2014 18:00:12 -0300 Subject: [PATCH 1/2] (qb) Always set CG_LIBS --- qb/config.libs.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qb/config.libs.sh b/qb/config.libs.sh index e4dcd402a5..7db8974602 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -218,6 +218,9 @@ if [ "$HAVE_OPENGL" != 'no' ] && [ "$HAVE_GLES" != 'yes' ]; then check_lib_cxx CG -lCg cgCreateContext [ "$HAVE_CG" = 'yes' ] && CG_LIBS='-lCg -lCgGL' fi + + # fix undefined variables + PKG_CONF_USED+=CG else echo "Ignoring Cg. Desktop OpenGL is not enabled." HAVE_CG='no' From 25b09cdc78789d524e495617bd288ee4029e7ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Tue, 16 Sep 2014 18:01:24 -0300 Subject: [PATCH 2/2] Fix typedef redefinition --- frontend/frontend_context.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/frontend_context.h b/frontend/frontend_context.h index 4f2e0aa3e4..3ebe895ff7 100644 --- a/frontend/frontend_context.h +++ b/frontend/frontend_context.h @@ -51,9 +51,6 @@ typedef void (*environment_get_t)(int *argc, char *argv[], void *args, void *params_data); typedef void (*process_args_t)(int *argc, char *argv[]); -/* avoid cyclic reference */ -typedef struct video_driver video_driver_t; - typedef struct frontend_ctx_driver { environment_get_t environment_get; @@ -70,7 +67,7 @@ typedef struct frontend_ctx_driver const char *ident; - const video_driver_t *(*get_video_driver)(void); + const struct video_driver *(*get_video_driver)(void); } frontend_ctx_driver_t; extern const frontend_ctx_driver_t frontend_ctx_gx;