[vlc-devel] commit: cmake: Support for libs/loader. (Pierre d'Herbemont )
git version control
git at videolan.org
Mon Mar 31 17:41:27 CEST 2008
vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Mon Mar 31 17:39:53 2008 +0200| [500894facc0beab754ebc84b3129a6befc8d7394]
cmake: Support for libs/loader.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=500894facc0beab754ebc84b3129a6befc8d7394
---
.../cmake/CMakeLists/libs_loaders_CMakeLists.txt | 14 ++++++++++++++
.../cmake/CMakeLists/root_CMakeLists.txt | 1 +
extras/buildsystem/cmake/include/config.cmake | 1 +
.../cmake/scripts/convert_vlc_to_cmake.sh | 4 ++++
4 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/extras/buildsystem/cmake/CMakeLists/libs_loaders_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/libs_loaders_CMakeLists.txt
new file mode 100644
index 0000000..560bf6f
--- /dev/null
+++ b/extras/buildsystem/cmake/CMakeLists/libs_loaders_CMakeLists.txt
@@ -0,0 +1,14 @@
+if(ENABLE_LOADER)
+
+set(SOURCES_libloader ldt_keeper.c pe_image.c module.c ext.c win32.c
+ driver.c pe_resource.c resource.c registry.c afl.c vfl.c
+ wrapper.S stubs.s kludge.c)
+
+add_library(loader STATIC ${SOURCES_libloader})
+
+set_target_properties(loader PROPERTIES COMPILE_FLAGS
+ "-D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 -DWIN32_PATH=\\\"\\\" -DTRACE\\\(...\\\)=\\\(void\\\)0 -fno-PIC -U_FILE_OFFSET_BITS -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer")
+
+target_link_libraries(loader pthread)
+
+endif(ENABLE_LOADER)
diff --git a/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
index 35f3e49..d752c1c 100644
--- a/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
+++ b/extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
@@ -29,6 +29,7 @@ add_definitions(-D_GNU_SOURCE)
include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)
# our sources:
+add_subdirectory(libs/loader)
add_subdirectory(src)
add_subdirectory(modules)
add_subdirectory(po)
diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake
index 35cc803..64f2f69 100644
--- a/extras/buildsystem/cmake/include/config.cmake
+++ b/extras/buildsystem/cmake/include/config.cmake
@@ -20,6 +20,7 @@ OPTION( ENABLE_DYNAMIC_PLUGINS "Enable dynamic plugin" ON )
OPTION( UPDATE_CHECK "Enable automatic new version checking" OFF )
OPTION( ENABLE_NO_SYMBOL_CHECK "Don't check symbols of modules against libvlc. (Enabling this option speeds up compilation)" OFF )
OPTION( ENABLE_CONTRIB "Attempt to use VLC contrib system to get the third-party libraries" ON )
+OPTION( ENABLE_LOADER "Enable the win32 codec loader" ON )
if(ENABLE_CONTRIB)
diff --git a/extras/buildsystem/cmake/scripts/convert_vlc_to_cmake.sh b/extras/buildsystem/cmake/scripts/convert_vlc_to_cmake.sh
index 4773176..4cab1f7 100755
--- a/extras/buildsystem/cmake/scripts/convert_vlc_to_cmake.sh
+++ b/extras/buildsystem/cmake/scripts/convert_vlc_to_cmake.sh
@@ -21,6 +21,10 @@ ln -sf ../$cmake_dir/CMakeLists/src_CMakeLists.txt src/CMakeLists.txt
echo "Removing old modules/gui/qt4/CMakeLists.txt"
rm -f modules/gui/qt4/CMakeLists.txt
+echo "Installing libs/loaders/CMakeLists.txt"
+rm -f libs/loaders/CMakeLists.txt
+ln -s ../$cmake_dir/CMakeLists/libs_loaders_CMakeLists.txt libs/loaders/CMakeLists.txt
+
echo "Installing modules/CMakeLists.txt"
rm -f modules/CMakeLists.txt
ln -s ../$cmake_dir/CMakeLists/modules_CMakeLists.txt modules/CMakeLists.txt
More information about the vlc-devel
mailing list