[AD] merge al_cfg.h and alplatf.h

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

To: alleg-developers@xxxxxxxxxx
Subject: [AD] merge al_cfg.h and alplatf.h
From: Peter Wang <novalazy@xxxxxxxxxx>
Date: Sun, 12 Oct 2008 10:58:47 +1100

All platforms we support now use a configuration step that generates
alplatf.h and al_cfg.h.  I didn't like the name al_cfg.h because of
alconfig.h, but we can just move everything into alplatf.h.

Which I would have done, except I don't know how to update the scons
build.  Can someone finish this patch?

Peter

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e50b26b..5e091b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -467,13 +467,6 @@ configure_file(
     include/allegro5/platform/alplatf.h
     )
 
-if(UNIX OR WIN32)
-    configure_file(
-        include/allegro5/platform/al_cfg.h.cmake
-        include/allegro5/platform/al_cfg.h
-        )
-endif(UNIX OR WIN32)
-
 #-----------------------------------------------------------------------------#
 #
 #   Library
diff --git a/cmake/FileList.cmake b/cmake/FileList.cmake
index 4d3733a..3e661a3 100644
--- a/cmake/FileList.cmake
+++ b/cmake/FileList.cmake
@@ -386,7 +386,3 @@ set(ALLEGRO_INCLUDE_ALLEGRO_PLATFORM_FILES
 set(ALLEGRO_INCLUDE_ALLEGRO_PLATFORM_FILES_GENERATED
     include/allegro5/platform/alplatf.h
     )
-
-if(UNIX OR WIN32)
-   LIST(APPEND ALLEGRO_INCLUDE_ALLEGRO_PLATFORM_FILES_GENERATED include/allegro5/platform/al_cfg.h)
-endif(UNIX OR WIN32)
diff --git a/include/allegro5/platform/al_cfg.h.cmake b/include/allegro5/platform/al_cfg.h.cmake
deleted file mode 100644
index 986e0d1..0000000
--- a/include/allegro5/platform/al_cfg.h.cmake
+++ /dev/null
@@ -1,162 +0,0 @@
-/* al_cfg.h is generated from al_cfg.h.cmake by CMake. */
-/* Keep this in sync with alunixac.hin */
-
-/* TODO: rename this */
-#define RETSIGTYPE void
-
-/* This is defined on the command-line in the autotools build. */
-#define ALLEGRO_MODULES_PATH ${ALLEGRO_MODULES_PATH}
-
-/*---------------------------------------------------------------------------*/
-
-/* Define to 1 if you have the corresponding header file. */
-#cmakedefine ALLEGRO_HAVE_DIRENT_H
-#cmakedefine ALLEGRO_HAVE_INTTYPES_H
-#cmakedefine ALLEGRO_HAVE_LINUX_AWE_VOICE_H
-#cmakedefine ALLEGRO_HAVE_LINUX_INPUT_H
-#cmakedefine ALLEGRO_HAVE_LINUX_JOYSTICK_H
-#cmakedefine ALLEGRO_HAVE_LINUX_SOUNDCARD_H
-#cmakedefine ALLEGRO_HAVE_MACHINE_SOUNDCARD_H
-#cmakedefine ALLEGRO_HAVE_SOUNDCARD_H
-#cmakedefine ALLEGRO_HAVE_STDBOOL_H
-#cmakedefine ALLEGRO_HAVE_STDINT_H
-#cmakedefine ALLEGRO_HAVE_SV_PROCFS_H
-#cmakedefine ALLEGRO_HAVE_SYS_IO_H
-#cmakedefine ALLEGRO_HAVE_SYS_SOUNDCARD_H
-#cmakedefine ALLEGRO_HAVE_SYS_STAT_H
-#cmakedefine ALLEGRO_HAVE_SYS_TIME_H
-#cmakedefine ALLEGRO_HAVE_TIME_H
-#cmakedefine ALLEGRO_HAVE_SYS_UTSNAME_H
-#cmakedefine ALLEGRO_HAVE_SYS_TYPES_H
-
-/* Define to 1 if the corresponding functions are available. */
-#cmakedefine ALLEGRO_HAVE_GETEXECNAME
-#cmakedefine ALLEGRO_HAVE_MKSTEMP
-#cmakedefine ALLEGRO_HAVE_MMAP
-#cmakedefine ALLEGRO_HAVE_MPROTECT
-#cmakedefine ALLEGRO_HAVE_SCHED_YIELD
-#cmakedefine ALLEGRO_HAVE_STRICMP
-#cmakedefine ALLEGRO_HAVE_STRLWR
-#cmakedefine ALLEGRO_HAVE_STRUPR
-#cmakedefine ALLEGRO_HAVE_SYSCONF
-
-/* Define to 1 if procfs reveals argc and argv */
-#cmakedefine ALLEGRO_HAVE_PROCFS_ARGCV
-
-/*---------------------------------------------------------------------------*/
-
-/* Define if target machine is little endian. */
-#cmakedefine ALLEGRO_LITTLE_ENDIAN
-
-/* Define if target machine is big endian. */
-#cmakedefine ALLEGRO_BIG_ENDIAN
-
-/* Define for Unix platforms, to use C convention for bank switching. */
-#cmakedefine ALLEGRO_NO_ASM
-
-/* Define if compiler prepends underscore to symbols. */
-#cmakedefine ALLEGRO_ASM_PREFIX
-
-/* Define if assembler supports MMX. */
-#cmakedefine ALLEGRO_MMX
-
-/* Define if assembler supports SSE. */
-#cmakedefine ALLEGRO_SSE
-
-/* Define if target platform is Darwin. */
-#cmakedefine ALLEGRO_DARWIN
-
-/* Define if you have the pthread library. */
-#cmakedefine ALLEGRO_HAVE_LIBPTHREAD
-
-/* Define if constructor attribute is supported. */
-#cmakedefine ALLEGRO_USE_CONSTRUCTOR
-
-/* Define if sched_yield is provided by some library. */
-
-/* Define if you need to use a magic main. */
-#cmakedefine ALLEGRO_WITH_MAGIC_MAIN
-
-/* Define if dynamically loaded modules are supported. */
-#cmakedefine ALLEGRO_WITH_MODULES
-
-/*---------------------------------------------------------------------------*/
-
-/* Define if you need support for X-Windows. */
-#cmakedefine ALLEGRO_WITH_XWINDOWS
-
-/* Define if MIT-SHM extension is supported. */
-#cmakedefine ALLEGRO_XWINDOWS_WITH_SHM
-
-/* Define if XCursor ARGB extension is available. */
-#cmakedefine ALLEGRO_XWINDOWS_WITH_XCURSOR
-
-/* Define if DGA version 2.0 or newer is supported */
-#cmakedefine ALLEGRO_XWINDOWS_WITH_XF86DGA2
-
-/* Define if XF86VidMode extension is supported. */
-#cmakedefine ALLEGRO_XWINDOWS_WITH_XF86VIDMODE
-
-/* Define if XIM extension is supported. */
-#cmakedefine ALLEGRO_XWINDOWS_WITH_XIM
-
-/* Define if xpm bitmap support is available. */
-#cmakedefine ALLEGRO_XWINDOWS_WITH_XPM
-
-/*---------------------------------------------------------------------------*/
-
-/* Define if target platform is linux. */
-#cmakedefine ALLEGRO_LINUX
-
-/* Define to enable Linux console fbcon driver. */
-#cmakedefine ALLEGRO_LINUX_FBCON
-
-/* Define to enable Linux console SVGAlib driver. */
-#cmakedefine ALLEGRO_LINUX_SVGALIB
-
-/* Define if SVGAlib driver can check vga_version. */
-#cmakedefine ALLEGRO_LINUX_SVGALIB_HAVE_VGA_VERSION
-
-/* Define to enable Linux console VBE/AF driver. */
-#cmakedefine ALLEGRO_LINUX_VBEAF
-
-/* Define to enable Linux console VGA driver. */
-#cmakedefine ALLEGRO_LINUX_VGA
-
-/*---------------------------------------------------------------------------*/
-
-/* Define to the installed ALSA version. */
-#cmakedefine ALLEGRO_ALSA_VERSION ${ALLEGRO_ALSA_VERSION}
-
-/* Define if ALSA DIGI driver is supported. */
-#cmakedefine ALLEGRO_WITH_ALSADIGI
-
-/* Define if ALSA MIDI driver is supported. */
-#cmakedefine ALLEGRO_WITH_ALSAMIDI
-
-/* Define if aRts DIGI driver is supported. */
-#cmakedefine ALLEGRO_WITH_ARTSDIGI
-
-/* Define if ESD DIGI driver is supported. */
-#cmakedefine ALLEGRO_WITH_ESDDIGI
-
-/* Define if JACK DIGI driver is supported. */
-#cmakedefine ALLEGRO_WITH_JACKDIGI
-
-/* Define if OSS DIGI driver is supported. */
-#cmakedefine ALLEGRO_WITH_OSSDIGI
-
-/* Define if OSS MIDI driver is supported. */
-#cmakedefine ALLEGRO_WITH_OSSMIDI
-
-/* Define if SGI AL DIGI driver is supported. */
-#cmakedefine ALLEGRO_WITH_SGIALDIGI
-
-/*---------------------------------------------------------------------------*/
-
-/* TODO: Define to (void *)-1, if MAP_FAILED is not defined. */
-/* TODO: rename this */
-/* # cmakedefine MAP_FAILED */
-
-/*---------------------------------------------------------------------------*/
-/* vi: set ft=c ts=3 sts=3 sw=3 et: */
diff --git a/include/allegro5/platform/almngw32.h b/include/allegro5/platform/almngw32.h
index 604faf6..5bfa872 100644
--- a/include/allegro5/platform/almngw32.h
+++ b/include/allegro5/platform/almngw32.h
@@ -25,13 +25,7 @@
    #include <malloc.h>
 #endif
 
-#include "allegro5/platform/al_cfg.h"
-
-/* a static auto config */
-/* older mingw's don't seem to have inttypes.h */
-/* #define ALLEGRO_HAVE_INTTYPES_H */
-//#define ALLEGRO_HAVE_STDINT_H	1
-//#define ALLEGRO_HAVE_STDBOOL_H
+#include "allegro5/platform/alplatf.h"
 
 
 /* describe this platform */
diff --git a/include/allegro5/platform/almsvc.h b/include/allegro5/platform/almsvc.h
index 893288c..bcf8d3c 100644
--- a/include/allegro5/platform/almsvc.h
+++ b/include/allegro5/platform/almsvc.h
@@ -23,7 +23,7 @@
    #include <malloc.h>
 #endif
 
-#include "allegro5/platform/al_cfg.h"
+#include "allegro5/platform/alplatf.h"
 
 #pragma warning (disable: 4200 4244 4305)
 
diff --git a/include/allegro5/platform/alosxcfg.h b/include/allegro5/platform/alosxcfg.h
index a8278a6..6406606 100644
--- a/include/allegro5/platform/alosxcfg.h
+++ b/include/allegro5/platform/alosxcfg.h
@@ -19,8 +19,8 @@
 #ifndef ALOSXCFG_H
 #define ALOSXCFG_H
 
-/* Include configuration generated by configure script.  */
-#include "allegro5/platform/al_cfg.h"
+/* Include configuration information.  */
+#include "allegro5/platform/alplatf.h"
 
 #define ALLEGRO_INTERNAL_THREAD_HEADER "allegro5/platform/aintuthr.h"
 
diff --git a/include/allegro5/platform/alplatf.h.cmake b/include/allegro5/platform/alplatf.h.cmake
index cccc3af..10610b3 100644
--- a/include/allegro5/platform/alplatf.h.cmake
+++ b/include/allegro5/platform/alplatf.h.cmake
@@ -11,3 +11,165 @@
 
 #cmakedefine ALLEGRO_NO_ASM
 #cmakedefine ALLEGRO_CFG_NO_FPU
+
+/*---------------------------------------------------------------------------*/
+
+/* TODO: rename this */
+#define RETSIGTYPE void
+
+/* This is defined on the command-line in the autotools build. */
+#define ALLEGRO_MODULES_PATH ${ALLEGRO_MODULES_PATH}
+
+/*---------------------------------------------------------------------------*/
+
+/* Define to 1 if you have the corresponding header file. */
+#cmakedefine ALLEGRO_HAVE_DIRENT_H
+#cmakedefine ALLEGRO_HAVE_INTTYPES_H
+#cmakedefine ALLEGRO_HAVE_LINUX_AWE_VOICE_H
+#cmakedefine ALLEGRO_HAVE_LINUX_INPUT_H
+#cmakedefine ALLEGRO_HAVE_LINUX_JOYSTICK_H
+#cmakedefine ALLEGRO_HAVE_LINUX_SOUNDCARD_H
+#cmakedefine ALLEGRO_HAVE_MACHINE_SOUNDCARD_H
+#cmakedefine ALLEGRO_HAVE_SOUNDCARD_H
+#cmakedefine ALLEGRO_HAVE_STDBOOL_H
+#cmakedefine ALLEGRO_HAVE_STDINT_H
+#cmakedefine ALLEGRO_HAVE_SV_PROCFS_H
+#cmakedefine ALLEGRO_HAVE_SYS_IO_H
+#cmakedefine ALLEGRO_HAVE_SYS_SOUNDCARD_H
+#cmakedefine ALLEGRO_HAVE_SYS_STAT_H
+#cmakedefine ALLEGRO_HAVE_SYS_TIME_H
+#cmakedefine ALLEGRO_HAVE_TIME_H
+#cmakedefine ALLEGRO_HAVE_SYS_UTSNAME_H
+#cmakedefine ALLEGRO_HAVE_SYS_TYPES_H
+
+/* Define to 1 if the corresponding functions are available. */
+#cmakedefine ALLEGRO_HAVE_GETEXECNAME
+#cmakedefine ALLEGRO_HAVE_MKSTEMP
+#cmakedefine ALLEGRO_HAVE_MMAP
+#cmakedefine ALLEGRO_HAVE_MPROTECT
+#cmakedefine ALLEGRO_HAVE_SCHED_YIELD
+#cmakedefine ALLEGRO_HAVE_STRICMP
+#cmakedefine ALLEGRO_HAVE_STRLWR
+#cmakedefine ALLEGRO_HAVE_STRUPR
+#cmakedefine ALLEGRO_HAVE_SYSCONF
+
+/* Define to 1 if procfs reveals argc and argv */
+#cmakedefine ALLEGRO_HAVE_PROCFS_ARGCV
+
+/*---------------------------------------------------------------------------*/
+
+/* Define if target machine is little endian. */
+#cmakedefine ALLEGRO_LITTLE_ENDIAN
+
+/* Define if target machine is big endian. */
+#cmakedefine ALLEGRO_BIG_ENDIAN
+
+/* Define for Unix platforms, to use C convention for bank switching. */
+#cmakedefine ALLEGRO_NO_ASM
+
+/* Define if compiler prepends underscore to symbols. */
+#cmakedefine ALLEGRO_ASM_PREFIX
+
+/* Define if assembler supports MMX. */
+#cmakedefine ALLEGRO_MMX
+
+/* Define if assembler supports SSE. */
+#cmakedefine ALLEGRO_SSE
+
+/* Define if target platform is Darwin. */
+#cmakedefine ALLEGRO_DARWIN
+
+/* Define if you have the pthread library. */
+#cmakedefine ALLEGRO_HAVE_LIBPTHREAD
+
+/* Define if constructor attribute is supported. */
+#cmakedefine ALLEGRO_USE_CONSTRUCTOR
+
+/* Define if sched_yield is provided by some library. */
+
+/* Define if you need to use a magic main. */
+#cmakedefine ALLEGRO_WITH_MAGIC_MAIN
+
+/* Define if dynamically loaded modules are supported. */
+#cmakedefine ALLEGRO_WITH_MODULES
+
+/*---------------------------------------------------------------------------*/
+
+/* Define if you need support for X-Windows. */
+#cmakedefine ALLEGRO_WITH_XWINDOWS
+
+/* Define if MIT-SHM extension is supported. */
+#cmakedefine ALLEGRO_XWINDOWS_WITH_SHM
+
+/* Define if XCursor ARGB extension is available. */
+#cmakedefine ALLEGRO_XWINDOWS_WITH_XCURSOR
+
+/* Define if DGA version 2.0 or newer is supported */
+#cmakedefine ALLEGRO_XWINDOWS_WITH_XF86DGA2
+
+/* Define if XF86VidMode extension is supported. */
+#cmakedefine ALLEGRO_XWINDOWS_WITH_XF86VIDMODE
+
+/* Define if XIM extension is supported. */
+#cmakedefine ALLEGRO_XWINDOWS_WITH_XIM
+
+/* Define if xpm bitmap support is available. */
+#cmakedefine ALLEGRO_XWINDOWS_WITH_XPM
+
+/*---------------------------------------------------------------------------*/
+
+/* Define if target platform is linux. */
+#cmakedefine ALLEGRO_LINUX
+
+/* Define to enable Linux console fbcon driver. */
+#cmakedefine ALLEGRO_LINUX_FBCON
+
+/* Define to enable Linux console SVGAlib driver. */
+#cmakedefine ALLEGRO_LINUX_SVGALIB
+
+/* Define if SVGAlib driver can check vga_version. */
+#cmakedefine ALLEGRO_LINUX_SVGALIB_HAVE_VGA_VERSION
+
+/* Define to enable Linux console VBE/AF driver. */
+#cmakedefine ALLEGRO_LINUX_VBEAF
+
+/* Define to enable Linux console VGA driver. */
+#cmakedefine ALLEGRO_LINUX_VGA
+
+/*---------------------------------------------------------------------------*/
+
+/* Define to the installed ALSA version. */
+#cmakedefine ALLEGRO_ALSA_VERSION ${ALLEGRO_ALSA_VERSION}
+
+/* Define if ALSA DIGI driver is supported. */
+#cmakedefine ALLEGRO_WITH_ALSADIGI
+
+/* Define if ALSA MIDI driver is supported. */
+#cmakedefine ALLEGRO_WITH_ALSAMIDI
+
+/* Define if aRts DIGI driver is supported. */
+#cmakedefine ALLEGRO_WITH_ARTSDIGI
+
+/* Define if ESD DIGI driver is supported. */
+#cmakedefine ALLEGRO_WITH_ESDDIGI
+
+/* Define if JACK DIGI driver is supported. */
+#cmakedefine ALLEGRO_WITH_JACKDIGI
+
+/* Define if OSS DIGI driver is supported. */
+#cmakedefine ALLEGRO_WITH_OSSDIGI
+
+/* Define if OSS MIDI driver is supported. */
+#cmakedefine ALLEGRO_WITH_OSSMIDI
+
+/* Define if SGI AL DIGI driver is supported. */
+#cmakedefine ALLEGRO_WITH_SGIALDIGI
+
+/*---------------------------------------------------------------------------*/
+
+/* TODO: Define to (void *)-1, if MAP_FAILED is not defined. */
+/* TODO: rename this */
+/* # cmakedefine MAP_FAILED */
+
+/*---------------------------------------------------------------------------*/
+/* vi: set ft=c ts=3 sts=3 sw=3 et: */
diff --git a/include/allegro5/platform/alucfg.h b/include/allegro5/platform/alucfg.h
index 519afee..b0d9703 100644
--- a/include/allegro5/platform/alucfg.h
+++ b/include/allegro5/platform/alucfg.h
@@ -44,8 +44,8 @@
 #undef ALLEGRO_COLOR24
 #undef ALLEGRO_COLOR32
 
-/* Include configuration generated by configure script.  */
-#include "allegro5/platform/al_cfg.h"
+/* Include configuration information.  */
+#include "allegro5/platform/alplatf.h"
 
 /* Enable OpenGL if GLX is available. */
 #ifdef ALLEGRO_GLX
diff --git a/include/allegro5/platform/alunixac.hin b/include/allegro5/platform/alunixac.hin
deleted file mode 100644
index 3e9995a..0000000
--- a/include/allegro5/platform/alunixac.hin
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Note that this file is no longer generated by autoheader as it results in
- * too much namespace pollution.  If you add define a new macro in
- * configure.in or aclocal.m4, you must add an entry to this file.
- */
-
-/* Define if you want support for n bpp modes. */
-#undef ALLEGRO_COLOR8
-#undef ALLEGRO_COLOR16
-#undef ALLEGRO_COLOR24
-#undef ALLEGRO_COLOR32
-
-/*---------------------------------------------------------------------------*/
-
-/* Define to 1 if you have the corresponding header file. */
-#undef ALLEGRO_HAVE_DIRENT_H
-#undef ALLEGRO_HAVE_INTTYPES_H
-#undef ALLEGRO_HAVE_LINUX_AWE_VOICE_H
-#undef ALLEGRO_HAVE_LINUX_INPUT_H
-#undef ALLEGRO_HAVE_LINUX_JOYSTICK_H
-#undef ALLEGRO_HAVE_LINUX_SOUNDCARD_H
-#undef ALLEGRO_HAVE_MACHINE_SOUNDCARD_H
-#undef ALLEGRO_HAVE_SOUNDCARD_H
-#undef ALLEGRO_HAVE_STDINT_H
-#undef ALLEGRO_HAVE_SV_PROCFS_H
-#undef ALLEGRO_HAVE_SYS_IO_H
-#undef ALLEGRO_HAVE_SYS_SOUNDCARD_H
-#undef ALLEGRO_HAVE_SYS_STAT_H
-#undef ALLEGRO_HAVE_SYS_TIME_H
-#undef ALLEGRO_HAVE_SYS_UTSNAME_H
-#undef ALLEGRO_HAVE_STDBOOL_H
-
-/* Define to 1 if the corresponding functions are available. */
-#undef ALLEGRO_HAVE_GETEXECNAME
-#undef ALLEGRO_HAVE_MEMCMP
-#undef ALLEGRO_HAVE_MKSTEMP
-#undef ALLEGRO_HAVE_MMAP
-#undef ALLEGRO_HAVE_MPROTECT
-#undef ALLEGRO_HAVE_SCHED_YIELD
-#undef ALLEGRO_HAVE_STRICMP
-#undef ALLEGRO_HAVE_STRLWR
-#undef ALLEGRO_HAVE_STRUPR
-#undef ALLEGRO_HAVE_SYSCONF
-
-/* Define to 1 if procfs reveals argc and argv */
-#undef ALLEGRO_HAVE_PROCFS_ARGCV
-
-/*---------------------------------------------------------------------------*/
-
-/* Define if target machine is little endian. */
-#undef ALLEGRO_LITTLE_ENDIAN
-
-/* Define if target machine is big endian. */
-#undef ALLEGRO_BIG_ENDIAN
-
-/* Define for Unix platforms, to use C convention for bank switching. */
-#undef ALLEGRO_NO_ASM
-
-/* Define if compiler prepends underscore to symbols. */
-#undef ALLEGRO_ASM_PREFIX
-
-/* Define if assembler supports MMX. */
-#undef ALLEGRO_MMX
-
-/* Define if assembler supports SSE. */
-#undef ALLEGRO_SSE
-
-/* Define if target platform is Darwin. */
-#undef ALLEGRO_DARWIN
-
-/* Define if you have the pthread library. */
-#undef ALLEGRO_HAVE_LIBPTHREAD
-
-/* Define if constructor attribute is supported. */
-#undef ALLEGRO_USE_CONSTRUCTOR
-
-/* Define if you need to use a magic main. */
-#undef ALLEGRO_WITH_MAGIC_MAIN
-
-/* Define if dynamically loaded modules are supported. */
-#undef ALLEGRO_WITH_MODULES
-
-/*---------------------------------------------------------------------------*/
-
-/* Define if you need support for X-Windows. */
-#undef ALLEGRO_WITH_XWINDOWS
-
-/* Define if MIT-SHM extension is supported. */
-#undef ALLEGRO_XWINDOWS_WITH_SHM
-
-/* Define if XCursor ARGB extension is available. */
-#undef ALLEGRO_XWINDOWS_WITH_XCURSOR
-
-/* Define if DGA version 2.0 or newer is supported */
-#undef ALLEGRO_XWINDOWS_WITH_XF86DGA2
-
-/* Define if XF86VidMode extension is supported. */
-#undef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE
-
-/* Define if XIM extension is supported. */
-#undef ALLEGRO_XWINDOWS_WITH_XIM
-
-/* Define if xpm bitmap support is available. */
-#undef ALLEGRO_XWINDOWS_WITH_XPM
-
-/*---------------------------------------------------------------------------*/
-
-/* Define if target platform is linux. */
-#undef ALLEGRO_LINUX
-
-/* Define to enable Linux console fbcon driver. */
-#undef ALLEGRO_LINUX_FBCON
-
-/* Define to enable Linux console SVGAlib driver. */
-#undef ALLEGRO_LINUX_SVGALIB
-
-/* Define if SVGAlib driver can check vga_version. */
-#undef ALLEGRO_LINUX_SVGALIB_HAVE_VGA_VERSION
-
-/* Define to enable Linux console VBE/AF driver. */
-#undef ALLEGRO_LINUX_VBEAF
-
-/* Define to enable Linux console VGA driver. */
-#undef ALLEGRO_LINUX_VGA
-
-/* Define to enable GLX driver. */
-#undef ALLEGRO_GLX
-
-/*---------------------------------------------------------------------------*/
-
-/* Define to the installed ALSA version. */
-#undef ALLEGRO_ALSA_VERSION
-
-/* Define if ALSA DIGI driver is supported. */
-#undef ALLEGRO_WITH_ALSADIGI
-
-/* Define if ALSA MIDI driver is supported. */
-#undef ALLEGRO_WITH_ALSAMIDI
-
-/* Define if aRts DIGI driver is supported. */
-#undef ALLEGRO_WITH_ARTSDIGI
-
-/* Define if ESD DIGI driver is supported. */
-#undef ALLEGRO_WITH_ESDDIGI
-
-/* Define if JACK DIGI driver is supported. */
-#undef ALLEGRO_WITH_JACKDIGI
-
-/* Define if OSS DIGI driver is supported. */
-#undef ALLEGRO_WITH_OSSDIGI
-
-/* Define if OSS MIDI driver is supported. */
-#undef ALLEGRO_WITH_OSSMIDI
-
-/* Define if SGI AL DIGI driver is supported. */
-#undef ALLEGRO_WITH_SGIALDIGI
-
-/*---------------------------------------------------------------------------*/
-
-/* Define to (void *)-1, if MAP_FAILED is not defined. */
-/* TODO: rename this */
-#undef MAP_FAILED
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-/* TODO: rename this */
-#undef RETSIGTYPE
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
-
-/*---------------------------------------------------------------------------*/
-/* vi:set ft=c: */
diff --git a/scons/unix.scons b/scons/unix.scons
index aedc80b..01e4736 100644
--- a/scons/unix.scons
+++ b/scons/unix.scons
@@ -323,7 +323,6 @@ def install():
     # add('lib/allegro/%s.%s' % (context.getMajorVersion(),context.getMinorVersion()), '#modules.lst')
     #for i in getModules():
     #    add('lib/allegro/%s.%s' % (context.getMajorVersion(),context.getMinorVersion()),i)
-    add('include/allegro5/platform', 'include/allegro5/platform/al_cfg.h')
     add('include/allegro5/platform', 'include/allegro5/platform/alplatf.h')
     add('bin', 'allegro5-config')

Follow-Ups:
- Re: [AD] merge al_cfg.h and alplatf.h
  - From: Peter Wang

Messages sorted by: [ date | thread ]
Prev by Date: Re: [AD] SF.net SVN: alleg:[11050] allegro/branches/4.9/src
Next by Date: Re: [AD] fshooks on msvc
Previous by thread: Re: [AD] fshooks on msvc
Next by thread: Re: [AD] merge al_cfg.h and alplatf.h

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/