Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[akhaldi] 49497: [CMAKE] - Explicitly disable auto imports, and fix the modules that were missed out by the previous related commit. - Dedicated to Usurp.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 21:22:07 2010 New Revision: 49497 URL: http://svn.reactos.org/svn/reactos?rev=49497&view=rev Log: [CMAKE] - Explicitly disable auto imports, and fix the modules that were missed out by the previous related commit. - Dedicated to Usurp. Modified: branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt branches/cmake-bringup/base/shell/explorer/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Fri Nov 5 21:22:07 2010 @@ -1,4 +1,6 @@ -add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) +add_definitions( + -D_CRT_NONSTDC_NO_DEPRECATE + -D_DLL -D__USE_CRTIMP) set_cpp() Modified: branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Fri Nov 5 21:22:07 2010 @@ -5,7 +5,8 @@ -D__ROS_LONG64__ -D_CRT_NONSTDC_NO_DEPRECATE -Dfileno=_fileno - -Disatty=_isatty) + -Disatty=_isatty + -D_DLL -D__USE_CRTIMP) add_executable(winhlp32 callback.c Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Fri Nov 5 21:22:07 2010 @@ -8,8 +8,10 @@ #jgardou #set_cpp() -add_definitions(-DWIN32) -add_definitions(-D__WINDRES__) +add_definitions( + -DWIN32 + -D__WINDRES__ + -D_DLL -D__USE_CRTIMP) #add_pch(explorer ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -47,7 +49,7 @@ utility/dragdropimpl.cpp utility/utility.cpp utility/xmlstorage.cpp - utility/splitpath.c +# utility/splitpath.c msvcrt has _wsplitpath already utility/window.cpp utility/shellbrowserimpl.cpp) # utility/shelltests.cpp @@ -78,7 +80,7 @@ -lmsvcrt -lkernel32 -lntdll) - + set_image_base(explorer 0x00400000) add_dependencies(explorer psdk buildno_header) Modified: branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlp… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Fri Nov 5 21:22:07 2010 @@ -2,7 +2,9 @@ #uncomment this if you want to test c++ compilation #add_subdirectory(test) -add_definitions(-D_STLP_USE_EXCEPTIONS) +add_definitions( + -D_STLP_USE_EXCEPTIONS + -D_DLL -D__USE_CRTIMP) set_cpp() Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Fri Nov 5 21:22:07 2010 @@ -38,10 +38,10 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries") if(ARCH MATCHES i386) -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at") +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,--disable-auto-import") #-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds elseif(ARCH MATCHES amd64) -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at") +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,--disable-auto-import") endif(ARCH MATCHES i386) # adjust the default behaviour of the FIND_XXX() commands:

1 0

[jgardou] 49496: [CMAKE] Fix mingw_dllmain build
by jgardou＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: jgardou Date: Fri Nov 5 18:52:57 2010 New Revision: 49496 URL: http://svn.reactos.org/svn/reactos?rev=49496&view=rev Log: [CMAKE] Fix mingw_dllmain build Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:52:57 2010 @@ -55,7 +55,7 @@ set_property(TARGET mingw_wmain PROPERTY COMPILE_DEFINITIONS WPRFLAG UNICODE _UNICODE) add_dependencies(mingw_wmain psdk) -add_definitions(-DCRTDLL) +add_definitions(-DCRTDLL -D_WINDOWS_) add_library(mingw_dllmain crtdll.c dllargv.c) add_dependencies(mingw_dllmain psdk)

1 0

[akhaldi] 49495: [MMC] - Remove pragma once from the main header.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 18:41:05 2010 New Revision: 49495 URL: http://svn.reactos.org/svn/reactos?rev=49495&view=rev Log: [MMC] - Remove pragma once from the main header. Modified: branches/cmake-bringup/base/applications/mmc/precomp.h Modified: branches/cmake-bringup/base/applications/mmc/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mmc/precomp.h [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mmc/precomp.h [iso-8859-1] Fri Nov 5 18:41:05 2010 @@ -1,4 +1,3 @@ -#pragma once #include <windows.h> #include <commctrl.h>

1 0

[akhaldi] 49494: [CMAKE] - Update spec2def use in bzip2.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 18:35:47 2010 New Revision: 49494 URL: http://svn.reactos.org/svn/reactos?rev=49494&view=rev Log: [CMAKE] - Update spec2def use in bzip2. Modified: branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/bzip… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:35:47 2010 @@ -1,7 +1,7 @@ add_definitions(-DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY) -spec2def(bzip2 unbzip2.spec) +spec2def(unbzip2.sys unbzip2.spec) list(APPEND SOURCE bzlib.c

1 0

[akhaldi] 49493: [CMAKE] - Fix a typo.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 18:09:09 2010 New Revision: 49493 URL: http://svn.reactos.org/svn/reactos?rev=49493&view=rev Log: [CMAKE] - Fix a typo. Modified: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt Modified: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/m… ============================================================================== --- branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:09:09 2010 @@ -33,7 +33,7 @@ list(APPEND SOURCE bugcodes.mc errcodes.mc - netevent.mc + neteventmsg.mc ntstatus.mc pciclass.mc) MACRO_ADD_MESSAGE_HEADERS(${SOURCE})

1 0

