Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[jgardou] 49387: [CMAKE] - add 3rdparty dlls to boot and live cd - use gdi32 spec file - mark user32.def as EXTERNAL_OBJECT

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Nov 1 00:04:46 2010 New Revision: 49387 URL: http://svn.reactos.org/svn/reactos?rev=49387&view=rev Log: [CMAKE] - add 3rdparty dlls to boot and live cd - use gdi32 spec file - mark user32.def as EXTERNAL_OBJECT Modified: branches/cmake-bringup/dll/3rdparty/dxtn/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt branches/cmake-bringup/dll/win32/user32/CMakeLists.txt Modified: branches/cmake-bringup/dll/3rdparty/dxtn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/dxtn… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/dxtn/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/dxtn/CMakeLists.txt [iso-8859-1] Mon Nov 1 00:04:46 2010 @@ -15,3 +15,5 @@ add_importlibs(dxtn msvcrt) add_dependencies(dxtn psdk buildno_header) + +add_cab_target(dxtn 1) Modified: branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libj… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Mon Nov 1 00:04:46 2010 @@ -59,3 +59,5 @@ add_importlibs(libjpeg msvcrt) add_dependencies(libjpeg psdk buildno_header) + +add_cab_target(libjpeg 1) Modified: branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libp… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Mon Nov 1 00:04:46 2010 @@ -30,3 +30,5 @@ add_importlibs(libpng msvcrt kernel32) add_dependencies(libpng psdk buildno_header) + +add_cab_target(libpng 1) Modified: branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libt… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Mon Nov 1 00:04:46 2010 @@ -58,3 +58,5 @@ add_importlibs(libtiff user32 msvcrt kernel32) add_dependencies(libtiff psdk buildno_header) + +add_cab_target(libtiff 1) Modified: branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libx… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Mon Nov 1 00:04:46 2010 @@ -40,3 +40,5 @@ add_importlibs(libxslt msvcrt ws2_32 kernel32) add_dependencies(libxslt psdk buildno_header) + +add_cab_target(libxslt 1) Modified: branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/mesa… ============================================================================== --- branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] Mon Nov 1 00:04:46 2010 @@ -218,7 +218,11 @@ src/vbo/vbo_save_loopback.c src/vbo/vbo_split.c src/vbo/vbo_split_copy.c - src/vbo/vbo_split_inplace.c) + src/vbo/vbo_split_inplace.c + src/drivers/windows/icd/mesa.def) + +set_source_files_properties(src/drivers/windows/icd/mesa.def + PROPERTIES EXTERNAL_OBJECT TRUE) if(ARCH MATCHES i386) list(APPEND SOURCE @@ -261,8 +265,8 @@ endif(NOT MSVC) -target_link_libraries(mesa32 ${CMAKE_CURRENT_SOURCE_DIR}/src/drivers/windows/icd/mesa.def) - add_importlibs(mesa32 gdi32 user32 msvcrt kernel32 ntdll) add_dependencies(mesa32 psdk buildno_header) + +add_cab_target(mesa32 1) Modified: branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] Mon Nov 1 00:04:46 2010 @@ -3,6 +3,8 @@ add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-DLANGPACK) + +spec2def(gdi32.dll gdi32.spec) include_directories(include) @@ -37,7 +39,7 @@ objects/utils.c objects/path.c gdi32.rc - gdi32.def) + ${CMAKE_CURRENT_BINARY_DIR}/gdi32.def) add_library(gdi32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/gdi32_precomp.h.gch Modified: branches/cmake-bringup/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/CMakeLists.txt [iso-8859-1] Mon Nov 1 00:04:46 2010 @@ -64,7 +64,9 @@ windows/winpos.c user32_stubs.c user32.rc - ${CMAKE_CURRENT_SOURCE_DIR}/user32.def) + user32.def) + +set_source_files_properties(user32.def PROPERTIES EXTERNAL_OBJECT TRUE) add_library(user32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/user32_user32.h.gch

14 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2010