Changeset 8056

Timestamp:

Mar 10, 2011, 5:52:31 PM (14 years ago)

Author:

rgrieder

Message:

Fiddled around with ALUT and OpenAL headers.
The hack in PackageConfigOSX.cmake is just a guess so it really needs testing.

All ALUT and OpenAL headers should now be included with <alut.h> or <al.h> respectively because FindOpenAL.cmake defines the include directories this way.
There is still a hack in LibraryConfig.cmake for non MSVC/Apple systems because alut.h includes al.h with AL/al.h on most systems.

Location:

code/branches/mac_osx

Files:

• cmake/PackageConfigOSX.cmake (modified) (1 diff)
• cmake/tools/FindALUT.cmake (modified) (2 diffs)
• src/orxonox/sound/BaseSound.cc (modified) (1 diff)
• src/orxonox/sound/SoundBuffer.cc (modified) (1 diff)
• src/orxonox/sound/SoundManager.cc (modified) (1 diff)
• src/orxonox/sound/SoundStreamer.cc (modified) (1 diff)
• src/orxonox/sound/WorldSound.cc (modified) (1 diff)

code/branches/mac_osx/cmake/PackageConfigOSX.cmake

@@ -51 +51 @@
 SET(ENV{OGRE_PLUGIN_DIR}       ${DEP_BINARY_DIR})
 
+# For OS X 10.5 we have to ship modified headers to make it compile
+# on gcc >= 4.2 (binaries stay the same)
+# Sets the library path for the FIND_LIBRARY
+IF(CMAKE_SYSTEM_VERSION STREQUAL "10.5")
+  SET(ENV{OPENALDIR} ${DEP_INCLUDE_DIR}/openal)
+ENDIF()
+
 # Xcode won't be able to run the toluabind code generation if we're using the dependency package
 #IF(DEPENDENCY_PACKAGE_ENABLE)

code/branches/mac_osx/cmake/tools/FindALUT.cmake

@@ -1 @@
-# Find ALUT includes and library
-#
-# This module defines
-#  ALUT_INCLUDE_DIR
-#  ALUT_LIBRARY, the library to link against to use ALUT.
-#  ALUT_FOUND, If false, do not try to use ALUT
-#
-# Copyright © 2007, Matt Williams
-# Modified by Nicolas Schlumberger to make it work on the Tardis-Infrastucture
-# of the ETH Zurich (removed later on)
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-#
-# Several changes and additions by Fabian 'x3n' Landau
-# Lots of simplifications by Adrian Friedli
-# Version checking by Reto Grieder
-# Adaption of the OGRE find script to ALUT by Kevin Young
-#                 > www.orxonox.net <
+ #
+ #             ORXONOX - the hottest 3D action shooter ever to exist
+ #                             > www.orxonox.net <
+ #
+ #        This program is free software; you can redistribute it and/or
+ #         modify it under the terms of the GNU General Public License
+ #        as published by the Free Software Foundation; either version 2
+ #            of the License, or (at your option) any later version.
+ #
+ #       This program is distributed in the hope that it will be useful,
+ #        but WITHOUT ANY WARRANTY; without even the implied warranty of
+ #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #                 GNU General Public License for more details.
+ #
+ #   You should have received a copy of the GNU General Public License along
+ #      with this program; if not, write to the Free Software Foundation,
+ #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #
+ #
+ #  Author:
+ #    Kevin Young
+ #  Description:
+ #    Variables defined:
+ #      ALUT_FOUND
+ #      ALUT_INCLUDE_DIR
+ #      ALUT_LIBRARY
+ #
 
-INCLUDE(FindPackageHandleAdvancedArgs)
+INCLUDE(FindPackageHandleStandardArgs)
 INCLUDE(HandleLibraryTypes)
 
 FIND_PATH(ALUT_INCLUDE_DIR alut.h
   PATHS $ENV{ALUTDIR}
-  PATH_SUFFIXES include include/AL ALUT
+  PATH_SUFFIXES include include/AL Headers Headers/AL
 )
 FIND_LIBRARY(ALUT_LIBRARY_OPTIMIZED
-  NAMES ALUT alut
+  NAMES alut ALUT
   PATHS $ENV{ALUTDIR}
   PATH_SUFFIXES lib bin/Release bin/release Release release ALUT
 )
 FIND_LIBRARY(ALUT_LIBRARY_DEBUG
-  NAMES ALUTD alutd alut_d alutD alut_D
+  NAMES alutd alut_d alutD alut_D ALUTd ALUT_d ALUTD ALUT_D
   PATHS $ENV{ALUTDIR}
   PATH_SUFFIXES lib bin/Debug bin/debug Debug debug ALUT
@@ -37 +46 @@
 
 # Handle the REQUIRED argument and set ALUT_FOUND
-# Also check the version requirements
-FIND_PACKAGE_HANDLE_ADVANCED_ARGS(ALUT DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALUT DEFAULT_MSG
   ALUT_LIBRARY_OPTIMIZED
   ALUT_INCLUDE_DIR

code/branches/mac_osx/src/orxonox/sound/BaseSound.cc

@@ -31 +31 @@
 #include <cassert>
 #include <vector>
-
-#ifdef ORXONOX_PLATFORM_APPLE
-#include "openal/al.h"
-#else
 #include <al.h>
-#endif
 
 #include "util/Math.h"

code/branches/mac_osx/src/orxonox/sound/SoundBuffer.cc

@@ -30 +30 @@
 #include "SoundBuffer.h"
 
-#if defined(ORXONOX_PLATFORM_APPLE)
-#include <ALUT/alut.h>
-#else
-#include <AL/alut.h>
-#endif
+#include <alut.h>
 #include <vorbis/vorbisfile.h>
 

code/branches/mac_osx/src/orxonox/sound/SoundManager.cc

@@ -31 +31 @@
 #include "SoundManager.h"
 
-#if defined(__APPLE__)
-#include <ALUT/alut.h>
-#else
-#include <AL/alut.h>
-#endif
 #include <utility>
+#include <alut.h>
 #include <loki/ScopeGuard.h>
 

code/branches/mac_osx/src/orxonox/sound/SoundStreamer.cc

@@ -27 +27 @@
 #include "SoundStreamer.h"
 
-#ifdef ORXONOX_PLATFORM_APPLE
-#include "openal/al.h"
-#else
 #include <al.h>
-#endif
-
 #include <vorbis/vorbisfile.h>
 #include "SoundManager.h"

code/branches/mac_osx/src/orxonox/sound/WorldSound.cc

@@ -30 +30 @@
 #include "WorldSound.h"
 
-#if defined(__APPLE__)
-#include <ALUT/alut.h>
-#else
-#include <AL/alut.h>
-#endif
+#include <alut.h>
+
 #include "util/Math.h"
 #include "core/CoreIncludes.h"