[akhaldi] 49492: [CMAKE] - Remove wpp from build. - Improve several tools and libs. - Improve the root cmake file.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 18:06:25 2010 New Revision: 49492 URL: http://svn.reactos.org/svn/reactos?rev=49492&view=rev Log: [CMAKE] - Remove wpp from build. - Improve several tools and libs. - Improve the root cmake file. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/include/reactos/mc/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt branches/cmake-bringup/lib/cmlib/CMakeLists.txt branches/cmake-bringup/lib/dnslib/CMakeLists.txt branches/cmake-bringup/tools/CMakeLists.txt branches/cmake-bringup/tools/mkhive/CMakeLists.txt branches/cmake-bringup/tools/nci/CMakeLists.txt branches/cmake-bringup/tools/unicode/CMakeLists.txt branches/cmake-bringup/tools/widl/CMakeLists.txt branches/cmake-bringup/tools/winebuild/CMakeLists.txt branches/cmake-bringup/tools/wmc/CMakeLists.txt branches/cmake-bringup/tools/wpp/CMakeLists.txt branches/cmake-bringup/tools/wrc/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -29,12 +29,13 @@ add_definitions(-DTARGET_i386) -include_directories(${REACTOS_SOURCE_DIR}/tools/unicode) -include_directories(include) -include_directories(include/host) -include_directories(include/reactos) -include_directories(include/reactos/wine) -include_directories(${REACTOS_BINARY_DIR}/include) +include_directories( + ${REACTOS_SOURCE_DIR}/tools/unicode + include + include/host + include/reactos + include/reactos/wine + ${REACTOS_BINARY_DIR}/include) add_subdirectory(tools) add_subdirectory(lib) @@ -48,12 +49,13 @@ else() #Some cleanup -file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt) -file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt) -file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt) -file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt) -file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_cab.txt) -file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt) +file(REMOVE + ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt + ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt + ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt + ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt + ${REACTOS_BINARY_DIR}/boot/ros_cab.txt + ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt) #Some useful variables set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd") @@ -66,7 +68,7 @@ enable_language(RC) if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR) - set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build) + set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build) endif() set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables") @@ -89,26 +91,27 @@ add_definitions(-D_M_IX86 -D_X86_ -D__i386__) # Other -add_definitions(-DUSE_COMPILER_EXCEPTIONS) -add_definitions(-D_USE_32BIT_TIME_T) +add_definitions(-DUSE_COMPILER_EXCEPTIONS -D_USE_32BIT_TIME_T) -include_directories(include) -include_directories(include/psdk) -include_directories(include/dxsdk) -include_directories(${REACTOS_BINARY_DIR}/include) -include_directories(${REACTOS_BINARY_DIR}/include/dxsdk) -include_directories(${REACTOS_BINARY_DIR}/include/psdk) -include_directories(${REACTOS_BINARY_DIR}/include/reactos) -include_directories(include/crt) +include_directories( + include + include/psdk + include/dxsdk + ${REACTOS_BINARY_DIR}/include + ${REACTOS_BINARY_DIR}/include/dxsdk + ${REACTOS_BINARY_DIR}/include/psdk + ${REACTOS_BINARY_DIR}/include/reactos + include/crt + include/ddk + include/ndk + include/reactos + include/reactos/libs) + if(MSVC) include_directories(include/crt/msc) else() include_directories(include/crt/mingw32) endif(MSVC) -include_directories(include/ddk) -include_directories(include/ndk) -include_directories(include/reactos) -include_directories(include/reactos/libs) add_subdirectory(include/psdk) add_subdirectory(include/dxsdk) @@ -189,4 +192,3 @@ include(ros_cd.cmake) endif() - Modified: branches/cmake-bringup/include/reactos/mc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/m… ============================================================================== --- branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/mc/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,17 +1,17 @@ if(MSVC) -MACRO(MACRO_MC FILE) +macro(MACRO_MC FILE) set (COMMAND_MC mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc) -ENDMACRO() +endmacro() else() -MACRO(MACRO_MC FILE) +macro(MACRO_MC FILE) set(COMMAND_MC ${MINGW_PREFIX}windmc -A -b ${REACTOS_SOURCE_DIR}/include/reactos/mc/${FILE}.mc -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos) -ENDMACRO() +endmacro() endif() -MACRO (MACRO_ADD_MESSAGE_HEADERS) +macro (MACRO_ADD_MESSAGE_HEADERS) - FOREACH(_in_FILE ${ARGN}) + foreach(_in_FILE ${ARGN}) get_filename_component(FILE ${_in_FILE} NAME_WE) MACRO_MC(${FILE}) @@ -26,9 +26,14 @@ ) add_custom_target(${FILE} ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.h ${REACTOS_BINARY_DIR}/include/reactos/${FILE}.rc) - ENDFOREACH(_in_FILE ${ARGN}) + endforeach(_in_FILE ${ARGN}) -ENDMACRO (MACRO_ADD_MESSAGE_HEADERS) +endmacro (MACRO_ADD_MESSAGE_HEADERS) -file(GLOB_RECURSE SOURCE "*.mc") +list(APPEND SOURCE + bugcodes.mc + errcodes.mc + netevent.mc + ntstatus.mc + pciclass.mc) MACRO_ADD_MESSAGE_HEADERS(${SOURCE}) Modified: branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/full… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/fullfat/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,6 +1,20 @@ + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fullfat) add_definitions(-D__NTDRIVER__) -file(GLOB_RECURSE SOURCE "*.c") -add_library(fullfat ${SOURCE}) +list(APPEND SOURCE + ff_blk.c + ff_crc.c + ff_dir.c + ff_error.c + ff_fat.c + ff_file.c + ff_hash.c + ff_ioman.c + ff_memory.c + ff_safety.c + ff_string.c + ff_time.c) + +add_library(fullfat ${SOURCE}) Modified: branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/icu4… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/icu4ros/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,50 +1,52 @@ -include_directories(icu/source/common) -include_directories(icu/source/i18n) -add_definitions(-DHAVE_EXPAT_CONFIG_H) -add_definitions(-DU_STATIC_IMPLEMENTATION) -add_definitions(-DU_HAVE_INTTYPES_H) -add_definitions(-DUCONFIG_NO_FILE_IO=1) -add_definitions(-DICU_NO_USER_DATA_OVERRIDE=1) +include_directories( + icu/source/common + icu/source/i18n) -set(SOURCE - "stubs.cpp" - "icu/source/common/bmpset.cpp" - "icu/source/common/uhash_us.cpp" - "icu/source/common/uidna.cpp" - "icu/source/common/unifilt.cpp" - "icu/source/common/unifunct.cpp" - "icu/source/common/uniset.cpp" - "icu/source/common/unisetspan.cpp" - "icu/source/common/unistr.cpp" - "icu/source/common/unorm.cpp" - "icu/source/common/uobject.cpp" - "icu/source/common/uobject.cpp" - "icu/source/common/uset.cpp" - "icu/source/common/usprep.cpp" - "icu/source/common/uiter.cpp" - "icu/source/common/util.cpp" - "icu/source/common/cmemory.c" - "icu/source/common/cstring.c" - "icu/source/common/locmap.c" - "icu/source/common/punycode.c" - "icu/source/common/ubidi_props.c" - "icu/source/common/ucln_cmn.c" - "icu/source/common/ucmndata.c" - "icu/source/common/ucol_swp.c" - "icu/source/common/udata.c" - "icu/source/common/udatamem.c" - "icu/source/common/udataswp.c" - "icu/source/common/uhash.c" - "icu/source/common/uinit.c" - "icu/source/common/uinvchar.c" - "icu/source/common/umapfile.c" - "icu/source/common/umath.c" - "icu/source/common/umutex.c" - "icu/source/common/ustring.c" - "icu/source/common/ustrtrns.c" - "icu/source/common/utf_impl.c" - "icu/source/common/utrie.c" - ) +add_definitions( + -DHAVE_EXPAT_CONFIG_H + -DU_STATIC_IMPLEMENTATION + -DU_HAVE_INTTYPES_H + -DUCONFIG_NO_FILE_IO=1 + -DICU_NO_USER_DATA_OVERRIDE=1) -add_library(icu4ros ${SOURCE}) +list(APPEND SOURCE + stubs.cpp + icu/source/common/bmpset.cpp + icu/source/common/uhash_us.cpp + icu/source/common/uidna.cpp + icu/source/common/unifilt.cpp + icu/source/common/unifunct.cpp + icu/source/common/uniset.cpp + icu/source/common/unisetspan.cpp + icu/source/common/unistr.cpp + icu/source/common/unorm.cpp + icu/source/common/uobject.cpp + icu/source/common/uobject.cpp + icu/source/common/uset.cpp + icu/source/common/usprep.cpp + icu/source/common/uiter.cpp + icu/source/common/util.cpp + icu/source/common/cmemory.c + icu/source/common/cstring.c + icu/source/common/locmap.c + icu/source/common/punycode.c + icu/source/common/ubidi_props.c + icu/source/common/ucln_cmn.c + icu/source/common/ucmndata.c + icu/source/common/ucol_swp.c + icu/source/common/udata.c + icu/source/common/udatamem.c + icu/source/common/udataswp.c + icu/source/common/uhash.c + icu/source/common/uinit.c + icu/source/common/uinvchar.c + icu/source/common/umapfile.c + icu/source/common/umath.c + icu/source/common/umutex.c + icu/source/common/ustring.c + icu/source/common/ustrtrns.c + icu/source/common/utf_impl.c + icu/source/common/utrie.c) + +add_library(icu4ros ${SOURCE}) Modified: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libm… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,3 +1,4 @@ + add_definitions( -DOPT_I386 -DREAL_IS_FLOAT Modified: branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libs… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,4 +1,12 @@ -add_definitions(-DHAVE_LRINT -DHAVE_LRINTF) -file(GLOB_RECURSE SOURCE "*.c") -add_library(libsamplerate ${SOURCE}) +add_definitions( + -DHAVE_LRINT + -DHAVE_LRINTF) + +list(APPEND SOURCE + samplerate.c + src_linear.c + src_sinc.c + src_zoh.c) + +add_library(libsamplerate ${SOURCE}) Modified: branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libw… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,8 +1,12 @@ + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -file(GLOB_RECURSE SOURCE "*.c") -list(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/debug.c) +list(APPEND SOURCE + config.c + debug_ros.c + loader.c + string.c) add_library(wine ${SOURCE}) Modified: branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libx… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,54 +1,63 @@ -include_directories(.) -include_directories(./include) -add_definitions(-D__MINGW32__ -DLIBXML_STATIC -D_REENTRANT -DHAVE_WIN32_THREADS -D_MBCS -D_WINDOWS -DWIN32 -DHAVE_CONFIG_H) -add_definitions(-D_DLL -D__USE_CRTIMP) +include_directories( + . + include) + +add_definitions( + -D__MINGW32__ + -DLIBXML_STATIC + -D_REENTRANT + -DHAVE_WIN32_THREADS + -D_MBCS + -D_WINDOWS + -DWIN32 + -DHAVE_CONFIG_H + -D_DLL -D__USE_CRTIMP) list(APPEND SOURCE - c14n.c - catalog.c - chvalid.c - debugXML.c - dict.c - DOCBparser.c - encoding.c - entities.c - error.c - globals.c - hash.c - HTMLparser.c - HTMLtree.c - legacy.c - list.c - nanoftp.c - nanohttp.c - parser.c - parserInternals.c - pattern.c - relaxng.c - SAX.c - SAX2.c - threads.c - tree.c - uri.c - valid.c - xinclude.c - xlink.c - xmlIO.c - xmlmemory.c - xmlreader.c - xmlregexp.c - xmlmodule.c - xmlsave.c - xmlschemas.c - xmlschemastypes.c - xmlunicode.c - xmlwriter.c - xpath.c - xpointer.c - xmlstring.c -) + c14n.c + catalog.c + chvalid.c + debugXML.c + dict.c + DOCBparser.c + encoding.c + entities.c + error.c + globals.c + hash.c + HTMLparser.c + HTMLtree.c + legacy.c + list.c + nanoftp.c + nanohttp.c + parser.c + parserInternals.c + pattern.c + relaxng.c + SAX.c + SAX2.c + threads.c + tree.c + uri.c + valid.c + xinclude.c + xlink.c + xmlIO.c + xmlmemory.c + xmlreader.c + xmlregexp.c + xmlmodule.c + xmlsave.c + xmlschemas.c + xmlschemastypes.c + xmlunicode.c + xmlwriter.c + xpath.c + xpointer.c + xmlstring.c) add_library(libxml2 ${SOURCE}) target_link_libraries(libxml2 oldnames) -add_dependencies(libxml2 psdk) +add_dependencies(libxml2 psdk) Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -8,35 +8,35 @@ endif(NOT MSVC) list(APPEND MINGW_COMMON_SOURCE - _newmode.c - atonexit.c - binmode.c - charmax.c - cinitexe.c - CRT_fp10.c - CRT_fp8.c - CRT_glob.c - crt_handler.c - dllentry.c - gccmain.c - gs_support.c - merr.c - mingw_helpers.c - natstart.c - pesect.c - pseudo-reloc.c - pseudo-reloc-list.c - tlsmcrt.c - tlsmthread.c - tlssup.c - tlsthrd.c - txtmode.c - wildcard.c - xncommod.c - xthdloc.c - xtxtmode.c - ofmt_stub.c - cxa_pure_virtual.c) + _newmode.c + atonexit.c + binmode.c + charmax.c + cinitexe.c + CRT_fp10.c + CRT_fp8.c + CRT_glob.c + crt_handler.c + dllentry.c + gccmain.c + gs_support.c + merr.c + mingw_helpers.c + natstart.c + pesect.c + pseudo-reloc.c + pseudo-reloc-list.c + tlsmcrt.c + tlsmthread.c + tlssup.c + tlsthrd.c + txtmode.c + wildcard.c + xncommod.c + xthdloc.c + xtxtmode.c + ofmt_stub.c + cxa_pure_virtual.c) add_library(mingw_common ${MINGW_COMMON_SOURCE}) Modified: branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlp… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -7,37 +7,37 @@ set_cpp() list(APPEND SOURCE - src/allocators.cpp - src/bitset.cpp - src/codecvt.cpp - src/collate.cpp - src/complex.cpp - src/complex_io.cpp - src/complex_trig.cpp - src/ctype.cpp - src/dll_main.cpp - src/facets_byname.cpp - src/fstream.cpp - src/ios.cpp - src/iostream.cpp - src/istream.cpp - src/locale.cpp - src/locale_catalog.cpp - src/locale_impl.cpp - src/messages.cpp - src/monetary.cpp - src/num_get.cpp - src/num_get_float.cpp - src/num_put.cpp - src/num_put_float.cpp - src/numpunct.cpp - src/ostream.cpp - src/sstream.cpp - src/stdio_streambuf.cpp - src/string.cpp - src/strstream.cpp - src/time_facets.cpp - src/c_locale.c - src/cxa.c) + src/allocators.cpp + src/bitset.cpp + src/codecvt.cpp + src/collate.cpp + src/complex.cpp + src/complex_io.cpp + src/complex_trig.cpp + src/ctype.cpp + src/dll_main.cpp + src/facets_byname.cpp + src/fstream.cpp + src/ios.cpp + src/iostream.cpp + src/istream.cpp + src/locale.cpp + src/locale_catalog.cpp + src/locale_impl.cpp + src/messages.cpp + src/monetary.cpp + src/num_get.cpp + src/num_get_float.cpp + src/num_put.cpp + src/num_put_float.cpp + src/numpunct.cpp + src/ostream.cpp + src/sstream.cpp + src/stdio_streambuf.cpp + src/string.cpp + src/strstream.cpp + src/time_facets.cpp + src/c_locale.c + src/cxa.c) add_library(stlport ${SOURCE}) Modified: branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/zlib… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,18 +1,25 @@ - -file(GLOB_RECURSE SOURCE "*.c") - -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/minigzip.c) -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/example.c) add_definitions(-DNO_VIZ) +list(APPEND SOURCE + adler32.c + compress.c + crc32.c + deflate.c + gzclose.c + gzlib.c + gzread.c + gzwrite.c + infback.c + inffast.c + inflate.c + inftrees.c + trees.c + uncompr.c + zutil.c) + if(CMAKE_CROSSCOMPILING) - add_library(zlib ${SOURCE}) - else() - add_library(zlibhost ${SOURCE}) - endif() - Modified: branches/cmake-bringup/lib/cmlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/cmlib/CMakeLi… ============================================================================== --- branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,18 +1,25 @@ -file(GLOB_RECURSE SOURCE "*.c") +add_definitions( + -D_NTOSKRNL_ + -D_NTSYSTEM_ + -DNASSERT) -add_definitions(-D_NTOSKRNL_ -D_NTSYSTEM_ -DNASSERT) +list(APPEND SOURCE + cminit.c + hivebin.c + hivecell.c + hiveinit.c + hivesum.c + hivewrt.c) if(CMAKE_CROSSCOMPILING) - add_library(cmlib ${SOURCE}) add_dependencies(cmlib bugcodes) - else() - -add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DCMLIB_HOST) +add_definitions( + -DWINE_UNICODE_API= + -D__NO_CTYPE_INLINES + -DCMLIB_HOST) add_library(cmlibhost ${SOURCE}) target_link_libraries(cmlibhost unicode) - endif() - Modified: branches/cmake-bringup/lib/dnslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/dnslib/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/dnslib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/dnslib/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,7 +1,25 @@ + include_directories(inc) add_definitions(-DUNICODE -D_UNICODE) -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + addr.c + debug.c + dnsaddr.c + dnsutil.c + flatbuf.c + hostent.c + ip6.c + memory.c + name.c + print.c + record.c + rrprint.c + sablob.c + straddr.c + string.c + table.c + utf8.c) -add_library(dnslib ${SOURCE}) +add_library(dnslib ${SOURCE}) Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -13,7 +13,7 @@ add_subdirectory(winebuild) if(NOT MSVC) #add_subdirectory(rsym) -add_subdirectory(wpp) +#add_subdirectory(wpp) #add_subdirectory(wmc) add_subdirectory(widl) #add_subdirectory(wrc) Modified: branches/cmake-bringup/tools/mkhive/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/mkhive/CMak… ============================================================================== --- branches/cmake-bringup/tools/mkhive/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/mkhive/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,3 +1,13 @@ + +add_definitions( + -DMKHIVE_HOST + -DWINE_UNICODE_API= ) + +include_directories( + ${REACTOS_SOURCE_DIR}/lib/newinflib + ${REACTOS_SOURCE_DIR}/lib/cmlib + ${REACTOS_SOURCE_DIR}/lib/rtl) + list(APPEND SOURCE binhive.c cmi.c @@ -6,12 +16,5 @@ registry.c rtl.c) -add_definitions(-DMKHIVE_HOST) -add_definitions(-DWINE_UNICODE_API= ) - -include_directories(${REACTOS_SOURCE_DIR}/lib/newinflib) -include_directories(${REACTOS_SOURCE_DIR}/lib/cmlib) -include_directories(${REACTOS_SOURCE_DIR}/lib/rtl) - add_executable(mkhive ${SOURCE}) -target_link_libraries(mkhive unicode cmlibhost newinflibhost) +target_link_libraries(mkhive unicode cmlibhost newinflibhost) Modified: branches/cmake-bringup/tools/nci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/nci/CMakeLi… ============================================================================== --- branches/cmake-bringup/tools/nci/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/nci/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,3 +1,2 @@ -file(GLOB_RECURSE SOURCE "*.c") -add_executable(nci ${SOURCE}) +add_executable(nci ncitool.c) Modified: branches/cmake-bringup/tools/unicode/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/unicode/CMa… ============================================================================== --- branches/cmake-bringup/tools/unicode/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/unicode/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,9 +1,76 @@ - -file(GLOB_RECURSE SOURCE "*.c") - -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/fold.c) -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/sortkey.c) add_definitions(-DWINE_UNICODE_API= ) +list(APPEND SOURCE + casemap.c + compose.c + cptable.c + mbtowc.c + string.c + wctomb.c + wctype.c + utf8.c + c_037.c + c_424.c + c_437.c + c_500.c + c_737.c + c_775.c + c_850.c + c_852.c + c_855.c + c_856.c + c_857.c + c_860.c + c_861.c + c_862.c + c_863.c + c_864.c + c_865.c + c_866.c + c_869.c + c_874.c + c_875.c + c_878.c + c_932.c + c_936.c + c_949.c + c_950.c + c_1006.c + c_1026.c + c_1250.c + c_1251.c + c_1252.c + c_1253.c + c_1254.c + c_1255.c + c_1256.c + c_1257.c + c_1258.c + c_1361.c + c_10000.c + c_10006.c + c_10007.c + c_10029.c + c_10079.c + c_10081.c + c_20866.c + c_20932.c + c_20127.c + c_21866.c + c_28591.c + c_28592.c + c_28593.c + c_28594.c + c_28595.c + c_28596.c + c_28597.c + c_28598.c + c_28599.c + c_28600.c + c_28603.c + c_28604.c + c_28605.c + c_28606.c) + add_library(unicode ${SOURCE}) Modified: branches/cmake-bringup/tools/widl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/widl/CMakeL… ============================================================================== --- branches/cmake-bringup/tools/widl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/widl/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,9 +1,24 @@ -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + client.c + expr.c + hash.c + header.c + proxy.c + server.c + typegen.c + typelib.c + typetree.c + utils.c + widl.c + write_msft.c + parser.yy.c + parser.tab.c + port/mkstemps.c) # Taken from widl.rbuild add_definitions(-DINT16=SHORT) add_executable(widl ${SOURCE}) -target_link_libraries(widl wpp) +target_link_libraries(widl wpp) Modified: branches/cmake-bringup/tools/winebuild/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/winebuild/C… ============================================================================== --- branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/winebuild/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -9,13 +9,13 @@ res32.c spec16.c spec32.c - utils.c -) + utils.c) add_definitions(-DEXEEXT=".exe") if(NOT UNIX) -add_definitions(-Dpclose=_pclose) -add_definitions(-Dpopen=_popen) +add_definitions( + -Dpclose=_pclose + -Dpopen=_popen) endif() if(MSVC) list(APPEND SOURCE getopt.c getpid.c) @@ -24,6 +24,6 @@ add_executable(winebuild ${SOURCE} ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) -SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/include/reactos/buildno.h PROPERTIES GENERATED TRUE) +set_source_files_properties(${REACTOS_BINARY_DIR}/include/reactos/buildno.h PROPERTIES GENERATED TRUE) -ADD_DEPENDENCIES(winebuild build_header) +add_dependencies(winebuild build_header) Modified: branches/cmake-bringup/tools/wmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/wmc/CMakeLi… ============================================================================== --- branches/cmake-bringup/tools/wmc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/wmc/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,5 +1,11 @@ -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + lang.c + mcl.c + utils.c + wmc.c + write.c + mcy.tab.c) add_executable(wmc ${SOURCE}) Modified: branches/cmake-bringup/tools/wpp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/wpp/CMakeLi… ============================================================================== --- branches/cmake-bringup/tools/wpp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/wpp/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,8 +1,12 @@ -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + lex.yy.c + preproc.c + wpp.c + ppy.tab.c) -SET_SOURCE_FILES_PROPERTIES(${REACTOS_BINARY_DIR}/include/reactos/buildno.h PROPERTIES GENERATED TRUE) +set_source_files_properties(${REACTOS_BINARY_DIR}/include/reactos/buildno.h PROPERTIES GENERATED TRUE) add_library(wpp ${SOURCE}) -ADD_DEPENDENCIES(wpp build_header) +add_dependencies(wpp build_header) Modified: branches/cmake-bringup/tools/wrc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/wrc/CMakeLi… ============================================================================== --- branches/cmake-bringup/tools/wrc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/wrc/CMakeLists.txt [iso-8859-1] Fri Nov 5 18:06:25 2010 @@ -1,5 +1,16 @@ -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + dumpres.c + genres.c + newstruc.c + readres.c + translation.c + utils.c + wrc.c + writeres.c + parser.tab.c + lex.yy.c + port/mkstemps.c) add_executable(wrc ${SOURCE})

