Menu
▾
▴
SF.net SVN: alleg:[12017] allegro/branches/4.9
|
From: <tj...@us...> - 2009-04-04 01:54:13
|
Revision: 12017
http://alleg.svn.sourceforge.net/alleg/?rev=12017&view=rev
Author: tjaden
Date: 2009-04-04 01:44:36 +0000 (Sat, 04 Apr 2009)
Log Message:
-----------
Rename configuration files to allegro5.cfg and allegro5rc.
Modified Paths:
--------------
allegro/branches/4.9/docs/src/refman/opengl.txt
allegro/branches/4.9/readme_a5.txt
allegro/branches/4.9/src/allegro.c
allegro/branches/4.9/src/system_new.c
allegro/branches/4.9/tests/akaitest.c
Added Paths:
-----------
allegro/branches/4.9/allegro5.cfg
Removed Paths:
-------------
allegro/branches/4.9/allegro.cfg
Deleted: allegro/branches/4.9/allegro.cfg
===================================================================
--- allegro/branches/4.9/allegro.cfg 2009-04-01 06:19:41 UTC (rev 12016)
+++ allegro/branches/4.9/allegro.cfg 2009-04-04 01:44:36 UTC (rev 12017)
@@ -1,71 +0,0 @@
-[graphics]
-
-# Graphics driver.
-# Can be 'default', 'opengl' or 'direct3d' (Windows only).
-driver=default
-
-# Can be 'point', 'linear', 'anisotropic'.
-# Just a hint, driver doesn't have to obey.
-min_filter=point
-mag_filter=point
-
-# Display configuration selection mode.
-
-# Under Linux, it can be used to force the old GLX 1.2 way of choosing
-# display settings or the new FBConfig method introduced with GLX 1.3.
-
-# Under Windows, when using the OpenGL driver, setting it to old will
-# use DescribePixelFormat and new will use wglGetPixelFormatAttribivARB
-# (provided by WGL_ARB_pixel_format extension).
-
-# FIXME: This was mainly useful for testing (and running in Wine
-# versions where the latter was not supported) but should be removed
-# before the A5 release:
-
-# Can be 'old' and 'new'. Default is 'new'.
-config_selection=new
-
-[sound]
-
-# Driver can be 'default', 'openal', 'alsa', 'oss', or 'directsound'
-# depending on platform.
-driver=default
-
-[opengl]
-
-# If you want to support old OpenGL versions, you can make Allegro
-# believe an older version than what you actually have is used with
-# this key. This is only for testing/debugging purposes.
-
-# force_opengl_version = 1.2
-
-[opengl_disabled_extensions]
-
-# Any OpenGL extensions can be listed here to make Allegro report them
-# as not available. The extensions used by Allegro itself if available
-# are shown below - uncommenting them would disable them:
-
-# GL_ARB_texture_non_power_of_two=0
-# GL_EXT_framebuffer_object=0
-
-
-[trace]
-# Comma-separated list of channels to log. Default is "all" which
-# disables channel filtering. Some possible channels are:
-# system,display,keyboard,opengl
-# Channel names can be prefixed with - to exclude only those channels.
-# Each addon and source-file can define additional channels though so
-# there are more.
-channels=all
-
-# Log-level. Can be one of debug, info, warn, error.
-level=debug
-
-# Set to 0 to disable line numbers in log files.
-lines=1
-
-# Set to 0 to disable timestamps in log files.
-timestamps=1
-
-# Set to 0 to disable function names in log files.
-functions=1
Copied: allegro/branches/4.9/allegro5.cfg (from rev 12016, allegro/branches/4.9/allegro.cfg)
===================================================================
--- allegro/branches/4.9/allegro5.cfg (rev 0)
+++ allegro/branches/4.9/allegro5.cfg 2009-04-04 01:44:36 UTC (rev 12017)
@@ -0,0 +1,71 @@
+[graphics]
+
+# Graphics driver.
+# Can be 'default', 'opengl' or 'direct3d' (Windows only).
+driver=default
+
+# Can be 'point', 'linear', 'anisotropic'.
+# Just a hint, driver doesn't have to obey.
+min_filter=point
+mag_filter=point
+
+# Display configuration selection mode.
+
+# Under Linux, it can be used to force the old GLX 1.2 way of choosing
+# display settings or the new FBConfig method introduced with GLX 1.3.
+
+# Under Windows, when using the OpenGL driver, setting it to old will
+# use DescribePixelFormat and new will use wglGetPixelFormatAttribivARB
+# (provided by WGL_ARB_pixel_format extension).
+
+# FIXME: This was mainly useful for testing (and running in Wine
+# versions where the latter was not supported) but should be removed
+# before the A5 release:
+
+# Can be 'old' and 'new'. Default is 'new'.
+config_selection=new
+
+[sound]
+
+# Driver can be 'default', 'openal', 'alsa', 'oss', or 'directsound'
+# depending on platform.
+driver=default
+
+[opengl]
+
+# If you want to support old OpenGL versions, you can make Allegro
+# believe an older version than what you actually have is used with
+# this key. This is only for testing/debugging purposes.
+
+# force_opengl_version = 1.2
+
+[opengl_disabled_extensions]
+
+# Any OpenGL extensions can be listed here to make Allegro report them
+# as not available. The extensions used by Allegro itself if available
+# are shown below - uncommenting them would disable them:
+
+# GL_ARB_texture_non_power_of_two=0
+# GL_EXT_framebuffer_object=0
+
+
+[trace]
+# Comma-separated list of channels to log. Default is "all" which
+# disables channel filtering. Some possible channels are:
+# system,display,keyboard,opengl
+# Channel names can be prefixed with - to exclude only those channels.
+# Each addon and source-file can define additional channels though so
+# there are more.
+channels=all
+
+# Log-level. Can be one of debug, info, warn, error.
+level=debug
+
+# Set to 0 to disable line numbers in log files.
+lines=1
+
+# Set to 0 to disable timestamps in log files.
+timestamps=1
+
+# Set to 0 to disable function names in log files.
+functions=1
Modified: allegro/branches/4.9/docs/src/refman/opengl.txt
===================================================================
--- allegro/branches/4.9/docs/src/refman/opengl.txt 2009-04-01 06:19:41 UTC (rev 12016)
+++ allegro/branches/4.9/docs/src/refman/opengl.txt 2009-04-04 01:44:36 UTC (rev 12017)
@@ -105,7 +105,7 @@
## Configuration
You can disable the detection of any OpenGL extension by Allegro with
-a section like this in allegro.cfg:
+a section like this in allegro5.cfg:
[opengl_disabled_extensions]
GL_ARB_texture_non_power_of_two=0
Modified: allegro/branches/4.9/readme_a5.txt
===================================================================
--- allegro/branches/4.9/readme_a5.txt 2009-04-01 06:19:41 UTC (rev 12016)
+++ allegro/branches/4.9/readme_a5.txt 2009-04-04 01:44:36 UTC (rev 12017)
@@ -12,7 +12,7 @@
onther one using OpenGL. You can force using OpenGL by calling
al_set_new_display_flags(ALLEGRO_OPENGL) prior to creating a display, while
DirectX is the default driver.
-You can also select the driver using the `allegro.cfg` file.
+You can also select the driver using the `allegro5.cfg` file.
Here are some files you may need regarding DirectX:
Modified: allegro/branches/4.9/src/allegro.c
===================================================================
--- allegro/branches/4.9/src/allegro.c 2009-04-01 06:19:41 UTC (rev 12016)
+++ allegro/branches/4.9/src/allegro.c 2009-04-04 01:44:36 UTC (rev 12017)
@@ -47,7 +47,7 @@
/* List of channels to log. NULL to log all channels. */
_AL_VECTOR channels;
_AL_VECTOR excluded;
- /* Whether settings have been read from allegro.cfg or not. */
+ /* Whether settings have been read from allegro5.cfg or not. */
bool configured;
} _al_debug_info = {
0,
@@ -230,7 +230,7 @@
char const *v;
bool got_all = false;
- /* Messages logged before the system driver and allegro.cfg are
+ /* Messages logged before the system driver and allegro5.cfg are
* up will always use defaults - but usually nothing is logged
* before al_init.
*/
Modified: allegro/branches/4.9/src/system_new.c
===================================================================
--- allegro/branches/4.9/src/system_new.c 2009-04-01 06:19:41 UTC (rev 12016)
+++ allegro/branches/4.9/src/system_new.c 2009-04-04 01:44:36 UTC (rev 12017)
@@ -104,10 +104,10 @@
ALLEGRO_CONFIG *temp;
char buf[256], tmp[256];
- active_sysdrv->config = al_load_config_file("/etc/allegrorc");
+ active_sysdrv->config = al_load_config_file("/etc/allegro5rc");
ustrzcpy(buf, sizeof(buf) - ucwidth(OTHER_PATH_SEPARATOR), uconvert_ascii(getenv("HOME"), tmp));
- ustrzcat(buf, sizeof(buf), uconvert_ascii("/.allegrorc", tmp));
+ ustrzcat(buf, sizeof(buf), uconvert_ascii("/.allegro5rc", tmp));
temp = al_load_config_file(buf);
if (temp) {
if (active_sysdrv->config) {
@@ -119,7 +119,7 @@
}
}
- temp = al_load_config_file("allegro.cfg");
+ temp = al_load_config_file("allegro5.cfg");
if (temp) {
if (active_sysdrv->config) {
al_merge_config_into(active_sysdrv->config, temp);
@@ -130,7 +130,7 @@
}
}
#else
- active_sysdrv->config = al_load_config_file("allegro.cfg");
+ active_sysdrv->config = al_load_config_file("allegro5.cfg");
#endif
}
Modified: allegro/branches/4.9/tests/akaitest.c
===================================================================
--- allegro/branches/4.9/tests/akaitest.c 2009-04-01 06:19:41 UTC (rev 12016)
+++ allegro/branches/4.9/tests/akaitest.c 2009-04-04 01:44:36 UTC (rev 12017)
@@ -596,7 +596,7 @@
if (install_sound_input(DIGI_AUTODETECT, MIDI_AUTODETECT) != 0) {
allegro_message("\nError initialising sound input\n%s\n\n"
"Try changing the digi_input_card and midi_input_card settings in your\n"
- "allegro.cfg, in particular disabling (set to zero) one of those drivers.\n",
+ "allegro5.cfg, in particular disabling (set to zero) one of those drivers.\n",
allegro_error);
return 1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|