[asterisk-scf-commits] asterisk-scf/integration/matroska.git branch "matroska2_build_integration" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Nov 14 09:33:33 CST 2011
branch "matroska2_build_integration" has been updated
via 8c0a1368e3b3e2f333b71d2e1ca78213664d2ea9 (commit)
via abcd97a42a88be07253dd4c3d5f916f6f3b644cf (commit)
from f4a0fbd5dabd1cb5c9b0af38b736992f926d9c0c (commit)
Summary of changes:
CMakeLists.txt | 5 +++++
.../coremake/config_helper.h => config_helper.h | 0
corec/CMakeLists.txt | 10 +++++-----
corec/corec/portab.h | 2 +-
libebml2/CMakeLists.txt | 6 +++---
libmatroska2/CMakeLists.txt | 6 +++---
6 files changed, 17 insertions(+), 12 deletions(-)
copy corec/tools/coremake/config_helper.h => config_helper.h (100%)
- Log -----------------------------------------------------------------
commit 8c0a1368e3b3e2f333b71d2e1ca78213664d2ea9
Author: Brent Eagles <beagles at digium.com>
Date: Mon Nov 14 12:02:42 2011 -0330
Build fixes. Especially the addition of the PIC flag to solve linking problem on non-windows build.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61dda40..9addc0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,10 @@
# Root CMakeLists.txt file for the C version of the corec, libebml2 and
# libmatroska2 libraries.
+if (NOT WIN32)
+ add_definitions("-fPIC")
+endif()
+
set(astscf-matroska-config ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
set(astscf-corec_dir ${CMAKE_CURRENT_SOURCE_DIR}/corec PARENT_SCOPE)
set(astscf-ebml2_dir ${CMAKE_CURRENT_SOURCE_DIR}/libebml2 PARENT_SCOPE)
diff --git a/corec/CMakeLists.txt b/corec/CMakeLists.txt
index 49ec297..d01d099 100644
--- a/corec/CMakeLists.txt
+++ b/corec/CMakeLists.txt
@@ -5,10 +5,10 @@ include_directories(.)
include_directories(..)
include_directories(./tools/coremake)
-astscf_component_init(libcorec)
+astscf_component_init(corec)
if(WIN32)
-astscf_component_add_files(libcorec
+astscf_component_add_files(corec
corec/helpers/file/file_win32.c
corec/helpers/system/ccsystem_win32.c
corec/multithread/multithread_win32.c
@@ -17,7 +17,7 @@ astscf_component_add_files(libcorec
corec/str/str_win32.c
)
else()
-astscf_component_add_files(libcorec
+astscf_component_add_files(corec
corec/helpers/file/file_libc.c
corec/helpers/system/ccsystem_posix.c
corec/multithread/multithread_pthread.c
@@ -27,7 +27,7 @@ astscf_component_add_files(libcorec
)
endif()
-astscf_component_add_files(libcorec
+astscf_component_add_files(corec
corec/array/array.c
corec/array/array.h
corec/banned.h
@@ -80,4 +80,4 @@ astscf_component_add_files(libcorec
corec/str/str_utf8.c
default_config.h
)
-astscf_component_build_library(libcorec STATIC)
+astscf_component_build_library(corec STATIC)
diff --git a/libebml2/CMakeLists.txt b/libebml2/CMakeLists.txt
index d7107c9..768e50e 100644
--- a/libebml2/CMakeLists.txt
+++ b/libebml2/CMakeLists.txt
@@ -6,8 +6,8 @@ include_directories(../corec/tools/coremake)
include_directories(../corec)
#add_subdirectory(test)
-astscf_component_init(libebml2)
-astscf_component_add_files(libebml2
+astscf_component_init(ebml2)
+astscf_component_add_files(ebml2
ebmlbinary.c
ebmlcrc.c
ebmlcrc.h
@@ -43,4 +43,4 @@ astscf_component_add_files(libebml2
legacy/ebml/EbmlVoid.h
legacy/ebml/IOCallback.h
)
-astscf_component_build_library(libebml2 STATIC)
+astscf_component_build_library(ebml2 STATIC)
diff --git a/libmatroska2/CMakeLists.txt b/libmatroska2/CMakeLists.txt
index 662c6b3..377b30e 100644
--- a/libmatroska2/CMakeLists.txt
+++ b/libmatroska2/CMakeLists.txt
@@ -7,8 +7,8 @@ include_directories(../corec/tools/coremake)
include_directories(../corec)
include_directories(../libebml2)
-astscf_component_init(libmatroska2)
-astscf_component_add_files(libmatroska2
+astscf_component_init(matroska2)
+astscf_component_add_files(matroska2
matroskamain.c
matroskablock.c
matroska_sem.c
@@ -16,4 +16,4 @@ astscf_component_add_files(libmatroska2
./matroska/matroska_sem.h
./matroska/matroska_internal.h
)
-astscf_component_build_library(libmatroska2 STATIC)
+astscf_component_build_library(matroska2 STATIC)
commit abcd97a42a88be07253dd4c3d5f916f6f3b644cf
Author: Brent Eagles <beagles at digium.com>
Date: Fri Nov 11 16:45:23 2011 -0330
Make it easier for dependent projects to include "config.h" and releated header
files.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a35c764..61dda40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
# Root CMakeLists.txt file for the C version of the corec, libebml2 and
# libmatroska2 libraries.
+set(astscf-matroska-config ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
set(astscf-corec_dir ${CMAKE_CURRENT_SOURCE_DIR}/corec PARENT_SCOPE)
set(astscf-ebml2_dir ${CMAKE_CURRENT_SOURCE_DIR}/libebml2 PARENT_SCOPE)
set(astscf-matroska2_dir ${CMAKE_CURRENT_SOURCE_DIR}/libmatroska2 PARENT_SCOPE)
diff --git a/config_helper.h b/config_helper.h
new file mode 100644
index 0000000..97523bc
--- /dev/null
+++ b/config_helper.h
@@ -0,0 +1,94 @@
+/*
+ $Id: config_helper.h 25 2010-07-07 14:49:45Z robux4 $
+
+ Copyright (c) 2010, CoreCodec, Inc.
+ All rights reserved.
+
+ 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 CoreCodec, Inc. 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 COPYRIGHT OWNER 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.
+*/
+
+#ifndef __CONFIG_HELPER_H
+#define __CONFIG_HELPER_H
+
+/* force some defines */
+
+#if defined(TARGET_WINCE) || defined(TARGET_SYMBIAN)
+#undef COREMAKE_UNICODE
+#define COREMAKE_UNICODE /* platforms where Unicode is mandatory */
+#endif
+
+#if (defined(TARGET_PALMOS) && defined(IX86)) || defined(TARGET_SYMBIAN)
+#undef COREMAKE_STATIC /* platforms where dynamic libraries are not supported */
+#define COREMAKE_STATIC
+#endif
+
+#if (defined(ARM) || defined(MIPS) || defined(SH3) || defined(SH4)) && !defined(TARGET_IPHONE_SDK)
+#undef CONFIG_DYNCODE
+#define CONFIG_DYNCODE /* platforms when dynamic code can be used */
+#endif
+
+#if defined(IX86) || defined(IX86_64)
+#undef CONFIG_UNALIGNED_ACCESS
+#define CONFIG_UNALIGNED_ACCESS /* pointers can use unaligned memory */
+#endif
+
+#if defined(TARGET_WIN32) || defined(TARGET_WIN64) || defined(TARGET_WINCE) || defined(TARGET_OSX) || defined(TARGET_LINUX)
+#define CONFIG_FILEPOS_64 /* platforms where 64 bits file position/size should be favoured */
+#endif
+
+#if defined(TARGET_WINCE) || defined(TARGET_SYMBIAN) || defined(TARGET_PALMOS) || defined(ARM) || defined(MIPS)
+#define CONFIG_FIXED_POINT /* platforms where fixed point arithmetic processing should favoured */
+#endif
+
+/* forbid some defines */
+
+#if defined(TARGET_PALMOS) || defined(TARGET_LINUX) || defined(TARGET_PS2SDK)
+#undef COREMAKE_UNICODE /* platforms where Unicode is handled via UTF-8 strings */
+#endif
+
+#if defined(TARGET_PALMOS)
+#undef CONFIG_FILEPOS_64 /* platforms where 64 bits file position/size should not be used */
+#endif
+
+#if !defined(ARM) || defined(TARGET_SYMBIAN) || defined(TARGET_IPHONE)
+#undef CONFIG_WMMX /* platforms that don't support Wireless MMX CPUs/instructions */
+#endif
+
+#if !defined(ARM) || defined(TARGET_SYMBIAN) || defined(TARGET_PALMOS)
+#undef CONFIG_ARMV6 /* platforms that don't support ARMv6 CPUs/instructions */
+#endif
+
+#if !defined(IX86) || defined(TARGET_SYMBIAN)
+#undef CONFIG_MMX /* platforms that don't support MMX CPUs/instructions */
+#endif
+
+#if !defined(ARM) || (!defined(TARGET_IPHONE) && !defined(TARGET_ANDROID))
+#undef CONFIG_NEON /* platforms that don't support NEON/ARMv7 instructions */
+#endif
+
+#if !defined(POWERPC)
+#undef CONFIG_ALTIVEC
+#endif
+
+#endif /* __CONFIG_HELPER_H */
diff --git a/corec/corec/portab.h b/corec/corec/portab.h
index 5afde26..bf259bc 100644
--- a/corec/corec/portab.h
+++ b/corec/corec/portab.h
@@ -393,7 +393,7 @@ typedef uint64_t uint_fast64_t;
#endif /* _MSC_VER */
-#if !defined(_STDINT_H) && !defined(_STDINT_H_) && !defined(_UINT64_T_DECLARED) // could be used elsewhere
+#if !defined(_STDINT_H) && !defined(_STDINT_H_) && !defined(_UINT64_T_DECLARED) && !defined(_STDINT) // could be used elsewhere
typedef signed long int32_t;
typedef unsigned long uint32_t;
-----------------------------------------------------------------------
--
asterisk-scf/integration/matroska.git
More information about the asterisk-scf-commits
mailing list