diff --git a/cocos2dx/platform/bada/CCAccelerometer_bada.cpp b/cocos2dx/platform/bada/CCAccelerometer_bada.cpp index aa91376db5ea..3499940ea07b 100644 --- a/cocos2dx/platform/bada/CCAccelerometer_bada.cpp +++ b/cocos2dx/platform/bada/CCAccelerometer_bada.cpp @@ -101,6 +101,7 @@ void CCAccelerometer::OnDataReceived(SensorType sensorType, SensorData& sensorDa void CCAccelerometer::setEnable(bool bEnable) { + return; result r = E_INVALID_STATE; if (m_bEnabled == bEnable) { diff --git a/cocos2dx/platform/third_party/bada/src/libjpeg/sdk2.0/.badaprj b/cocos2dx/platform/third_party/bada/src/libjpeg/sdk2.0/.badaprj index c84f00ca3b4b..3435da725a96 100644 --- a/cocos2dx/platform/third_party/bada/src/libjpeg/sdk2.0/.badaprj +++ b/cocos2dx/platform/third_party/bada/src/libjpeg/sdk2.0/.badaprj @@ -2,7 +2,7 @@ 0 C:\bada\2.0.2 - WaveWVGA + WaveHVGA true false diff --git a/cocos2dx/platform/third_party/bada/src/png/sdk2.0/.badaprj b/cocos2dx/platform/third_party/bada/src/png/sdk2.0/.badaprj index c84f00ca3b4b..3435da725a96 100644 --- a/cocos2dx/platform/third_party/bada/src/png/sdk2.0/.badaprj +++ b/cocos2dx/platform/third_party/bada/src/png/sdk2.0/.badaprj @@ -2,7 +2,7 @@ 0 C:\bada\2.0.2 - WaveWVGA + WaveHVGA true false diff --git a/cocos2dx/platform/third_party/bada/src/zlib/sdk2.0/.badaprj b/cocos2dx/platform/third_party/bada/src/zlib/sdk2.0/.badaprj index c84f00ca3b4b..3435da725a96 100644 --- a/cocos2dx/platform/third_party/bada/src/zlib/sdk2.0/.badaprj +++ b/cocos2dx/platform/third_party/bada/src/zlib/sdk2.0/.badaprj @@ -2,7 +2,7 @@ 0 C:\bada\2.0.2 - WaveWVGA + WaveHVGA true false diff --git a/cocos2dx/proj.bada/sdk2.0/.badaprj b/cocos2dx/proj.bada/sdk2.0/.badaprj index c84f00ca3b4b..3435da725a96 100644 --- a/cocos2dx/proj.bada/sdk2.0/.badaprj +++ b/cocos2dx/proj.bada/sdk2.0/.badaprj @@ -2,7 +2,7 @@ 0 C:\bada\2.0.2 - WaveWVGA + WaveHVGA true false diff --git a/licenses/LICENSE_bada_pthread.txt b/licenses/LICENSE_bada_pthread.txt new file mode 100644 index 000000000000..9e040eec0f81 --- /dev/null +++ b/licenses/LICENSE_bada_pthread.txt @@ -0,0 +1,22 @@ +/* + Bada pthread + Copyright (c) 2010 Markovtsev Vadim + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. +*/ diff --git a/licenses/LICENSE_ogg_vorbis.txt b/licenses/LICENSE_ogg_vorbis.txt new file mode 100644 index 000000000000..28de72a9705b --- /dev/null +++ b/licenses/LICENSE_ogg_vorbis.txt @@ -0,0 +1,28 @@ +Copyright (c) 2002-2008 Xiph.org Foundation + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +- Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +- Neither the name of the Xiph.org Foundation nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION +OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.