Changeset 2621 for code/branches/buildsystem2/src/audio

Timestamp:

Jan 29, 2009, 11:35:54 PM (16 years ago)

Author:

rgrieder

Message:

This commit gets a little ugly, couldn't separate that anymore:

• Renamed UseTolua.cmake to GenerateLuaBindings.cmake
• Applied the macros for compiler flags, linker flags, header files and source groups Updated the whole build tree for that
• Created real compiler config scripts (BuildConfigGCC.cmake and BuildConfigMSVC.cmake)
• Large scale clean up in BuildConfig.cmake
• You can now specify your own LibraryConfig and BuildConfig script via CMake Cache
• Lots of small changes and fixes

Location:

code/branches/buildsystem2/src/audio

Files:

• AudioBuffer.h (modified) (1 diff)
• AudioIncludes.h (modified) (1 diff)
• AudioStream.h (modified) (1 diff)
• CMakeLists.txt (modified) (2 diffs)

code/branches/buildsystem2/src/audio/AudioBuffer.h

@@ -33 +33 @@
 
 #include <string>
-#include <AL/al.h>
+#include <al.h>
 
 namespace orxonox

code/branches/buildsystem2/src/audio/AudioIncludes.h

@@ -39 +39 @@
 #include <string>
 
-#include <AL/al.h>
-#include <AL/alc.h>
+#include <al.h>
+#include <alc.h>
 #include <AL/alut.h>
 #include <ogg/ogg.h>

code/branches/buildsystem2/src/audio/AudioStream.h

@@ -34 +34 @@
 #include <string>
 #include <iostream>
-#include <AL/al.h>
+#include <al.h>
 #include <vorbis/vorbisfile.h>
 #include <vorbis/codec.h>

code/branches/buildsystem2/src/audio/CMakeLists.txt

@@ -1 @@
-SET ( AUDIO_SRC_FILES
+SET_SOURCE_FILES(AUDIO_SRC_FILES
   AudioBuffer.cc
   AudioManager.cc
@@ -5 +5 @@
   AudioStream.cc
 )
+GET_ALL_HEADER_FILES(AUDIO_HDR_FILES)
+SET(AUDIO_FILES ${AUDIO_SRC_FILES} ${AUDIO_HDR_FILES})
+GENERATE_SOURCE_GROUPS(${AUDIO_FILES})
 
-ADD_CXX_FLAGS("-wd4244" MSVC)
+ADD_COMPILER_FLAGS("-w44244" MSVC)
 
 IF (MINGW)
-  ADD_LIBRARY( audio ${AUDIO_SRC_FILES} )
+  ADD_LIBRARY( audio ${AUDIO_FILES})
 ELSE (MINGW)
-  ADD_LIBRARY( audio SHARED ${AUDIO_SRC_FILES} )
+  ADD_LIBRARY( audio SHARED ${AUDIO_FILES})
 ENDIF (MINGW)