Changeset 5956 in orxonox.OLD for trunk

Timestamp:

Dec 7, 2005, 1:22:12 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: compiles again

Location:

trunk/src

Files:

• defs/globals.h (modified) (2 diffs)
• lib/sound/sound_engine.cc (modified) (1 diff)

trunk/src/defs/globals.h

@@ -45 +45 @@
 #define   CONFIG_NAME_DATADIR              "DataDir"
 #define   CONFIG_NAME_AUTO_UPDATE          "Auto-Update"
+
 #define   CONFIG_NAME_FULLSCREEN           "Fullscreen-mode"
 #define   CONFIG_NAME_RESOLUTION           "Resolution"
@@ -57 +58 @@
 #define   CONFIG_NAME_ANTI_ALIASING        "Anti-Aliasing"
 #define   CONFIG_NAME_FILTER_METHOD        "Filtering-Method"
+
 #define   CONFIG_NAME_DISABLE_AUDIO        "Disable-Audio"
+#define   CONFIG_NAME_AUDIO_CHANNELS       "Audio-Channels"
 #define   CONFIG_NAME_MUSIC_VOLUME         "Music-Volume"
 #define   CONFIG_NAME_EFFECTS_VOLUME       "Effects-Volume"
+
 #define   CONFIG_NAME_SAVE_SETTINGS        "Save-Settings"
 #define   CONFIG_NAME_VERBOSE_MODE         "Verbose-Mode"

trunk/src/lib/sound/sound_engine.cc

@@ -289 +289 @@
 
   // INITIALIZING THE DEVICE:
-#ifndef AL_VERSION_1_1
+#ifdef AL_VERSION_1_1
   ALubyte deviceName[] =
 #else