1 0

[janderwald] 49491: - Merge audio components from head
by janderwald＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: janderwald Date: Fri Nov 5 17:56:34 2010 New Revision: 49491 URL: http://svn.reactos.org/svn/reactos?rev=49491&view=rev Log: - Merge audio components from head Added: branches/audio-bringup/lib/drivers/sound/mmixer/midi.c - copied unchanged from r49490, trunk/reactos/lib/drivers/sound/mmixer/midi.c Modified: branches/audio-bringup/dll/directx/ (props changed) branches/audio-bringup/dll/directx/ksuser/ksuser.c branches/audio-bringup/dll/win32/wdmaud.drv/ (props changed) branches/audio-bringup/dll/win32/wdmaud.drv/legacy.c branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c branches/audio-bringup/drivers/ (props changed) branches/audio-bringup/drivers/ksfilter/ks/connectivity.c branches/audio-bringup/drivers/ksfilter/ks/irp.c branches/audio-bringup/drivers/ksfilter/ks/misc.c branches/audio-bringup/drivers/ksfilter/ks/property.c branches/audio-bringup/drivers/ksfilter/ks/topology.c branches/audio-bringup/drivers/storage/class/disk/disk.c branches/audio-bringup/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/guids.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/interfaces.hpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/interrupt.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/irpstream.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/port_topology.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/private.hpp branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp branches/audio-bringup/drivers/wdm/audio/legacy/wdmaud/control.c branches/audio-bringup/drivers/wdm/audio/legacy/wdmaud/interface.h branches/audio-bringup/drivers/wdm/audio/legacy/wdmaud/mmixer.c branches/audio-bringup/drivers/wdm/audio/legacy/wdmaud/wdmaud.h branches/audio-bringup/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild branches/audio-bringup/drivers/wdm/audio/sysaudio/pin.c branches/audio-bringup/lib/drivers/sound/ (props changed) branches/audio-bringup/lib/drivers/sound/mmebuddy/capabilities.c branches/audio-bringup/lib/drivers/sound/mmebuddy/midi/midMessage.c branches/audio-bringup/lib/drivers/sound/mmebuddy/midi/modMessage.c branches/audio-bringup/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c branches/audio-bringup/lib/drivers/sound/mmebuddy/mmewrap.c branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/widMessage.c branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c branches/audio-bringup/lib/drivers/sound/mmixer/controls.c branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.rbuild branches/audio-bringup/lib/drivers/sound/mmixer/priv.h branches/audio-bringup/lib/drivers/sound/mmixer/sup.c branches/audio-bringup/lib/drivers/sound/mmixer/topology.c branches/audio-bringup/lib/drivers/sound/mmixer/wave.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/audio-bringup/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/directx/ksuse… Modified: branches/audio-bringup/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… Modified: branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… Modified: branches/audio-bringup/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… Modified: branches/audio-bringup/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… Modified: branches/audio-bringup/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… Modified: branches/audio-bringup/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… Modified: branches/audio-bringup/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… Modified: branches/audio-bringup/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/storage/c… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/guids.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/interrupt.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/port_topology.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/legacy/wdmaud/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/legacy/wdmaud/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/midi/midMessage.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/midi/modMessage.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/mmewrap.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmixer/mmixer.rbuild URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… Modified: branches/audio-bringup/lib/drivers/sound/mmixer/wave.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound…

