Permalink
Browse files

Emscripten--, Clang-analyzer bugs fixed

- Emscripten dropped, cannot be supported due to lack of threads
- fixed bugs found by Clang analyzer
- ozCore
  * checking for integer overflows in ensureCapacity()
  • Loading branch information...
1 parent a5a69f0 commit 3b8efd0a29efa3afb6a3ab1543b5956e174213a7 @ducakar committed Apr 14, 2013
View
@@ -173,6 +173,11 @@ elseif( ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.5 )
set( flags "-std=gnu++0x" )
else()
set( flags "-std=c++0x -pedantic -fstrict-enums" )
+
+ # AddressSanitizer.
+ # set( flags "${flags} -fsanitize=address" )
+ # ThreadSanitizer.
+ # set( flags "${flags} -fsanitize=thread -fPIE -pie" )
endif()
set( flags "${flags} -fno-exceptions -fno-rtti -ffast-math -fvisibility-inlines-hidden" )
View
@@ -32,7 +32,6 @@ platforms=(
# Android14-ARM
# Android14-ARMv7a
# Android14-MIPS
-# Emscripten
)
pnaclPrefix="$NACL_SDK_ROOT/toolchain/linux_x86_pnacl/newlib"
@@ -1,26 +0,0 @@
-include( CMakeForceCompiler )
-
-set( EMSCRIPTEN ON )
-set( PCH_DISABLE ON )
-
-set( PLATFORM_EMBEDDED ON )
-set( PLATFORM_NAME "Emscripten" )
-set( PLATFORM_TRIPLET "emscripten" )
-set( PLATFORM_PREFIX "$ENV{EMSCRIPTEN}" )
-set( PLATFORM_PORTS_PREFIX "${CMAKE_SOURCE_DIR}/ports/Emscripten" )
-set( PLATFORM_EXE_SUFFIX ".js" )
-
-set( CMAKE_SYSTEM_NAME "Generic" CACHE STRING "Target system." )
-set( CMAKE_SYSTEM_PROCESSOR "JavaScript" CACHE STRING "Target processor." )
-set( CMAKE_FIND_ROOT_PATH "${PLATFORM_PORTS_PREFIX}/usr;${PLATFORM_PREFIX}/system" )
-set( CMAKE_AR "${PLATFORM_PREFIX}/emar")
-set( CMAKE_RANLIB "${PLATFORM_PREFIX}/emranlib")
-set( CMAKE_C_ARCHIVE_CREATE "${CMAKE_C_COMPILER} -o <TARGET> -emit-llvm <LINK_FLAGS> <OBJECTS>" )
-set( CMAKE_CXX_ARCHIVE_CREATE "${CMAKE_CXX_COMPILER} -o <TARGET> -emit-llvm <LINK_FLAGS> <OBJECTS>" )
-set( CMAKE_C_COMPILER "${PLATFORM_PREFIX}/emcc")
-set( CMAKE_CXX_COMPILER "${PLATFORM_PREFIX}/em++")
-set( CMAKE_C_FLAGS_RELEASE "-O2" CACHE STRING "" )
-set( CMAKE_CXX_FLAGS_RELEASE "-O2" CACHE STRING "" )
-
-cmake_force_c_compiler( ${CMAKE_C_COMPILER} Clang )
-cmake_force_cxx_compiler( ${CMAKE_CXX_COMPILER} Clang )
View
@@ -871,7 +871,7 @@ <h1 class="centre">OpenZone</h1>
</tr>
<tr>
<td>Licenca:</td>
- <td><a href="licences/COPYING.FreeType.txt">FreeType</a></td>
+ <td><a href="licences/COPYING.GPL2.txt">GNU General Public License 2.0</a></td>
</tr>
</table>
View
@@ -870,7 +870,7 @@ <h1 class="centre">OpenZone</h1>
</tr>
<tr>
<td>Licence:</td>
- <td><a href="licences/COPYING.FreeType.txt">FreeType</a></td>
+ <td><a href="licences/COPYING.GPL2.txt">GNU General Public License 2.0</a></td>
</tr>
</table>
@@ -1,169 +0,0 @@
- The FreeType Project LICENSE
- ----------------------------
-
- 2006-Jan-27
-
- Copyright 1996-2002, 2006 by
- David Turner, Robert Wilhelm, and Werner Lemberg
-
-
-
-Introduction
-============
-
- The FreeType Project is distributed in several archive packages;
- some of them may contain, in addition to the FreeType font engine,
- various tools and contributions which rely on, or relate to, the
- FreeType Project.
-
- This license applies to all files found in such packages, and
- which do not fall under their own explicit license. The license
- affects thus the FreeType font engine, the test programs,
- documentation and makefiles, at the very least.
-
- This license was inspired by the BSD, Artistic, and IJG
- (Independent JPEG Group) licenses, which all encourage inclusion
- and use of free software in commercial and freeware products
- alike. As a consequence, its main points are that:
-
- o We don't promise that this software works. However, we will be
- interested in any kind of bug reports. (`as is' distribution)
-
- o You can use this software for whatever you want, in parts or
- full form, without having to pay us. (`royalty-free' usage)
-
- o You may not pretend that you wrote this software. If you use
- it, or only parts of it, in a program, you must acknowledge
- somewhere in your documentation that you have used the
- FreeType code. (`credits')
-
- We specifically permit and encourage the inclusion of this
- software, with or without modifications, in commercial products.
- We disclaim all warranties covering The FreeType Project and
- assume no liability related to The FreeType Project.
-
-
- Finally, many people asked us for a preferred form for a
- credit/disclaimer to use in compliance with this license. We thus
- encourage you to use the following text:
-
- """
- Portions of this software are copyright � <year> The FreeType
- Project (www.freetype.org). All rights reserved.
- """
-
- Please replace <year> with the value from the FreeType version you
- actually use.
-
-
-Legal Terms
-===========
-
-0. Definitions
---------------
-
- Throughout this license, the terms `package', `FreeType Project',
- and `FreeType archive' refer to the set of files originally
- distributed by the authors (David Turner, Robert Wilhelm, and
- Werner Lemberg) as the `FreeType Project', be they named as alpha,
- beta or final release.
-
- `You' refers to the licensee, or person using the project, where
- `using' is a generic term including compiling the project's source
- code as well as linking it to form a `program' or `executable'.
- This program is referred to as `a program using the FreeType
- engine'.
-
- This license applies to all files distributed in the original
- FreeType Project, including all source code, binaries and
- documentation, unless otherwise stated in the file in its
- original, unmodified form as distributed in the original archive.
- If you are unsure whether or not a particular file is covered by
- this license, you must contact us to verify this.
-
- The FreeType Project is copyright (C) 1996-2000 by David Turner,
- Robert Wilhelm, and Werner Lemberg. All rights reserved except as
- specified below.
-
-1. No Warranty
---------------
-
- THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY
- KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS
- BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO
- USE, OF THE FREETYPE PROJECT.
-
-2. Redistribution
------------------
-
- This license grants a worldwide, royalty-free, perpetual and
- irrevocable right and license to use, execute, perform, compile,
- display, copy, create derivative works of, distribute and
- sublicense the FreeType Project (in both source and object code
- forms) and derivative works thereof for any purpose; and to
- authorize others to exercise some or all of the rights granted
- herein, subject to the following conditions:
-
- o Redistribution of source code must retain this license file
- (`FTL.TXT') unaltered; any additions, deletions or changes to
- the original files must be clearly indicated in accompanying
- documentation. The copyright notices of the unaltered,
- original files must be preserved in all copies of source
- files.
-
- o Redistribution in binary form must provide a disclaimer that
- states that the software is based in part of the work of the
- FreeType Team, in the distribution documentation. We also
- encourage you to put an URL to the FreeType web page in your
- documentation, though this isn't mandatory.
-
- These conditions apply to any software derived from or based on
- the FreeType Project, not just the unmodified files. If you use
- our work, you must acknowledge us. However, no fee need be paid
- to us.
-
-3. Advertising
---------------
-
- Neither the FreeType authors and contributors nor you shall use
- the name of the other for commercial, advertising, or promotional
- purposes without specific prior written permission.
-
- We suggest, but do not require, that you use one or more of the
- following phrases to refer to this software in your documentation
- or advertising materials: `FreeType Project', `FreeType Engine',
- `FreeType library', or `FreeType Distribution'.
-
- As you have not signed this license, you are not required to
- accept it. However, as the FreeType Project is copyrighted
- material, only this license, or another one contracted with the
- authors, grants you the right to use, distribute, and modify it.
- Therefore, by using, distributing, or modifying the FreeType
- Project, you indicate that you understand and accept all the terms
- of this license.
-
-4. Contacts
------------
-
- There are two mailing lists related to FreeType:
-
- o freetype@nongnu.org
-
- Discusses general use and applications of FreeType, as well as
- future and wanted additions to the library and distribution.
- If you are looking for support, start in this list if you
- haven't found anything to help you in the documentation.
-
- o freetype-devel@nongnu.org
-
- Discusses bugs, as well as engine internals, design issues,
- specific licenses, porting, etc.
-
- Our home page can be found at
-
- http://www.freetype.org
-
-
---- end of FTL.TXT ---
Oops, something went wrong.

0 comments on commit 3b8efd0

Please sign in to comment.