CVS: allegro/src/linux fbcon.c,1.14,1.15 lgfxdrv.c,1.3,1.4

[Peter W. <tj...@us...>]

Update of /cvsroot/alleg/allegro/src/linux
In directory usw-pr-cvs1:/tmp/cvs-serv12446/src/linux

Modified Files:
	fbcon.c lgfxdrv.c 
Log Message:
Grzegorz made fbcon a module

Index: fbcon.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/linux/fbcon.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- fbcon.c	2001/08/17 06:05:07	1.14
+++ fbcon.c	2001/09/23 03:14:56	1.15
@@ -14,6 +14,8 @@
  *
  *      Proper mode setting support added by George Foot.
  *
+ *      Modified by Grzegorz Adam Hankiewicz.
+ *
  *      See readme.txt for copyright information.
  */
 
@@ -23,7 +25,7 @@
 #include "allegro/aintunix.h"
 
 
-#ifdef ALLEGRO_LINUX_FBCON
+#if (defined ALLEGRO_LINUX_FBCON) && ((!defined ALLEGRO_WITH_MODULES) || (defined ALLEGRO_MODULE))
 
 #if !defined(_POSIX_MAPPED_FILES) || !defined(HAVE_MMAP)
 #error "Sorry, mapped files are required for Linux console Allegro to work!"
@@ -943,4 +945,19 @@
 
 
 
-#endif      /* ifdef ALLEGRO_LINUX_FBCON */
+#ifdef ALLEGRO_MODULE
+
+/* _module_init:
+ *  Called when loaded as a dynamically linked module.
+ */
+void _module_init(int system_driver)
+{
+   if (system_driver == SYSTEM_LINUX)
+      _unix_register_gfx_driver(GFX_FBCON, &gfx_fbcon, TRUE, FALSE);
+}
+
+#endif      /* ifdef ALLEGRO_MODULE */
+
+
+
+#endif      /* if (defined ALLEGRO_LINUX_FBCON) ... */

Index: lgfxdrv.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/linux/lgfxdrv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lgfxdrv.c	2001/06/24 14:53:21	1.3
+++ lgfxdrv.c	2001/09/23 03:14:56	1.4
@@ -22,7 +22,7 @@
 /* list the available drivers */
 _DRIVER_INFO _linux_gfx_driver_list[] =
 {
-#ifdef ALLEGRO_LINUX_FBCON
+#if (defined ALLEGRO_LINUX_FBCON) && (!defined ALLEGRO_WITH_MODULES)
    {  GFX_FBCON,    &gfx_fbcon,    TRUE  },
 #endif
 #ifdef ALLEGRO_LINUX_VBEAF