1 0

[akhaldi] 49490: [CMAKE] - Improve more libs.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 17:35:39 2010 New Revision: 49490 URL: http://svn.reactos.org/svn/reactos?rev=49490&view=rev Log: [CMAKE] - Improve more libs. Modified: branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/freetype/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/card… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:35:39 2010 @@ -1,4 +1,16 @@ -file(GLOB_RECURSE SOURCE "*.cpp") + +list(APPEND SOURCE + cardbitmaps.cpp + cardbutton.cpp + cardcolor.cpp + cardcount.cpp + cardlib.cpp + cardregion.cpp + cardrgndraw.cpp + cardrgnmouse.cpp + cardstack.cpp + cardwindow.cpp + dropzone.cpp) add_library(cardlib ${SOURCE}) -add_dependencies(cardlib psdk) +add_dependencies(cardlib psdk) Modified: branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/expa… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:35:39 2010 @@ -1,9 +1,13 @@ -include_directories(lib) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/expat) +include_directories( + lib + ${REACTOS_SOURCE_DIR}/include/reactos/libs/expat) add_definitions(-DHAVE_EXPAT_CONFIG_H) -file(GLOB_RECURSE SOURCE "lib/*.c") -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/lib/xmltok_impl.c ${CMAKE_CURRENT_SOURCE_DIR}/lib/xmltok_ns.c) -add_library(expat ${SOURCE}) +list(APPEND SOURCE + lib/xmlparse.c + lib/xmlrole.c + lib/xmltok.c) + +add_library(expat ${SOURCE}) Modified: branches/cmake-bringup/lib/3rdparty/freetype/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/free… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/freetype/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/freetype/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:35:39 2010 @@ -1,51 +1,52 @@ -add_definitions(-D__NTDRIVER__) -add_definitions(-DFT2_BUILD_LIBRARY) -add_definitions(-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER) + +add_definitions( + -D__NTDRIVER__ + -DFT2_BUILD_LIBRARY + -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER) include_directories(include) -set(SOURCE - "src/autofit/autofit.c" - "src/base/ftbase.c" - "src/base/ftbbox.c" - "src/base/ftbdf.c" - "src/base/ftbitmap.c" - "src/base/ftdebug.c" - "src/base/ftgasp.c" - "src/base/ftglyph.c" - "src/base/ftgxval.c" - "src/base/ftinit.c" - "src/base/ftlcdfil.c" - "src/base/ftmm.c" - "src/base/ftotval.c" - "src/base/ftpatent.c" - "src/base/ftpfr.c" - "src/base/ftstroke.c" - "src/base/ftsynth.c" - "src/base/ftsystem.c" - "src/base/fttype1.c" - "src/base/ftwinfnt.c" - "src/base/ftxf86.c" - "src/bdf/bdf.c" - "src/cache/ftcache.c" - "src/cff/cff.c" - "src/cid/type1cid.c" - "src/gxvalid/gxvalid.c" - "src/gzip/ftgzip.c" - "src/lzw/ftlzw.c" - "src/otvalid/otvalid.c" - "src/pcf/pcf.c" - "src/pfr/pfr.c" - "src/psaux/psaux.c" - "src/pshinter/pshinter.c" - "src/psnames/psnames.c" - "src/raster/raster.c" - "src/sfnt/sfnt.c" - "src/smooth/smooth.c" - "src/truetype/truetype.c" - "src/type1/type1.c" - "src/type42/type42.c" - "src/winfonts/winfnt.c" -) +list(APPEND SOURCE + src/autofit/autofit.c + src/base/ftbase.c + src/base/ftbbox.c + src/base/ftbdf.c + src/base/ftbitmap.c + src/base/ftdebug.c + src/base/ftgasp.c + src/base/ftglyph.c + src/base/ftgxval.c + src/base/ftinit.c + src/base/ftlcdfil.c + src/base/ftmm.c + src/base/ftotval.c + src/base/ftpatent.c + src/base/ftpfr.c + src/base/ftstroke.c + src/base/ftsynth.c + src/base/ftsystem.c + src/base/fttype1.c + src/base/ftwinfnt.c + src/base/ftxf86.c + src/bdf/bdf.c + src/cache/ftcache.c + src/cff/cff.c + src/cid/type1cid.c + src/gxvalid/gxvalid.c + src/gzip/ftgzip.c + src/lzw/ftlzw.c + src/otvalid/otvalid.c + src/pcf/pcf.c + src/pfr/pfr.c + src/psaux/psaux.c + src/pshinter/pshinter.c + src/psnames/psnames.c + src/raster/raster.c + src/sfnt/sfnt.c + src/smooth/smooth.c + src/truetype/truetype.c + src/type1/type1.c + src/type42/type42.c + src/winfonts/winfnt.c) -add_library(freetype ${SOURCE}) +add_library(freetype ${SOURCE}) Modified: branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:35:39 2010 @@ -5,7 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -file(APPEND SOURCE +list(APPEND SOURCE dsp_io.c version.c speaker.c

