Author: akhaldi Date: Fri Nov 5 17:12:31 2010 New Revision: 49488
URL: http://svn.reactos.org/svn/reactos?rev=49488&view=rev Log: [CMAKE] - Improve win32k, lib{jpeg,png,tiff,xslt} and win32k.
Modified: 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/subsystems/win32/win32k/CMakeLists.txt
Modified: branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libjp... ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:12:31 2010 @@ -1,10 +1,15 @@
-add_definitions(-DWIN32 -D_WINDOWS -D_MBCS -DJPEG_DLL) -add_definitions(-Dmain=mainptr) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -DWIN32 + -D_WINDOWS + -D_MBCS + -DJPEG_DLL + -Dmain=mainptr + -D_DLL -D__USE_CRTIMP)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg + ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib)
add_library(libjpeg SHARED jaricom.c
Modified: branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libpn... ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:12:31 2010 @@ -1,9 +1,14 @@
-add_definitions(-DWIN32 -DNDEBUG -D_WINDOWS -DPNG_BUILD_DLL) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -DWIN32 + -DNDEBUG + -D_WINDOWS + -DPNG_BUILD_DLL + -D_DLL -D__USE_CRTIMP)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng + ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib)
add_library(libpng SHARED png.c
Modified: branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libti... ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:12:31 2010 @@ -4,12 +4,12 @@ -DNDEBUG -DBUILD_LIBTIFF_DLL -DDLL_EXPORT - -DUSE_WIN32_FILEIO) + -DUSE_WIN32_FILEIO + -D_DLL -D__USE_CRTIMP)
-add_definitions(-D_DLL -D__USE_CRTIMP) - -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff + ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib)
add_library(libtiff SHARED mkg3states.c
Modified: branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libxs... ============================================================================== --- branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:12:31 2010 @@ -8,9 +8,8 @@ -DHAVE_WIN32_THREADS -D_REENTRANT -D_WINSOCKAPI_ - -DLIBXML_STATIC) - -add_definitions(-D_DLL -D__USE_CRTIMP) + -DLIBXML_STATIC + -D_DLL -D__USE_CRTIMP)
add_library(libxslt SHARED attributes.c
Modified: branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/mesa3... ============================================================================== --- branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:12:31 2010 @@ -3,9 +3,8 @@ -DUSE_EXTERNAL_DXTN_LIB=1 -DBUILD_GL32 -DWIN32 - -DUSE_3DNOW_ASM) - -add_definitions(-D_DLL -D__USE_CRTIMP) + -DUSE_3DNOW_ASM + -D_DLL -D__USE_CRTIMP)
if(ARCH MATCHES i386) add_definitions( @@ -16,17 +15,18 @@ add_definitions(-DGL_NO_STDCALL) endif(ARCH MATCHES i386)
-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/main) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/glapi) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/math) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/tnl) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/shader) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/shader/grammar) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/shader/slang) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/shader/slang/OSDependent/Linux) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/shader/slang/OGLCompilersDLL) +include_directories( + BEFORE include + src + src/main + src/glapi + src/math + src/tnl + src/shader + src/shader/grammar + src/shader/slang + src/shader/slang/OSDependent/Linux + src/shader/slang/OGLCompilersDLL)
list(APPEND SOURCE src/drivers/common/driverfuncs.c @@ -221,8 +221,7 @@ 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) +set_source_files_properties(src/drivers/windows/icd/mesa.def PROPERTIES EXTERNAL_OBJECT TRUE)
if(ARCH MATCHES i386) list(APPEND SOURCE @@ -258,13 +257,6 @@
set_entrypoint(mesa32 0)
-if (NOT MSVC) -# this hides all warnings, is this really wanted ? -#add_definitions(-w) - -endif(NOT MSVC) - - add_importlibs(mesa32 gdi32 user32 msvcrt kernel32 ntdll)
add_dependencies(mesa32 psdk buildno_header)
Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/w... ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:12:31 2010 @@ -7,8 +7,9 @@ ${REACTOS_SOURCE_DIR}/include/reactos/subsys ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
-add_definitions(-DLANGPACK) -add_definitions(-D_WIN32K_) +add_definitions( + -DLANGPACK + -D_WIN32K_)
list(APPEND SOURCE dib/alphablend.c
-
akhaldi＠svn.reactos.org