Skip to content

Fixed Compiling with Visual Studio 2015 #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hhyyrylainen wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Fixed Compiling with Visual Studio 2015 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
58cc6fd
Fixed OpenAL include path for windows
hhyyrylainen Jun 19, 2016
1406d6a
Fixed string conversions thinking that unicode was used when it wasn't
hhyyrylainen Jun 19, 2016
64acf4e
Fixed undefined references to dlopen when linking executables agains …
hhyyrylainen Jul 23, 2016
5bd82b1
Merge branch 'master' of https://github.com/hhyyrylainen/cAudio
hhyyrylainen Jul 23, 2016
cf32f71
Also version the .so files of the plugins.
TC01 Aug 15, 2016
cb76229
Merge branch 'master' of https://github.com/wildicv/cAudio
hhyyrylainen Aug 19, 2016
e6f18eb
Merge pull request #45 from TC01/plugins_soname
Aug 29, 2016
0933438
Trigger onUpdate signal within cAudioManager. Added demo tutorial8.
Nov 29, 2016
ce5d039
Merge pull request #49 from alreay/master
Dec 4, 2016
8445079
Merge branch 'master' of github.com:hhyyrylainen/cAudio
hhyyrylainen Dec 17, 2016
cd7db35
Removed the precompiled openAL
hhyyrylainen Mar 28, 2018
906f228
Added a new method for creating an audio source from a decoder
hhyyrylainen Mar 29, 2018
fdb25c0
Updated the parameter order to better match the existing functions
hhyyrylainen Mar 29, 2018
b67d4ad
Fixed crashing due to file log being destroyed early on shutdown
hhyyrylainen Mar 29, 2018
b9d3ed4
Added a way to suppress console log
hhyyrylainen Mar 29, 2018
5ec08ab
Fixed compiling on windows when properly installing openal
hhyyrylainen Mar 29, 2018
f7390b5
Added windows undefs
hhyyrylainen Mar 29, 2018
5f81391
Fixed installing cAudio targets on windows
hhyyrylainen Mar 29, 2018
8552241
Made the unicode option sensible (can't be enabled currently)
hhyyrylainen Mar 29, 2018
a2821dd
The audio source name for playing 2d is now printed
hhyyrylainen Mar 31, 2018
f67bd43
adding rudimentary file cache
crodnu Feb 19, 2019
a75b099
Merge pull request #1 from crodnu/master
hhyyrylainen Feb 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/cAudio.suo
/cAudio.vcproj.Wildicv-PC.Wildicv.user
/Build
/build

# /Samples/CSharpAudioPlayer/
/Samples/CSharpAudioPlayer/_ReSharper.cAudioPlayer
Expand Down
8 changes: 8 additions & 0 deletions CMake/Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,11 @@ MACRO_DISPLAY_FEATURE_LOG()
include_directories(
${OPENAL_INCLUDE_DIR}
)

# On Windows it's possible to get an include path that directly contains the headers.
# This breaks the build so here's a fix that requires no changes to the source files
if(WIN32)
include_directories(
"${OPENAL_INCLUDE_DIR}/../"
)
endif()
40 changes: 20 additions & 20 deletions CMake/InstallDependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,32 +55,32 @@ endfunction(install_dll_file)
function(install_all_targets TARGETNAME)
if (WIN32)
install(TARGETS ${TARGETNAME}
BUNDLE DESTINATION "${CMAKE_BINARY_DIR}/bin${CAUDIO_RELEASE_PATH}" CONFIGURATIONS Release None ""
RUNTIME DESTINATION "${CMAKE_BINARY_DIR}/bin${CAUDIO_RELEASE_PATH}" CONFIGURATIONS Release None ""
LIBRARY DESTINATION "${CMAKE_BINARY_DIR}/${CAUDIO_LIB_DIRECTORY}/${CAUDIO_RELEASE_PATH}" CONFIGURATIONS Release None ""
ARCHIVE DESTINATION "${CMAKE_BINARY_DIR}/${CAUDIO_LIB_DIRECTORY}/${CAUDIO_RELEASE_PATH}" CONFIGURATIONS Release None ""
FRAMEWORK DESTINATION "${CMAKE_BINARY_DIR}/${CAUDIO_LIB_DIRECTORY}/${CAUDIO_RELEASE_PATH}" CONFIGURATIONS Release None ""
BUNDLE DESTINATION "bin${CAUDIO_RELEASE_PATH}" CONFIGURATIONS Release None ""
RUNTIME DESTINATION "bin${CAUDIO_RELEASE_PATH}" CONFIGURATIONS Release None ""
LIBRARY DESTINATION "lib/${CAUDIO_RELEASE_PATH}" CONFIGURATIONS Release None ""
ARCHIVE DESTINATION "lib/${CAUDIO_RELEASE_PATH}" CONFIGURATIONS Release None ""
FRAMEWORK DESTINATION "lib/${CAUDIO_RELEASE_PATH}" CONFIGURATIONS Release None ""
)
install(TARGETS ${TARGETNAME}
BUNDLE DESTINATION "${CMAKE_BINARY_DIR}/bin${CAUDIO_DEBUG_PATH}" CONFIGURATIONS Debug
RUNTIME DESTINATION "${CMAKE_BINARY_DIR}/bin${CAUDIO_DEBUG_PATH}" CONFIGURATIONS Debug
LIBRARY DESTINATION "${CMAKE_BINARY_DIR}/${CAUDIO_LIB_DIRECTORY}/${CAUDIO_DEBUG_PATH}" CONFIGURATIONS Debug
ARCHIVE DESTINATION "${CMAKE_BINARY_DIR}/${CAUDIO_LIB_DIRECTORY}/${CAUDIO_DEBUG_PATH}" CONFIGURATIONS Debug
FRAMEWORK DESTINATION "${CMAKE_BINARY_DIR}/${CAUDIO_LIB_DIRECTORY}/${CAUDIO_DEBUG_PATH}" CONFIGURATIONS Debug
BUNDLE DESTINATION "bin${CAUDIO_DEBUG_PATH}" CONFIGURATIONS Debug
RUNTIME DESTINATION "bin${CAUDIO_DEBUG_PATH}" CONFIGURATIONS Debug
LIBRARY DESTINATION "lib/${CAUDIO_DEBUG_PATH}" CONFIGURATIONS Debug
ARCHIVE DESTINATION "lib/${CAUDIO_DEBUG_PATH}" CONFIGURATIONS Debug
FRAMEWORK DESTINATION "lib/${CAUDIO_DEBUG_PATH}" CONFIGURATIONS Debug
)
install(TARGETS ${TARGETNAME}
BUNDLE DESTINATION "${CMAKE_BINARY_DIR}/bin/RelWithDebInfo" CONFIGURATIONS RelWithDebInfo
RUNTIME DESTINATION "${CMAKE_BINARY_DIR}/bin/RelWithDebInfo" CONFIGURATIONS RelWithDebInfo
LIBRARY DESTINATION "${CMAKE_BINARY_DIR}/${CAUDIO_LIB_DIRECTORY}/RelWithDebInfo" CONFIGURATIONS RelWithDebInfo
ARCHIVE DESTINATION "${CMAKE_BINARY_DIR}/${CAUDIO_LIB_DIRECTORY}/RelWithDebInfo" CONFIGURATIONS RelWithDebInfo
FRAMEWORK DESTINATION "${CMAKE_BINARY_DIR}/${CAUDIO_LIB_DIRECTORY}/RelWithDebInfo" CONFIGURATIONS RelWithDebInfo
BUNDLE DESTINATION "bin/" CONFIGURATIONS RelWithDebInfo
RUNTIME DESTINATION "bin/" CONFIGURATIONS RelWithDebInfo
LIBRARY DESTINATION "lib/" CONFIGURATIONS RelWithDebInfo
ARCHIVE DESTINATION "lib/" CONFIGURATIONS RelWithDebInfo
FRAMEWORK DESTINATION "lib/" CONFIGURATIONS RelWithDebInfo
)
install(TARGETS ${TARGETNAME}
BUNDLE DESTINATION "${CMAKE_BINARY_DIR}/bin/MinSizeRel" CONFIGURATIONS MinSizeRel
RUNTIME DESTINATION "${CMAKE_BINARY_DIR}/bin/MinSizeRel" CONFIGURATIONS MinSizeRel
LIBRARY DESTINATION "${CMAKE_BINARY_DIR}/${CAUDIO_LIB_DIRECTORY}/MinSizeRel" CONFIGURATIONS MinSizeRel
ARCHIVE DESTINATION "${CMAKE_BINARY_DIR}/${CAUDIO_LIB_DIRECTORY}/MinSizeRel" CONFIGURATIONS MinSizeRel
FRAMEWORK DESTINATION "${CMAKE_BINARY_DIR}/${CAUDIO_LIB_DIRECTORY}/MinSizeRel" CONFIGURATIONS MinSizeRel
BUNDLE DESTINATION "bin/MinSizeRel" CONFIGURATIONS MinSizeRel
RUNTIME DESTINATION "bin/MinSizeRel" CONFIGURATIONS MinSizeRel
LIBRARY DESTINATION "lib/MinSizeRel" CONFIGURATIONS MinSizeRel
ARCHIVE DESTINATION "lib/MinSizeRel" CONFIGURATIONS MinSizeRel
FRAMEWORK DESTINATION "lib/MinSizeRel" CONFIGURATIONS MinSizeRel
)
elseif (UNIX AND NOT APPLE)
install(TARGETS ${TARGETNAME}
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,5 @@ if(CAUDIO_BUILD_SAMPLES)
add_subdirectory(Examples/Tutorial5_AudioEffects)
add_subdirectory(Examples/Tutorial6_CustomEventHandler)
add_subdirectory(Examples/Tutorial7_CustomLogReceiver)
add_subdirectory(Examples/Tutorial8_CustomManagerEventHandler)
endif()
Binary file removed Dependencies/bin/debug/OpenAL32.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Dependencies/bin/debug/wrap_oal.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Dependencies/bin/release/OpenAL32.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Dependencies/bin/release/wrap_oal.dll
View file
Open in desktop
Binary file not shown.
Loading