1 0

[akhaldi] 49489: [CMAKE] - Improve drivers' libs.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

Author: akhaldi Date: Fri Nov 5 17:29:01 2010 New Revision: 49489 URL: http://svn.reactos.org/svn/reactos?rev=49489&view=rev Log: [CMAKE] - Improve drivers' libs. Modified: branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt Modified: branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/ip/CM… ============================================================================== --- branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,11 +1,35 @@ + add_definitions(-D__NTDRIVER__) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) +include_directories( + BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include + ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) -file(GLOB_RECURSE ARCH_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/network/${ARCH}/checksum.S) -file(GLOB_RECURSE SOURCE "*.c") +if(ARCH MATCHES i386) +list(APPEND SOURCE network/i386/checksum.S) +endif() -add_library(ip ${ARCH_SOURCE} ${SOURCE}) +list(APPEND SOURCE + network/address.c + network/arp.c + network/checksum.c + network/icmp.c + network/interface.c + network/ip.c + network/loopback.c + network/neighbor.c + network/ports.c + network/receive.c + network/router.c + network/routines.c + network/transmit.c + transport/datagram/datagram.c + transport/rawip/rawip.c + transport/tcp/accept.c + transport/tcp/event.c + transport/tcp/if.c + transport/tcp/tcp.c + transport/udp/udp.c) + +add_library(ip ${SOURCE}) add_dependencies(ip bugcodes) - Modified: branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/oskit… ============================================================================== --- branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,18 +1,51 @@ -include_directories(BEFORE include/freebsd/src/sys) -include_directories(include/freebsd) -include_directories(include/freebsd/sys/include) -include_directories(include/freebsd/dev/include) -include_directories(include/freebsd/net/include) +include_directories( + BEFORE include/freebsd/src/sys + include/freebsd + include/freebsd/sys/include + include/freebsd/dev/include + include/freebsd/net/include + include) -include_directories(include) +add_definitions( + -D__NTDRIVER__ + -DKERNEL + -DOSKIT) -add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) -add_definitions(-DOSKIT) - -file(GLOB_RECURSE SOURCE "oskittcp/*.c") +list(APPEND SOURCE + oskittcp/defaults.c + oskittcp/in.c + oskittcp/in_cksum.c + oskittcp/in_pcb.c + oskittcp/in_proto.c + oskittcp/in_rmx.c + oskittcp/inet_ntoa.c + oskittcp/interface.c + oskittcp/ip_input.c + oskittcp/ip_output.c + oskittcp/kern_clock.c + oskittcp/kern_subr.c + oskittcp/osenv.c + oskittcp/param.c + oskittcp/radix.c + oskittcp/random.c + oskittcp/raw_cb.c + oskittcp/raw_ip.c + oskittcp/raw_usrreq.c + oskittcp/route.c + oskittcp/rtsock.c + oskittcp/scanc.c + oskittcp/sleep.c + oskittcp/tcp_input.c + oskittcp/tcp_output.c + oskittcp/tcp_subr.c + oskittcp/tcp_usrreq.c + oskittcp/tcp_debug.c + oskittcp/tcp_timer.c + oskittcp/uipc_domain.c + oskittcp/uipc_mbuf.c + oskittcp/uipc_socket.c + oskittcp/uipc_socket2.c) add_library(oskittcp ${SOURCE}) add_dependencies(oskittcp bugcodes) - Modified: branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/legacy/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,11 +1,11 @@ -add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) +add_definitions( + -D__NTDRIVER__ + -DKERNEL) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -file(GLOB_RECURSE SOURCE "*.c") - -add_library(audioleg ${SOURCE}) +add_library(audioleg devname.c hardware.c) add_dependencies(audioleg bugcodes) Modified: branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/mmebuddy/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,6 +1,7 @@ -add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DNDEBUG=1) +add_definitions( + -DUNICODE -D_UNICODE + -DNDEBUG=1) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) Modified: branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/mment4/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,10 +1,14 @@ -add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DDEBUG_NT4=1) +add_definitions( + -DUNICODE -D_UNICODE + -DDEBUG_NT4=1) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + detect.c + registry.c + control.c) add_library(mment4 ${SOURCE}) add_dependencies(mment4 psdk) Modified: branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/mmixer/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,10 +1,17 @@ -add_definitions(-DUNICODE -D_UNICODE) -add_definitions(-DNDEBUG=1) +add_definitions( + -DUNICODE -D_UNICODE + -DNDEBUG=1) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -file(GLOB_RECURSE SOURCE "*.c") +list(APPEND SOURCE + controls.c + filter.c + mixer.c + sup.c + wave.c + topology.c) add_library(mmixer ${SOURCE}) add_dependencies(mmixer bugcodes) Modified: branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/shared/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,9 +1,11 @@ -add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) +add_definitions( + -D__NTDRIVER__ + -DKERNEL) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) add_library(audio time.c) add_dependencies(audio bugcodes) Modified: branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,11 +1,16 @@ -add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) +add_definitions( + -D__NTDRIVER__ + -DKERNEL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -file(GLOB_RECURSE SOURCE "*.c") +file(APPEND SOURCE + dsp_io.c + version.c + speaker.c + rate.c + mixer.c) add_library(soundblaster ${SOURCE}) add_dependencies(soundblaster bugcodes) - Modified: branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/sound… ============================================================================== --- branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/drivers/sound/uartmidi/CMakeLists.txt [iso-8859-1] Fri Nov 5 17:29:01 2010 @@ -1,9 +1,11 @@ -add_definitions(-D__NTDRIVER__) -add_definitions(-DKERNEL) +add_definitions( + -D__NTDRIVER__ + -DKERNEL) -include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/soundblaster + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) add_library(uartmidi midiuart.c) add_dependencies(uartmidi bugcodes)

1 0

[akhaldi] 49488: [CMAKE] - Improve win32k, lib{jpeg, png, tiff, xslt} and win32k.
by akhaldi＠svn.reactos.org 05 Nov '10

05 Nov '10

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/libj… ============================================================================== --- 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/libp… ============================================================================== --- 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/libt… ============================================================================== --- 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/libx… ============================================================================== --- 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/mesa… ============================================================================== --- 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/… ============================================================================== --- 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

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
50
Older →

Jump to page:

2026

2025

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