Re: [AD] Teaching CMake to generate files

[ Thread Index | Date Index | More lists.liballeg.org/allegro-developers Archives ]


On Thu, 12 Jul 2012 21:09:41 +0200, Tobias Hansen <tobias.han@xxxxxxxxxx> wrote:
> 
> http://anonscm.debian.org/gitweb/?p=pkg-games/allegro5.git;a=tree;f=debian/patches;hb=HEAD
> 
> [1] fix-python-indent.patch

Fixed previously.

> [2] require-directx_shaders.c-only-on-windows.patch

The implementation is guarded out anyway.
I don't see the point in duplicating the logic.

> [3] let-cmake-generate-files.patch

It wants to regenerate the files every time I run make.
Also it introduces a deviation into the build system.
Codifying the command lines into the build system is nice,
but I won't commit it in this form.

Perhaps as a manual target to be run by developers or distributors?
Then the following patches wouldn't really be necessary as the generated
files could be written to the current locations.

> [4] allow-specifying-build-dir-for-gl_mkalias.patch
> [5] add-directory-parameters-to-python-file-generators.patch

Not for now.

> [6] rename-scanline_drawers.c-to-scanline_drawers.h.patch

A better name would be .inc.

> diff --git a/include/allegro5/internal/aintern_convert.h b/include/allegro5/internal/aintern_convert.h
> index af4a0eb..ea1b224 100644
> --- a/include/allegro5/internal/aintern_convert.h
> +++ b/include/allegro5/internal/aintern_convert.h
> @@ -1,6 +1,6 @@
>  // Warning: This file was created by make_converters.py - do not edit.
> -#ifndef __al_included_allegro5_aintern_convert_h
> -#define __al_included_allegro5_aintern_convert_h
> +#ifndef _ALLEGRO_CONVERT_H
> +#define _ALLEGRO_CONVERT_H
>  

This should be fixed, at least on 5.1.
It's nothing to worry about.

> diff --git a/include/allegro5/opengl/GLext/gl_ext_alias.h b/include/allegro5/opengl/GLext/gl_ext_alias.h
> index 4cb71a0..afe0b8d 100644
> --- a/include/allegro5/opengl/GLext/gl_ext_alias.h
> +++ b/include/allegro5/opengl/GLext/gl_ext_alias.h
> @@ -359,10 +359,10 @@
>  /*ARB_provoking_vertex*/
>  /*ARB_sync*/
>  /*ARB_texture_multisample*/
> -#define glGetInteger64i_v _al_glGetInteger64i_v
> -#define glGetBufferParameteri64v _al_glGetBufferParameteri64v
> -#define glProgramParameteri _al_glProgramParameteri
> -#define glFramebufferTexture _al_glFramebufferTexture
> +#define glglGetInteger64i_v _al_glglGetInteger64i_v
> +#define glglGetBufferParameteri64v _al_glglGetBufferParameteri64v
> +#define glglProgramParameteri _al_glglProgramParameteri
> +#define glglFramebufferTexture _al_glglFramebufferTexture
>  #endif

Due to a typo in the source file gl_ext_api.h. Thanks.

Peter




Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/