Merge pull request #3 from d-Pixie/master

Here are all the changes we had to make to get it to compile on Linux (Ubuntu 10.10, 11.04 and 11.10), both 32 and 64 -bit. You still need to jump through a few hoops (need ogg and vorbis -dev packages installed despite the fact that they are in the dep.
This commit is contained in:
Raynaldo Rivera 2011-12-27 10:47:35 -08:00
commit 86548b9477
11 changed files with 18 additions and 12 deletions

View File

@ -1,9 +1,6 @@
#####################################################
# Install dependencies
#####################################################
if (NOT APPLE AND NOT WIN32)
return()
endif()
option(CAUDIO_COPY_DEPENDENCIES "Copy dependency libs to the build directory" TRUE)
@ -94,4 +91,4 @@ if (CAUDIO_COPY_DEPENDENCIES)
copy_debug(wrap_oal.dll)
copy_release(wrap_oal.dll)
endif ()
endif ()
endif ()

View File

@ -12,11 +12,14 @@ include(libogg_src_files)
add_library(Ogg STATIC ${file_root})
target_link_libraries(Ogg)
if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 8)
set_target_properties( Ogg PROPERTIES COMPILE_FLAGS -fPIC)
endif()
if (APPLE AND CAUDIO_IOS_BUILD)
set_target_properties(Ogg PROPERTIES XCODE_ATTRIBUTE_GCC_THUMB_SUPPORT "NO")
set_target_properties(Ogg PROPERTIES XCODE_ATTRIBUTE_GCC_UNROLL_LOOPS "YES")
set_target_properties(Ogg PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer")
endif()
install_all_targets(Ogg)

View File

@ -11,6 +11,11 @@ include(libvorbis_src_files)
add_library(Vorbis STATIC ${file_root})
target_link_libraries(Vorbis Ogg)
if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 8)
set_target_properties( Vorbis PROPERTIES COMPILE_FLAGS -fPIC)
endif()
add_dependencies(Vorbis Ogg)
if (APPLE AND CAUDIO_IOS_BUILD)

View File

@ -9,7 +9,7 @@
PROJECT(Tutorial1_2DSound)
set (SOURCE_FILES
src/Main.cpp
src/main.cpp
)
if(CAUDIO_IOS_BUILD)

View File

@ -9,7 +9,7 @@
PROJECT(Tutorial1_3DSound)
set (SOURCE_FILES
src/Main.cpp
src/main.cpp
)
if(CAUDIO_IOS_BUILD)

View File

@ -10,7 +10,7 @@ PROJECT(Tutorial3_MemoryPlayback)
set (SOURCE_FILES
include/bling.h
src/Main.cpp
src/main.cpp
)
if(CAUDIO_IOS_BUILD)

View File

@ -9,7 +9,7 @@
PROJECT(Tutorial4_AudioCapture)
set (SOURCE_FILES
src/Main.cpp
src/main.cpp
)
if(CAUDIO_IOS_BUILD)

View File

@ -9,7 +9,7 @@
PROJECT(Tutorial5_AudioEffects)
set (SOURCE_FILES
src/Main.cpp
src/main.cpp
)
if(CAUDIO_IOS_BUILD)

View File

@ -11,7 +11,7 @@ PROJECT(Tutorial6_CustomEventHandler)
set (SOURCE_FILES
include/cTestHandler.h
src/cTestHandler.cpp
src/Main.cpp
src/main.cpp
)
if(CAUDIO_IOS_BUILD)

View File

@ -11,7 +11,7 @@ PROJECT(Tutorial7_CustomLogReceiver)
set (SOURCE_FILES
include/cTestLogReceiver.h
src/cTestLogReceiver.cpp
src/Main.cpp
src/main.cpp
)
if(CAUDIO_IOS_BUILD)

View File

@ -13,6 +13,7 @@
#include <list>
#include <vector>
#include <string>
#include <cstddef>
namespace cAudio
{