Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/audio/CMakeLists.txt

198 lines
6.4 KiB
CMake
Raw Normal View History

Multi platform cmake support Signed-off-by: martell <martellmalone@gmail.com>
2014-09-17 11:23:59 +08:00
cmake: - fix Audio engine build on Mac - remove duplicated defintions of _EXPORT_DLL_
2014-11-10 21:33:43 +08:00
set(COCOS_AUDIO_SRC
audio/AudioEngine.cpp
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
Multi platform cmake support Signed-off-by: martell <martellmalone@gmail.com>
2014-09-17 11:23:59 +08:00
if(WINDOWS)
cmake add collect headers list, unify the logic of source add (#18722) * fix mistake for ios lua template * auto select headers depend on sources * change cmake "cocos_build_app" from macro to function * fix cmake dll repeat copy * update travis srcipt * add header list for cocos lib * add header list in cmake files * re-add include dir Classes * improve template cpp var name * remove func get_headers_by_sources * cmake add simulator header list * make source and header collect more clear * improve macos app pkg * improve ios pkg, run failed * revert the ios pak logic, keep older * expand var APP_BIN_DIR scope * fix use sqlite3 error on linux * fix win32 compile error * remove multi-add mistake * try to fix python install issue on travis * fix js-tests build on android * uninstall old python in travis * add travis python print info * fix command ll to ls -l * remove useless link * PYTHON_BIN adapt homebrew python
2018-03-14 13:51:29 +08:00
set(COCOS_AUDIO_PLATFORM_HEADER
audio/win32/AudioDecoderManager.h
audio/win32/AudioDecoder.h
audio/win32/MciPlayer.h
audio/win32/AudioPlayer.h
audio/win32/AudioDecoderOgg.h
audio/win32/AudioMacros.h
audio/win32/AudioEngine-win32.h
audio/win32/AudioDecoderMp3.h
audio/win32/AudioCache.h
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
cmake add collect headers list, unify the logic of source add (#18722) * fix mistake for ios lua template * auto select headers depend on sources * change cmake "cocos_build_app" from macro to function * fix cmake dll repeat copy * update travis srcipt * add header list for cocos lib * add header list in cmake files * re-add include dir Classes * improve template cpp var name * remove func get_headers_by_sources * cmake add simulator header list * make source and header collect more clear * improve macos app pkg * improve ios pkg, run failed * revert the ios pak logic, keep older * expand var APP_BIN_DIR scope * fix use sqlite3 error on linux * fix win32 compile error * remove multi-add mistake * try to fix python install issue on travis * fix js-tests build on android * uninstall old python in travis * add travis python print info * fix command ll to ls -l * remove useless link * PYTHON_BIN adapt homebrew python
2018-03-14 13:51:29 +08:00
cmake: - fix Audio engine build on Mac - remove duplicated defintions of _EXPORT_DLL_
2014-11-10 21:33:43 +08:00
set(COCOS_AUDIO_PLATFORM_SRC
audio/win32/SimpleAudioEngine.cpp
audio/win32/MciPlayer.cpp
mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still)
2014-11-17 06:42:04 +08:00
audio/win32/MciPlayer.h
audio/win32/AudioEngine-win32.cpp
audio/win32/AudioCache.cpp
audio/win32/AudioPlayer.cpp
fixed #17397: Updates CMakeList.txt for win32 audio module (#17401)
2017-02-23 16:13:26 +08:00
audio/win32/AudioDecoder.cpp
audio/win32/AudioDecoderManager.cpp
audio/win32/AudioDecoderMp3.cpp
audio/win32/AudioDecoderOgg.cpp
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
Multi platform cmake support Signed-off-by: martell <martellmalone@gmail.com>
2014-09-17 11:23:59 +08:00
V3 android cmake support, add mac/ios support (#18646) * CMake build improvements * android cmake support * Enable proguard for cocos2d * examples & test cmake support * add android build type param to gradle.properties file * less warnings * update all android configs to recomended settings * fix network cmake error * fix js-tests cmake error * android build config, add cmake * android build config, add cmake * add lua share lib * android lua cmake build fix * fix * luajit test * run fail, still * fix js-warning * correct lua main include * lua test project cmake support android * try to add lua-template cmake support * lua template fix * js_tests support cmake on android * js-tests improve * cmake support js-template * test to realise prebuild * cmake improve, no feature * improve templates cmake * refactor cmake struct * correct cpp-tests cmake * cpp-templates cmake improve * typo fix * cmake struct refator * change default option * adapt new project struct * uniform cmake test style * add_dependencies to support make -j * little struct improve * little fix * adapt cmake bin dir * little improve about cmake version * change build all tests condition * add source_group for Xcode * add mark source files * add more mark source code * add template project to test * add macos info.plist template * add pak macos for all project * lua test icon fix * not consider lua project for now * modify pak method * add another ios toolchain * add ios system library * update ios toolchain, and reduce ios compile errors * reduce error * make ios engine lib compile pass * cpp-empty-test ios bundle * cpp-tests ios support * js-tests ios support * templates project support ios * fix the way of lua-tests package * try to fix lua-template on macOS * comment lua-template sim file * improve display on xcode * update cmake readme * check android compile again * fix android compile error * fix linux cmake res error * update deps version, for cmake * fix lua_template linux compile error * close android cmake support for now * review template android share library name * change PROP_BUILD_TOOLS_VERSION version to 27.0.1 * change android compile version * make `PROP_APP_PLATFORM` back, add comments for android native build * Revert "make `PROP_APP_PLATFORM` back, add comments for android native build" This reverts commit 272ddc19886891b9502cde070753a870c0fdb588.
2018-02-08 09:24:33 +08:00
elseif(ANDROID)
cmake add collect headers list, unify the logic of source add (#18722) * fix mistake for ios lua template * auto select headers depend on sources * change cmake "cocos_build_app" from macro to function * fix cmake dll repeat copy * update travis srcipt * add header list for cocos lib * add header list in cmake files * re-add include dir Classes * improve template cpp var name * remove func get_headers_by_sources * cmake add simulator header list * make source and header collect more clear * improve macos app pkg * improve ios pkg, run failed * revert the ios pak logic, keep older * expand var APP_BIN_DIR scope * fix use sqlite3 error on linux * fix win32 compile error * remove multi-add mistake * try to fix python install issue on travis * fix js-tests build on android * uninstall old python in travis * add travis python print info * fix command ll to ls -l * remove useless link * PYTHON_BIN adapt homebrew python
2018-03-14 13:51:29 +08:00
set(COCOS_AUDIO_PLATFORM_HEADER
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
audio/android/PcmAudioService.h
audio/android/AudioBufferProvider.h
audio/android/IAudioPlayer.h
audio/android/AudioResampler.h
audio/android/AudioDecoder.h
audio/android/AudioResamplerPublic.h
audio/android/AudioMixer.h
audio/android/tinysndfile.h
audio/android/mp3reader.h
audio/android/AudioMixerOps.h
audio/android/cutils/bitops.h
audio/android/cutils/log.h
audio/android/audio.h
audio/android/AudioPlayerProvider.h
audio/android/utils/Utils.h
audio/android/utils/Errors.h
audio/android/utils/Compat.h
audio/android/ccdandroidUtils.h
audio/android/AudioDecoderOgg.h
audio/android/Track.h
audio/android/OpenSLHelper.h
audio/android/PcmAudioPlayer.h
audio/android/AssetFd.h
audio/android/PcmBufferProvider.h
audio/android/CCThreadPool.h
audio/android/audio_utils/include/audio_utils/minifloat.h
audio/android/audio_utils/include/audio_utils/primitives.h
audio/android/audio_utils/include/audio_utils/format.h
audio/android/audio_utils/private/private.h
audio/android/ICallerThreadUtils.h
audio/android/AudioDecoderWav.h
audio/android/AudioDecoderProvider.h
audio/android/UrlAudioPlayer.h
audio/android/AudioDecoderSLES.h
audio/android/AudioDecoderMp3.h
audio/android/PcmData.h
audio/android/jni/cddandroidAndroidJavaEngine.h
audio/android/AudioMixerController.h
audio/android/AudioResamplerCubic.h
audio/android/AudioEngine-inl.h
audio/android/IVolumeProvider.h
cmake add collect headers list, unify the logic of source add (#18722) * fix mistake for ios lua template * auto select headers depend on sources * change cmake "cocos_build_app" from macro to function * fix cmake dll repeat copy * update travis srcipt * add header list for cocos lib * add header list in cmake files * re-add include dir Classes * improve template cpp var name * remove func get_headers_by_sources * cmake add simulator header list * make source and header collect more clear * improve macos app pkg * improve ios pkg, run failed * revert the ios pak logic, keep older * expand var APP_BIN_DIR scope * fix use sqlite3 error on linux * fix win32 compile error * remove multi-add mistake * try to fix python install issue on travis * fix js-tests build on android * uninstall old python in travis * add travis python print info * fix command ll to ls -l * remove useless link * PYTHON_BIN adapt homebrew python
2018-03-14 13:51:29 +08:00
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
cmake add collect headers list, unify the logic of source add (#18722) * fix mistake for ios lua template * auto select headers depend on sources * change cmake "cocos_build_app" from macro to function * fix cmake dll repeat copy * update travis srcipt * add header list for cocos lib * add header list in cmake files * re-add include dir Classes * improve template cpp var name * remove func get_headers_by_sources * cmake add simulator header list * make source and header collect more clear * improve macos app pkg * improve ios pkg, run failed * revert the ios pak logic, keep older * expand var APP_BIN_DIR scope * fix use sqlite3 error on linux * fix win32 compile error * remove multi-add mistake * try to fix python install issue on travis * fix js-tests build on android * uninstall old python in travis * add travis python print info * fix command ll to ls -l * remove useless link * PYTHON_BIN adapt homebrew python
2018-03-14 13:51:29 +08:00
Squashed commit of the following: commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 15:19:48 2016 -0800 uses new naming convention for projects uses _ instead of - commit f97ba56608d48b17909649c8617ba9047b566196 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 14:49:22 2016 -0800 fooling cmake for real commit 20c2560f75eab952e5131b484284bf20cb07fe07 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 14:43:05 2016 -0800 fooling cmake commit a0ada44bc82941830f6c71219a1492d28c28c306 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 14:26:59 2016 -0800 makes CMake for Mac happy commit 656b4f5e2dd741215a4699db979fe1b0dce60298 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 13:50:15 2016 -0800 linux fix commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 11:18:18 2016 -0800 links correctly! commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Mar 1 17:44:58 2016 -0800 Squashed commit of the following: commit 2ef52723dae44204c047cb177d5a5670fb659c79 Merge: 8a5c998 25cf1f1 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Mar 1 16:54:04 2016 -0800 Merge branch 'v3' into cmake_android commit 8a5c9981192e344fffc9f14be5cb14f66eccfa24 Author: Chaoren Lin <chaorenl@google.com> Date: Thu Feb 11 18:34:46 2016 -0800 Fix module name in Android template to match CMake project. commit be85e19e852a9d5fbd6c58cea60c75fe47a5a576 Author: Chaoren Lin <chaorenl@google.com> Date: Thu Feb 11 18:27:45 2016 -0800 Add missing platform specific source file to CMake project. commit 705389ac6582107a381d0cbc56268eaa98ffc5c3 Author: Chaoren Lin <chaorenl@google.com> Date: Wed Feb 10 19:21:12 2016 -0800 Find AndroidNdkModules.cmake relative to android.toolchain.cmake. commit a10075e2cb30af2e1f9a30da99efac880658ad6b Author: Chaoren Lin <chaorenl@google.com> Date: Wed Feb 10 19:03:11 2016 -0800 Remove cpp-empty-test from project templates. commit e070fcbf210b8628f75785e738202a80a95ac0ff Author: WenhaiLin <wenhai.lin@chukong-inc.com> Date: Mon Aug 31 09:56:03 2015 +0800 Fix CMake for Android Target
2016-03-03 08:51:54 +08:00
set(COCOS_AUDIO_PLATFORM_SRC
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
audio/android/cddSimpleAudioEngine.cpp
audio/android/ccdandroidUtils.cpp
audio/android/jni/cddandroidAndroidJavaEngine.cpp
audio/android/AudioEngine-inl.cpp
audio/android/CCThreadPool.cpp
audio/android/AssetFd.cpp
audio/android/AudioDecoder.cpp
audio/android/AudioDecoderProvider.cpp
audio/android/AudioDecoderSLES.cpp
audio/android/AudioDecoderOgg.cpp
audio/android/AudioDecoderMp3.cpp
audio/android/AudioDecoderWav.cpp
audio/android/AudioPlayerProvider.cpp
audio/android/AudioResampler.cpp
audio/android/AudioResamplerCubic.cpp
audio/android/PcmBufferProvider.cpp
audio/android/PcmAudioPlayer.cpp
audio/android/UrlAudioPlayer.cpp
audio/android/PcmData.cpp
audio/android/AudioMixerController.cpp
audio/android/AudioMixer.cpp
audio/android/PcmAudioService.cpp
audio/android/Track.cpp
audio/android/audio_utils/format.c
audio/android/audio_utils/minifloat.cpp
audio/android/audio_utils/primitives.c
audio/android/utils/Utils.cpp
audio/android/mp3reader.cpp
audio/android/tinysndfile.cpp
)
Squashed commit of the following: commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 15:19:48 2016 -0800 uses new naming convention for projects uses _ instead of - commit f97ba56608d48b17909649c8617ba9047b566196 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 14:49:22 2016 -0800 fooling cmake for real commit 20c2560f75eab952e5131b484284bf20cb07fe07 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 14:43:05 2016 -0800 fooling cmake commit a0ada44bc82941830f6c71219a1492d28c28c306 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 14:26:59 2016 -0800 makes CMake for Mac happy commit 656b4f5e2dd741215a4699db979fe1b0dce60298 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 13:50:15 2016 -0800 linux fix commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 11:18:18 2016 -0800 links correctly! commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Mar 1 17:44:58 2016 -0800 Squashed commit of the following: commit 2ef52723dae44204c047cb177d5a5670fb659c79 Merge: 8a5c998 25cf1f1 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Mar 1 16:54:04 2016 -0800 Merge branch 'v3' into cmake_android commit 8a5c9981192e344fffc9f14be5cb14f66eccfa24 Author: Chaoren Lin <chaorenl@google.com> Date: Thu Feb 11 18:34:46 2016 -0800 Fix module name in Android template to match CMake project. commit be85e19e852a9d5fbd6c58cea60c75fe47a5a576 Author: Chaoren Lin <chaorenl@google.com> Date: Thu Feb 11 18:27:45 2016 -0800 Add missing platform specific source file to CMake project. commit 705389ac6582107a381d0cbc56268eaa98ffc5c3 Author: Chaoren Lin <chaorenl@google.com> Date: Wed Feb 10 19:21:12 2016 -0800 Find AndroidNdkModules.cmake relative to android.toolchain.cmake. commit a10075e2cb30af2e1f9a30da99efac880658ad6b Author: Chaoren Lin <chaorenl@google.com> Date: Wed Feb 10 19:03:11 2016 -0800 Remove cpp-empty-test from project templates. commit e070fcbf210b8628f75785e738202a80a95ac0ff Author: WenhaiLin <wenhai.lin@chukong-inc.com> Date: Mon Aug 31 09:56:03 2015 +0800 Fix CMake for Android Target
2016-03-03 08:51:54 +08:00
Multi platform cmake support Signed-off-by: martell <martellmalone@gmail.com>
2014-09-17 11:23:59 +08:00
elseif(LINUX)
cmake add collect headers list, unify the logic of source add (#18722) * fix mistake for ios lua template * auto select headers depend on sources * change cmake "cocos_build_app" from macro to function * fix cmake dll repeat copy * update travis srcipt * add header list for cocos lib * add header list in cmake files * re-add include dir Classes * improve template cpp var name * remove func get_headers_by_sources * cmake add simulator header list * make source and header collect more clear * improve macos app pkg * improve ios pkg, run failed * revert the ios pak logic, keep older * expand var APP_BIN_DIR scope * fix use sqlite3 error on linux * fix win32 compile error * remove multi-add mistake * try to fix python install issue on travis * fix js-tests build on android * uninstall old python in travis * add travis python print info * fix command ll to ls -l * remove useless link * PYTHON_BIN adapt homebrew python
2018-03-14 13:51:29 +08:00
set(COCOS_AUDIO_PLATFORM_HEADER
audio/linux/AudioEngine-linux.h
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
cmake add collect headers list, unify the logic of source add (#18722) * fix mistake for ios lua template * auto select headers depend on sources * change cmake "cocos_build_app" from macro to function * fix cmake dll repeat copy * update travis srcipt * add header list for cocos lib * add header list in cmake files * re-add include dir Classes * improve template cpp var name * remove func get_headers_by_sources * cmake add simulator header list * make source and header collect more clear * improve macos app pkg * improve ios pkg, run failed * revert the ios pak logic, keep older * expand var APP_BIN_DIR scope * fix use sqlite3 error on linux * fix win32 compile error * remove multi-add mistake * try to fix python install issue on travis * fix js-tests build on android * uninstall old python in travis * add travis python print info * fix command ll to ls -l * remove useless link * PYTHON_BIN adapt homebrew python
2018-03-14 13:51:29 +08:00
cmake: - fix Audio engine build on Mac - remove duplicated defintions of _EXPORT_DLL_
2014-11-10 21:33:43 +08:00
set(COCOS_AUDIO_PLATFORM_SRC
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudioEngine now as wrapper of AUdioEngine, upgrade FMOD binaries
2015-11-25 09:54:12 +08:00
audio/linux/SimpleAudioEngine.cpp
audio/linux/AudioEngine-linux.h
audio/linux/AudioEngine-linux.cpp
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
Multi platform cmake support Signed-off-by: martell <martellmalone@gmail.com>
2014-09-17 11:23:59 +08:00
V3 android cmake support, add mac/ios support (#18646) * CMake build improvements * android cmake support * Enable proguard for cocos2d * examples & test cmake support * add android build type param to gradle.properties file * less warnings * update all android configs to recomended settings * fix network cmake error * fix js-tests cmake error * android build config, add cmake * android build config, add cmake * add lua share lib * android lua cmake build fix * fix * luajit test * run fail, still * fix js-warning * correct lua main include * lua test project cmake support android * try to add lua-template cmake support * lua template fix * js_tests support cmake on android * js-tests improve * cmake support js-template * test to realise prebuild * cmake improve, no feature * improve templates cmake * refactor cmake struct * correct cpp-tests cmake * cpp-templates cmake improve * typo fix * cmake struct refator * change default option * adapt new project struct * uniform cmake test style * add_dependencies to support make -j * little struct improve * little fix * adapt cmake bin dir * little improve about cmake version * change build all tests condition * add source_group for Xcode * add mark source files * add more mark source code * add template project to test * add macos info.plist template * add pak macos for all project * lua test icon fix * not consider lua project for now * modify pak method * add another ios toolchain * add ios system library * update ios toolchain, and reduce ios compile errors * reduce error * make ios engine lib compile pass * cpp-empty-test ios bundle * cpp-tests ios support * js-tests ios support * templates project support ios * fix the way of lua-tests package * try to fix lua-template on macOS * comment lua-template sim file * improve display on xcode * update cmake readme * check android compile again * fix android compile error * fix linux cmake res error * update deps version, for cmake * fix lua_template linux compile error * close android cmake support for now * review template android share library name * change PROP_BUILD_TOOLS_VERSION version to 27.0.1 * change android compile version * make `PROP_APP_PLATFORM` back, add comments for android native build * Revert "make `PROP_APP_PLATFORM` back, add comments for android native build" This reverts commit 272ddc19886891b9502cde070753a870c0fdb588.
2018-02-08 09:24:33 +08:00
elseif(APPLE)
# common
cmake add collect headers list, unify the logic of source add (#18722) * fix mistake for ios lua template * auto select headers depend on sources * change cmake "cocos_build_app" from macro to function * fix cmake dll repeat copy * update travis srcipt * add header list for cocos lib * add header list in cmake files * re-add include dir Classes * improve template cpp var name * remove func get_headers_by_sources * cmake add simulator header list * make source and header collect more clear * improve macos app pkg * improve ios pkg, run failed * revert the ios pak logic, keep older * expand var APP_BIN_DIR scope * fix use sqlite3 error on linux * fix win32 compile error * remove multi-add mistake * try to fix python install issue on travis * fix js-tests build on android * uninstall old python in travis * add travis python print info * fix command ll to ls -l * remove useless link * PYTHON_BIN adapt homebrew python
2018-03-14 13:51:29 +08:00
set(COCOS_AUDIO_PLATFORM_HEADER
audio/apple/AudioDecoder.h
audio/apple/AudioPlayer.h
audio/apple/AudioMacros.h
audio/apple/AudioCache.h
audio/apple/AudioEngine-inl.h
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
cmake: - fix Audio engine build on Mac - remove duplicated defintions of _EXPORT_DLL_
2014-11-10 21:33:43 +08:00
set(COCOS_AUDIO_PLATFORM_SRC
audio/apple/AudioCache.mm
Compilation fix (#17209) * Fix various compilation issues. Mostly errors on field initialization order but also missing files in CMakeLists and missing include directives. * Fix compilations issues with GCC 6.2 * Fix gitignore libs/ entry to not ignore the Android external libraries.
2017-02-04 09:46:32 +08:00
audio/apple/AudioDecoder.mm
cmake: - fix Audio engine build on Mac - remove duplicated defintions of _EXPORT_DLL_
2014-11-10 21:33:43 +08:00
audio/apple/AudioEngine-inl.mm
audio/apple/AudioPlayer.mm
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
V3 android cmake support, add mac/ios support (#18646) * CMake build improvements * android cmake support * Enable proguard for cocos2d * examples & test cmake support * add android build type param to gradle.properties file * less warnings * update all android configs to recomended settings * fix network cmake error * fix js-tests cmake error * android build config, add cmake * android build config, add cmake * add lua share lib * android lua cmake build fix * fix * luajit test * run fail, still * fix js-warning * correct lua main include * lua test project cmake support android * try to add lua-template cmake support * lua template fix * js_tests support cmake on android * js-tests improve * cmake support js-template * test to realise prebuild * cmake improve, no feature * improve templates cmake * refactor cmake struct * correct cpp-tests cmake * cpp-templates cmake improve * typo fix * cmake struct refator * change default option * adapt new project struct * uniform cmake test style * add_dependencies to support make -j * little struct improve * little fix * adapt cmake bin dir * little improve about cmake version * change build all tests condition * add source_group for Xcode * add mark source files * add more mark source code * add template project to test * add macos info.plist template * add pak macos for all project * lua test icon fix * not consider lua project for now * modify pak method * add another ios toolchain * add ios system library * update ios toolchain, and reduce ios compile errors * reduce error * make ios engine lib compile pass * cpp-empty-test ios bundle * cpp-tests ios support * js-tests ios support * templates project support ios * fix the way of lua-tests package * try to fix lua-template on macOS * comment lua-template sim file * improve display on xcode * update cmake readme * check android compile again * fix android compile error * fix linux cmake res error * update deps version, for cmake * fix lua_template linux compile error * close android cmake support for now * review template android share library name * change PROP_BUILD_TOOLS_VERSION version to 27.0.1 * change android compile version * make `PROP_APP_PLATFORM` back, add comments for android native build * Revert "make `PROP_APP_PLATFORM` back, add comments for android native build" This reverts commit 272ddc19886891b9502cde070753a870c0fdb588.
2018-02-08 09:24:33 +08:00
# split it in _C and non C
# because C files needs to be compiled with C compiler and not C++
# compiler
if(MACOSX)
cmake add collect headers list, unify the logic of source add (#18722) * fix mistake for ios lua template * auto select headers depend on sources * change cmake "cocos_build_app" from macro to function * fix cmake dll repeat copy * update travis srcipt * add header list for cocos lib * add header list in cmake files * re-add include dir Classes * improve template cpp var name * remove func get_headers_by_sources * cmake add simulator header list * make source and header collect more clear * improve macos app pkg * improve ios pkg, run failed * revert the ios pak logic, keep older * expand var APP_BIN_DIR scope * fix use sqlite3 error on linux * fix win32 compile error * remove multi-add mistake * try to fix python install issue on travis * fix js-tests build on android * uninstall old python in travis * add travis python print info * fix command ll to ls -l * remove useless link * PYTHON_BIN adapt homebrew python
2018-03-14 13:51:29 +08:00
set(COCOS_AUDIO_PLATFORM_HEADER
${COCOS_AUDIO_PLATFORM_HEADER}
audio/mac/CDConfig.h
audio/mac/SimpleAudioEngine_objc.h
audio/mac/CDOpenALSupport.h
audio/mac/CDXMacOSXSupport.h
audio/mac/CDAudioManager.h
audio/mac/CocosDenshion.h
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
V3 android cmake support, add mac/ios support (#18646) * CMake build improvements * android cmake support * Enable proguard for cocos2d * examples & test cmake support * add android build type param to gradle.properties file * less warnings * update all android configs to recomended settings * fix network cmake error * fix js-tests cmake error * android build config, add cmake * android build config, add cmake * add lua share lib * android lua cmake build fix * fix * luajit test * run fail, still * fix js-warning * correct lua main include * lua test project cmake support android * try to add lua-template cmake support * lua template fix * js_tests support cmake on android * js-tests improve * cmake support js-template * test to realise prebuild * cmake improve, no feature * improve templates cmake * refactor cmake struct * correct cpp-tests cmake * cpp-templates cmake improve * typo fix * cmake struct refator * change default option * adapt new project struct * uniform cmake test style * add_dependencies to support make -j * little struct improve * little fix * adapt cmake bin dir * little improve about cmake version * change build all tests condition * add source_group for Xcode * add mark source files * add more mark source code * add template project to test * add macos info.plist template * add pak macos for all project * lua test icon fix * not consider lua project for now * modify pak method * add another ios toolchain * add ios system library * update ios toolchain, and reduce ios compile errors * reduce error * make ios engine lib compile pass * cpp-empty-test ios bundle * cpp-tests ios support * js-tests ios support * templates project support ios * fix the way of lua-tests package * try to fix lua-template on macOS * comment lua-template sim file * improve display on xcode * update cmake readme * check android compile again * fix android compile error * fix linux cmake res error * update deps version, for cmake * fix lua_template linux compile error * close android cmake support for now * review template android share library name * change PROP_BUILD_TOOLS_VERSION version to 27.0.1 * change android compile version * make `PROP_APP_PLATFORM` back, add comments for android native build * Revert "make `PROP_APP_PLATFORM` back, add comments for android native build" This reverts commit 272ddc19886891b9502cde070753a870c0fdb588.
2018-02-08 09:24:33 +08:00
set(COCOS_AUDIO_PLATFORM_SRC_C
audio/mac/CDAudioManager.m
audio/mac/CDOpenALSupport.m
audio/mac/CocosDenshion.m
audio/mac/SimpleAudioEngine_objc.m
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
V3 android cmake support, add mac/ios support (#18646) * CMake build improvements * android cmake support * Enable proguard for cocos2d * examples & test cmake support * add android build type param to gradle.properties file * less warnings * update all android configs to recomended settings * fix network cmake error * fix js-tests cmake error * android build config, add cmake * android build config, add cmake * add lua share lib * android lua cmake build fix * fix * luajit test * run fail, still * fix js-warning * correct lua main include * lua test project cmake support android * try to add lua-template cmake support * lua template fix * js_tests support cmake on android * js-tests improve * cmake support js-template * test to realise prebuild * cmake improve, no feature * improve templates cmake * refactor cmake struct * correct cpp-tests cmake * cpp-templates cmake improve * typo fix * cmake struct refator * change default option * adapt new project struct * uniform cmake test style * add_dependencies to support make -j * little struct improve * little fix * adapt cmake bin dir * little improve about cmake version * change build all tests condition * add source_group for Xcode * add mark source files * add more mark source code * add template project to test * add macos info.plist template * add pak macos for all project * lua test icon fix * not consider lua project for now * modify pak method * add another ios toolchain * add ios system library * update ios toolchain, and reduce ios compile errors * reduce error * make ios engine lib compile pass * cpp-empty-test ios bundle * cpp-tests ios support * js-tests ios support * templates project support ios * fix the way of lua-tests package * try to fix lua-template on macOS * comment lua-template sim file * improve display on xcode * update cmake readme * check android compile again * fix android compile error * fix linux cmake res error * update deps version, for cmake * fix lua_template linux compile error * close android cmake support for now * review template android share library name * change PROP_BUILD_TOOLS_VERSION version to 27.0.1 * change android compile version * make `PROP_APP_PLATFORM` back, add comments for android native build * Revert "make `PROP_APP_PLATFORM` back, add comments for android native build" This reverts commit 272ddc19886891b9502cde070753a870c0fdb588.
2018-02-08 09:24:33 +08:00
set(COCOS_AUDIO_PLATFORM_SRC
${COCOS_AUDIO_PLATFORM_SRC_C}
${COCOS_AUDIO_PLATFORM_SRC}
audio/mac/SimpleAudioEngine.mm
audio/mac/CDXMacOSXSupport.mm
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
V3 android cmake support, add mac/ios support (#18646) * CMake build improvements * android cmake support * Enable proguard for cocos2d * examples & test cmake support * add android build type param to gradle.properties file * less warnings * update all android configs to recomended settings * fix network cmake error * fix js-tests cmake error * android build config, add cmake * android build config, add cmake * add lua share lib * android lua cmake build fix * fix * luajit test * run fail, still * fix js-warning * correct lua main include * lua test project cmake support android * try to add lua-template cmake support * lua template fix * js_tests support cmake on android * js-tests improve * cmake support js-template * test to realise prebuild * cmake improve, no feature * improve templates cmake * refactor cmake struct * correct cpp-tests cmake * cpp-templates cmake improve * typo fix * cmake struct refator * change default option * adapt new project struct * uniform cmake test style * add_dependencies to support make -j * little struct improve * little fix * adapt cmake bin dir * little improve about cmake version * change build all tests condition * add source_group for Xcode * add mark source files * add more mark source code * add template project to test * add macos info.plist template * add pak macos for all project * lua test icon fix * not consider lua project for now * modify pak method * add another ios toolchain * add ios system library * update ios toolchain, and reduce ios compile errors * reduce error * make ios engine lib compile pass * cpp-empty-test ios bundle * cpp-tests ios support * js-tests ios support * templates project support ios * fix the way of lua-tests package * try to fix lua-template on macOS * comment lua-template sim file * improve display on xcode * update cmake readme * check android compile again * fix android compile error * fix linux cmake res error * update deps version, for cmake * fix lua_template linux compile error * close android cmake support for now * review template android share library name * change PROP_BUILD_TOOLS_VERSION version to 27.0.1 * change android compile version * make `PROP_APP_PLATFORM` back, add comments for android native build * Revert "make `PROP_APP_PLATFORM` back, add comments for android native build" This reverts commit 272ddc19886891b9502cde070753a870c0fdb588.
2018-02-08 09:24:33 +08:00
elseif(IOS)
cmake add collect headers list, unify the logic of source add (#18722) * fix mistake for ios lua template * auto select headers depend on sources * change cmake "cocos_build_app" from macro to function * fix cmake dll repeat copy * update travis srcipt * add header list for cocos lib * add header list in cmake files * re-add include dir Classes * improve template cpp var name * remove func get_headers_by_sources * cmake add simulator header list * make source and header collect more clear * improve macos app pkg * improve ios pkg, run failed * revert the ios pak logic, keep older * expand var APP_BIN_DIR scope * fix use sqlite3 error on linux * fix win32 compile error * remove multi-add mistake * try to fix python install issue on travis * fix js-tests build on android * uninstall old python in travis * add travis python print info * fix command ll to ls -l * remove useless link * PYTHON_BIN adapt homebrew python
2018-03-14 13:51:29 +08:00
set(COCOS_AUDIO_PLATFORM_HEADER
${COCOS_AUDIO_PLATFORM_HEADER}
audio/ios/CDConfig.h
audio/ios/SimpleAudioEngine_objc.h
audio/ios/CDOpenALSupport.h
audio/ios/CDAudioManager.h
audio/ios/CocosDenshion.h
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
V3 android cmake support, add mac/ios support (#18646) * CMake build improvements * android cmake support * Enable proguard for cocos2d * examples & test cmake support * add android build type param to gradle.properties file * less warnings * update all android configs to recomended settings * fix network cmake error * fix js-tests cmake error * android build config, add cmake * android build config, add cmake * add lua share lib * android lua cmake build fix * fix * luajit test * run fail, still * fix js-warning * correct lua main include * lua test project cmake support android * try to add lua-template cmake support * lua template fix * js_tests support cmake on android * js-tests improve * cmake support js-template * test to realise prebuild * cmake improve, no feature * improve templates cmake * refactor cmake struct * correct cpp-tests cmake * cpp-templates cmake improve * typo fix * cmake struct refator * change default option * adapt new project struct * uniform cmake test style * add_dependencies to support make -j * little struct improve * little fix * adapt cmake bin dir * little improve about cmake version * change build all tests condition * add source_group for Xcode * add mark source files * add more mark source code * add template project to test * add macos info.plist template * add pak macos for all project * lua test icon fix * not consider lua project for now * modify pak method * add another ios toolchain * add ios system library * update ios toolchain, and reduce ios compile errors * reduce error * make ios engine lib compile pass * cpp-empty-test ios bundle * cpp-tests ios support * js-tests ios support * templates project support ios * fix the way of lua-tests package * try to fix lua-template on macOS * comment lua-template sim file * improve display on xcode * update cmake readme * check android compile again * fix android compile error * fix linux cmake res error * update deps version, for cmake * fix lua_template linux compile error * close android cmake support for now * review template android share library name * change PROP_BUILD_TOOLS_VERSION version to 27.0.1 * change android compile version * make `PROP_APP_PLATFORM` back, add comments for android native build * Revert "make `PROP_APP_PLATFORM` back, add comments for android native build" This reverts commit 272ddc19886891b9502cde070753a870c0fdb588.
2018-02-08 09:24:33 +08:00
set(COCOS_AUDIO_PLATFORM_SRC_C
audio/ios/CDAudioManager.m
audio/ios/CDOpenALSupport.m
audio/ios/CocosDenshion.m
audio/ios/SimpleAudioEngine_objc.m
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
V3 android cmake support, add mac/ios support (#18646) * CMake build improvements * android cmake support * Enable proguard for cocos2d * examples & test cmake support * add android build type param to gradle.properties file * less warnings * update all android configs to recomended settings * fix network cmake error * fix js-tests cmake error * android build config, add cmake * android build config, add cmake * add lua share lib * android lua cmake build fix * fix * luajit test * run fail, still * fix js-warning * correct lua main include * lua test project cmake support android * try to add lua-template cmake support * lua template fix * js_tests support cmake on android * js-tests improve * cmake support js-template * test to realise prebuild * cmake improve, no feature * improve templates cmake * refactor cmake struct * correct cpp-tests cmake * cpp-templates cmake improve * typo fix * cmake struct refator * change default option * adapt new project struct * uniform cmake test style * add_dependencies to support make -j * little struct improve * little fix * adapt cmake bin dir * little improve about cmake version * change build all tests condition * add source_group for Xcode * add mark source files * add more mark source code * add template project to test * add macos info.plist template * add pak macos for all project * lua test icon fix * not consider lua project for now * modify pak method * add another ios toolchain * add ios system library * update ios toolchain, and reduce ios compile errors * reduce error * make ios engine lib compile pass * cpp-empty-test ios bundle * cpp-tests ios support * js-tests ios support * templates project support ios * fix the way of lua-tests package * try to fix lua-template on macOS * comment lua-template sim file * improve display on xcode * update cmake readme * check android compile again * fix android compile error * fix linux cmake res error * update deps version, for cmake * fix lua_template linux compile error * close android cmake support for now * review template android share library name * change PROP_BUILD_TOOLS_VERSION version to 27.0.1 * change android compile version * make `PROP_APP_PLATFORM` back, add comments for android native build * Revert "make `PROP_APP_PLATFORM` back, add comments for android native build" This reverts commit 272ddc19886891b9502cde070753a870c0fdb588.
2018-02-08 09:24:33 +08:00
set(COCOS_AUDIO_PLATFORM_SRC
${COCOS_AUDIO_PLATFORM_SRC_C}
${COCOS_AUDIO_PLATFORM_SRC}
audio/ios/SimpleAudioEngine.mm
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
)
V3 android cmake support, add mac/ios support (#18646) * CMake build improvements * android cmake support * Enable proguard for cocos2d * examples & test cmake support * add android build type param to gradle.properties file * less warnings * update all android configs to recomended settings * fix network cmake error * fix js-tests cmake error * android build config, add cmake * android build config, add cmake * add lua share lib * android lua cmake build fix * fix * luajit test * run fail, still * fix js-warning * correct lua main include * lua test project cmake support android * try to add lua-template cmake support * lua template fix * js_tests support cmake on android * js-tests improve * cmake support js-template * test to realise prebuild * cmake improve, no feature * improve templates cmake * refactor cmake struct * correct cpp-tests cmake * cpp-templates cmake improve * typo fix * cmake struct refator * change default option * adapt new project struct * uniform cmake test style * add_dependencies to support make -j * little struct improve * little fix * adapt cmake bin dir * little improve about cmake version * change build all tests condition * add source_group for Xcode * add mark source files * add more mark source code * add template project to test * add macos info.plist template * add pak macos for all project * lua test icon fix * not consider lua project for now * modify pak method * add another ios toolchain * add ios system library * update ios toolchain, and reduce ios compile errors * reduce error * make ios engine lib compile pass * cpp-empty-test ios bundle * cpp-tests ios support * js-tests ios support * templates project support ios * fix the way of lua-tests package * try to fix lua-template on macOS * comment lua-template sim file * improve display on xcode * update cmake readme * check android compile again * fix android compile error * fix linux cmake res error * update deps version, for cmake * fix lua_template linux compile error * close android cmake support for now * review template android share library name * change PROP_BUILD_TOOLS_VERSION version to 27.0.1 * change android compile version * make `PROP_APP_PLATFORM` back, add comments for android native build * Revert "make `PROP_APP_PLATFORM` back, add comments for android native build" This reverts commit 272ddc19886891b9502cde070753a870c0fdb588.
2018-02-08 09:24:33 +08:00
endif()
cmake: - fix Audio engine build on Mac - remove duplicated defintions of _EXPORT_DLL_
2014-11-10 21:33:43 +08:00
set_source_files_properties(
beauty cmake format, reduce duplicate defines (#18799) * reduce cmake module duplicate * make module use more clear, correct cmake style * keep default physics option * delete the modules distributed with cmake * unify the cmake files format * use AndroidNdkModules at cmake sys modules * add cmake comments for win * update cocos2dx files list, manually
2018-05-02 15:33:01 +08:00
${COCOS_AUDIO_PLATFORM_SRC_C}
PROPERTIES LANGUAGE C
Multi platform cmake support Signed-off-by: martell <martellmalone@gmail.com>
2014-09-17 11:23:59 +08:00
)
endif()
fix cmake android prebuilt libcpufeatures path error (#18847) * add cpufeatures lib output path * added audio header
2018-05-25 09:56:19 +08:00
set(COCOS_AUDIO_HEADER
audio/include/AudioEngine.h
audio/include/Export.h
audio/include/SimpleAudioEngine.h
${COCOS_AUDIO_PLATFORM_HEADER}
)
cmake: - fix Audio engine build on Mac - remove duplicated defintions of _EXPORT_DLL_
2014-11-10 21:33:43 +08:00
list(APPEND COCOS_AUDIO_SRC ${COCOS_AUDIO_PLATFORM_SRC})