Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 48447: [CMAKE]: Add support for precompiled headers (this was not fun). [CMAKE]: Use them in RTL and CRT. Someone needs to add them to the other makefiles.
by sir_richard＠svn.reactos.org 04 Aug '10

04 Aug '10

Author: sir_richard Date: Wed Aug 4 06:41:07 2010 New Revision: 48447 URL: http://svn.reactos.org/svn/reactos?rev=48447&view=rev Log: [CMAKE]: Add support for precompiled headers (this was not fun). [CMAKE]: Use them in RTL and CRT. Someone needs to add them to the other makefiles. Added: branches/cmake-bringup/CMakeMacros.cmake Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/lib/rtl/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/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] Wed Aug 4 06:41:07 2010 @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 2.8) project(REACTOS) + +include(CMakeMacros.cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) @@ -46,7 +48,7 @@ add_definitions(-D_USE_32BIT_TIME_T) # Compiler Core -add_definitions(-pipe -fms-extensions -fno-set-stack-executable) +add_definitions(-pipe -fms-extensions) # Debugging (Note: DWARF-4 on 4.5.1 when we ship) add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types) @@ -55,23 +57,23 @@ add_definitions(-march=pentium -mtune=i686) # Warnings -add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value) +add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch) # Optimizations add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-optimize-sibling-calls) -include_directories(./include) -include_directories(./include/psdk) -include_directories(./include/dxsdk) +include_directories(include) +include_directories(include/psdk) +include_directories(include/dxsdk) 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/crt/mingw32) -include_directories(./include/ddk) -include_directories(./include/ndk) -include_directories(./include/reactos) -include_directories(./include/reactos/libs) +include_directories(include/crt) +include_directories(include/crt/mingw32) +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) Added: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake (added) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Wed Aug 4 06:41:07 2010 @@ -1,0 +1,40 @@ +MACRO(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename) + + # Add the precompiled header to the build + SET(_gch_filename "${_header_filename}.gch") + LIST(APPEND ${_out_compile_flags} -c ${_header_filename} -o ${_gch_filename}) + + # This gets us our includes + GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES) + FOREACH(item ${DIRINC}) + LIST(APPEND ${_out_compile_flags} -I${item}) + ENDFOREACH(item) + + # This is a particular bit of undocumented/hacky magic I'm quite proud of + GET_DIRECTORY_PROPERTY(_compiler_flags DEFINITIONS) + STRING(REPLACE "\ " "\t" _compiler_flags ${_compiler_flags}) + LIST(APPEND ${_out_compile_flags} ${_compiler_flags}) + + # This gets any specific definitions that were added with set-target-property + GET_TARGET_PROPERTY(_target_defs ${_target_name} COMPILE_DEFINITIONS) + IF (_target_defs) + FOREACH(item ${_target_defs}) + LIST(APPEND ${_out_compile_flags} -D${item}) + ENDFOREACH(item) + ENDIF() + +ENDMACRO(_PCH_GET_COMPILE_FLAGS) + +MACRO(add_pch _target_name _header_filename _src_list) + + SET(_gch_filename "${_header_filename}.gch") + + LIST(APPEND ${_src_list} ${_gch_filename}) + + _PCH_GET_COMPILE_FLAGS(${_target_name} _args ${_header_filename}) + + add_custom_command(OUTPUT ${_gch_filename} + COMMAND rm -f ${_gch_filename} + COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args} + DEPENDS ${_header_filename}) +ENDMACRO(add_pch _target_name _header_filename _src_list) Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeList… ============================================================================== --- branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Wed Aug 4 06:41:07 2010 @@ -11,6 +11,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/mem.c ${CMAKE_CURRENT_SOURCE_DIR}/memgen.c) -add_library(rtl ${ARCH_SOURCE} ${SOURCE}) +add_library(rtl ${ARCH_SOURCE} ${SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/rtl.h.gch) +add_pch(rtl ${CMAKE_CURRENT_SOURCE_DIR}/rtl.h ${SOURCE}) add_dependencies(rtl psdk) Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Wed Aug 4 06:41:07 2010 @@ -1,4 +1,3 @@ - include_directories(./include) add_definitions(-D_CRTBLD) @@ -7,8 +6,11 @@ LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdio/findgen.c) LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c) -add_library(crt ${CRT_SOURCE}) +SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/precomp.h.gch PROPERTIES GENERATED ON) + +add_library(crt ${CRT_SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h.gch) set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) +add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE}) add_dependencies(crt psdk) if(ARCH MATCHES i386)

1 0

[tkreuzer] 48446: [GDI32] Fix parameter check in GetTextExtentExPointA/W. Patch by Kamil Hornicek. Fixes bug 5486, bug 5507 and bug 5511
by tkreuzer＠svn.reactos.org 04 Aug '10

04 Aug '10

Author: tkreuzer Date: Wed Aug 4 00:01:30 2010 New Revision: 48446 URL: http://svn.reactos.org/svn/reactos?rev=48446&view=rev Log: [GDI32] Fix parameter check in GetTextExtentExPointA/W. Patch by Kamil Hornicek. Fixes bug 5486, bug 5507 and bug 5511 Modified: trunk/reactos/dll/win32/gdi32/objects/text.c trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Wed Aug 4 00:01:30 2010 @@ -192,6 +192,13 @@ LPSIZE lpSize ) { + + if(nMaxExtent < -1) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return NtGdiGetTextExtentExW ( hdc, (LPWSTR)lpszStr, cchString, nMaxExtent, (PULONG)lpnFit, (PULONG)alpDx, lpSize, 0 ); } @@ -215,6 +222,12 @@ NTSTATUS Status; LPWSTR lpszStrW; BOOL rc = 0; + + if(nMaxExtent < -1) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } Status = HEAP_strdupA2W ( &lpszStrW, lpszStr ); if (!NT_SUCCESS (Status)) Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Wed Aug 4 00:01:30 2010 @@ -96,7 +96,7 @@ ULONG FASTCALL ftGdiGetGlyphOutline(PDC,WCHAR,UINT,LPGLYPHMETRICS,ULONG,PVOID,LPMAT2,BOOL); INT FASTCALL IntGetOutlineTextMetrics(PFONTGDI,UINT,OUTLINETEXTMETRICW *); BOOL FASTCALL ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS); -BOOL FASTCALL TextIntGetTextExtentPoint(PDC,PTEXTOBJ,LPCWSTR,int,int,LPINT,LPINT,LPSIZE); +BOOL FASTCALL TextIntGetTextExtentPoint(PDC,PTEXTOBJ,LPCWSTR,INT,ULONG,LPINT,LPINT,LPSIZE); BOOL FASTCALL ftGdiGetTextMetricsW(HDC,PTMW_INTERNAL); DWORD FASTCALL IntGetFontLanguageInfo(PDC); INT FASTCALL ftGdiGetTextCharsetInfo(PDC,PFONTSIGNATURE,DWORD); Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Wed Aug 4 00:01:30 2010 @@ -2119,8 +2119,8 @@ TextIntGetTextExtentPoint(PDC dc, PTEXTOBJ TextObj, LPCWSTR String, - int Count, - int MaxExtent, + INT Count, + ULONG MaxExtent, LPINT Fit, LPINT Dx, LPSIZE Size)

1 0

[tkreuzer] 48445: Add some tests for GetTextExtentExPoint. Dedicated to Pigglesworth
by tkreuzer＠svn.reactos.org 03 Aug '10

03 Aug '10

Author: tkreuzer Date: Tue Aug 3 23:15:20 2010 New Revision: 48445 URL: http://svn.reactos.org/svn/reactos?rev=48445&view=rev Log: Add some tests for GetTextExtentExPoint. Dedicated to Pigglesworth Added: trunk/rostests/apitests/gdi32api/tests/GetTextExtentExPoint.c (with props) Modified: trunk/rostests/apitests/gdi32api/testlist.c Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Tue Aug 3 23:15:20 2010 @@ -35,6 +35,7 @@ #include "tests/GetDIBits.c" #include "tests/GetObject.c" #include "tests/GetStockObject.c" +#include "tests/GetTextExtentExPoint.c" #include "tests/GetTextFace.c" #include "tests/SelectObject.c" #include "tests/SetDCPenColor.c" @@ -78,6 +79,7 @@ { L"GetDIBits", Test_GetDIBits }, { L"GetObject", Test_GetObject }, { L"GetStockObject", Test_GetStockObject }, + { L"GetTextExtentExPoint", Test_GetTextExtentExPoint }, { L"GetTextFace", Test_GetTextFace }, { L"SelectObject", Test_SelectObject }, { L"SetDCPenColor", Test_SetDCPenColor }, Added: trunk/rostests/apitests/gdi32api/tests/GetTextExtentExPoint.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetTextExtentExPoint.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GetTextExtentExPoint.c [iso-8859-1] Tue Aug 3 23:15:20 2010 @@ -1,0 +1,39 @@ +#define NUM_SYSCOLORS 31 + +INT +Test_GetTextExtentExPoint(PTESTINFO pti) +{ + INT nFit; + SIZE size; + BOOL result; + + SetLastError(0); + + result = GetTextExtentExPointA(GetDC(0), "test", 4, 1000, &nFit, NULL, &size); + TEST(result == 1); + TEST(nFit == 4); + TEST(GetLastError() == 0); + printf("nFit = %d\n", nFit); + + result = GetTextExtentExPointA(GetDC(0), "test", 4, 1, &nFit, NULL, &size); + TEST(result == 1); + TEST(nFit == 0); + TEST(GetLastError() == 0); + printf("nFit = %d\n", nFit); + + result = GetTextExtentExPointA(GetDC(0), "test", 4, 0, &nFit, NULL, &size); + TEST(result == 1); + TEST(nFit == 0); + TEST(GetLastError() == 0); + + result = GetTextExtentExPointA(GetDC(0), "test", 4, -1, &nFit, NULL, &size); + TEST(result == 1); + TEST(nFit == 4); + TEST(GetLastError() == 0); + + result = GetTextExtentExPointA(GetDC(0), "test", 4, -2, &nFit, NULL, &size); + TEST(result == 0); + TEST(GetLastError() == 87); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GetTextExtentExPoint.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48444: [CMAKE] - Formatting. No code change.
by akhaldi＠svn.reactos.org 03 Aug '10

03 Aug '10

Author: akhaldi Date: Tue Aug 3 21:58:41 2010 New Revision: 48444 URL: http://svn.reactos.org/svn/reactos?rev=48444&view=rev Log: [CMAKE] - Formatting. No code change. Modified: branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt branches/cmake-bringup/lib/sdk/nt/CMakeLists.txt branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt branches/cmake-bringup/lib/smlib/CMakeLists.txt branches/cmake-bringup/tools/winebuild/CMakeLists.txt branches/cmake-bringup/tools/wpp/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/delayimp/… ============================================================================== --- branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:58:41 2010 @@ -1,5 +1,4 @@ + add_definitions(-DUNICODE -D_UNICODE) - file(GLOB_RECURSE SOURCE "*.c") - -add_library(delayimp ${SOURCE}) +add_library(delayimp ${SOURCE}) Modified: branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/dxguid/CM… ============================================================================== --- branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:58:41 2010 @@ -1,4 +1,3 @@ file(GLOB_RECURSE SOURCE "*.c") - -add_library(dxguid ${SOURCE}) +add_library(dxguid ${SOURCE}) Modified: branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/ioevent/C… ============================================================================== --- branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:58:41 2010 @@ -1,4 +1,3 @@ file(GLOB_RECURSE SOURCE "*.c") - -add_library(ioevent ${SOURCE}) +add_library(ioevent ${SOURCE}) Modified: branches/cmake-bringup/lib/sdk/nt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/nt/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/sdk/nt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/nt/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:58:41 2010 @@ -1,4 +1,3 @@ file(GLOB_RECURSE SOURCE "*.c") - -add_library(nt ${SOURCE}) +add_library(nt ${SOURCE}) Modified: branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/scrnsave/… ============================================================================== --- branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:58:41 2010 @@ -1,5 +1,4 @@ + add_definitions(-DUNICODE -D_UNICODE) - file(GLOB_RECURSE SOURCE "*.c") - -add_library(scrnsave ${SOURCE}) +add_library(scrnsave ${SOURCE}) Modified: branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/strmiids/… ============================================================================== --- branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:58:41 2010 @@ -1,4 +1,3 @@ file(GLOB_RECURSE SOURCE "*.c") - -add_library(strmiids ${SOURCE}) +add_library(strmiids ${SOURCE}) Modified: branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/uuid/CMak… ============================================================================== --- branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:58:41 2010 @@ -1,4 +1,3 @@ file(GLOB_RECURSE SOURCE "*.c") - -add_library(uuid ${SOURCE}) +add_library(uuid ${SOURCE}) Modified: branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/wdmguid/C… ============================================================================== --- branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:58:41 2010 @@ -1,4 +1,3 @@ file(GLOB_RECURSE SOURCE "*.c") - -add_library(wdmguid ${SOURCE}) +add_library(wdmguid ${SOURCE}) Modified: branches/cmake-bringup/lib/smlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/smlib/CMakeLi… ============================================================================== --- branches/cmake-bringup/lib/smlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/smlib/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:58:41 2010 @@ -1,5 +1,4 @@ + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - file(GLOB_RECURSE SOURCE "*.c") - -add_library(smlib ${SOURCE}) +add_library(smlib ${SOURCE}) 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] Tue Aug 3 21:58:41 2010 @@ -5,6 +5,6 @@ add_executable(winebuild ${SOURCE} ${REACTOS_SOURCE_DIR}/include/reactos/buildno.h) -SET_SOURCE_FILES_PROPERTIES(${REACTOS_SOURCE_DIR}/include/reactos/buildno.h PROPERTIES GENERATED 1) +SET_SOURCE_FILES_PROPERTIES(${REACTOS_SOURCE_DIR}/include/reactos/buildno.h PROPERTIES GENERATED TRUE) ADD_DEPENDENCIES(winebuild build_header) 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] Tue Aug 3 21:58:41 2010 @@ -1,7 +1,7 @@ file(GLOB_RECURSE SOURCE "*.c") -SET_SOURCE_FILES_PROPERTIES(${REACTOS_SOURCE_DIR}/include/reactos/buildno.h PROPERTIES GENERATED 1) +SET_SOURCE_FILES_PROPERTIES(${REACTOS_SOURCE_DIR}/include/reactos/buildno.h PROPERTIES GENERATED TRUE) add_library(wpp ${SOURCE})

1 0

[akhaldi] 48443: [CMAKE] - Fix ntdllsys and win32ksys.
by akhaldi＠svn.reactos.org 03 Aug '10

03 Aug '10

Author: akhaldi Date: Tue Aug 3 21:57:06 2010 New Revision: 48443 URL: http://svn.reactos.org/svn/reactos?rev=48443&view=rev Log: [CMAKE] - Fix ntdllsys and win32ksys. Modified: branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt branches/cmake-bringup/lib/win32ksys/CMakeLists.txt Modified: branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/ntdllsys/CMak… ============================================================================== --- branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:57:06 2010 @@ -1,2 +1,4 @@ + +set_source_files_properties(${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S PROPERTIES GENERATED TRUE) add_library(ntdllsys ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) add_dependencies(ntdllsys ntdll_S) Modified: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/win32ksys/CMa… ============================================================================== --- branches/cmake-bringup/lib/win32ksys/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/win32ksys/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:57:06 2010 @@ -1,2 +1,4 @@ + +set_source_files_properties(${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S PROPERTIES GENERATED TRUE) add_library(win32ksys ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) add_dependencies(win32ksys win32k_S)

1 0

[akhaldi] 48442: [CMAKE] - Improve header inclusions.
by akhaldi＠svn.reactos.org 03 Aug '10

03 Aug '10

Author: akhaldi Date: Tue Aug 3 21:55:42 2010 New Revision: 48442 URL: http://svn.reactos.org/svn/reactos?rev=48442&view=rev Log: [CMAKE] - Improve header inclusions. Modified: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/expat/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/libxml2/CMakeLists.txt branches/cmake-bringup/lib/dnslib/CMakeLists.txt branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt branches/cmake-bringup/lib/drivers/oskittcp/CMakeLists.txt branches/cmake-bringup/lib/drivers/sound/soundblaster/CMakeLists.txt branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt branches/cmake-bringup/lib/inflib/CMakeLists.txt branches/cmake-bringup/lib/newinflib/CMakeLists.txt branches/cmake-bringup/lib/recyclebin/CMakeLists.txt branches/cmake-bringup/lib/rossym/CMakeLists.txt branches/cmake-bringup/lib/rtl/CMakeLists.txt branches/cmake-bringup/lib/tdilib/CMakeLists.txt branches/cmake-bringup/tools/CMakeLists.txt branches/cmake-bringup/tools/gendib/CMakeLists.txt branches/cmake-bringup/tools/nci/CMakeLists.txt branches/cmake-bringup/tools/rsym/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/adns… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,5 +1,5 @@ -include_directories(./src) -include_directories(./adns_win32) +include_directories(src) +include_directories(adns_win32) add_definitions(-DADNS_JGAA_WIN32) 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] Tue Aug 3 21:55:42 2010 @@ -1,5 +1,5 @@ -include_directories(.) -include_directories(./lib) + +include_directories(lib) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/expat) add_definitions(-DHAVE_EXPAT_CONFIG_H) 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] Tue Aug 3 21:55:42 2010 @@ -1,5 +1,5 @@ -include_directories(.) -include_directories(./include) + +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) 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] Tue Aug 3 21:55:42 2010 @@ -1,4 +1,4 @@ -include_directories(./inc) +include_directories(inc) add_definitions(-DUNICODE -D_UNICODE) 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] Tue Aug 3 21:55:42 2010 @@ -1,7 +1,7 @@ add_definitions(-D__NTDRIVER__) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/drivers/network/tcpip/include) -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include) +include_directories(${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") 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] Tue Aug 3 21:55:42 2010 @@ -1,9 +1,9 @@ -include_directories(BEFORE include/freebsd) -include_directories(BEFORE include/freebsd/sys/include) include_directories(BEFORE include/freebsd/src/sys) -include_directories(BEFORE include/freebsd/dev/include) -include_directories(BEFORE include/freebsd/net/include) +include_directories(include/freebsd) +include_directories(include/freebsd/sys/include) +include_directories(include/freebsd/dev/include) +include_directories(include/freebsd/net/include) include_directories(include) 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] Tue Aug 3 21:55:42 2010 @@ -2,7 +2,6 @@ add_definitions(-D__NTDRIVER__) add_definitions(-DKERNEL) -include_directories(.) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) file(GLOB_RECURSE SOURCE "*.c") Modified: branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/ntfslib… ============================================================================== --- branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,4 +1,3 @@ -include_directories(.) file(GLOB_RECURSE SOURCE "*.c") add_library(ntfslib ${SOURCE}) Modified: branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/vfatlib… ============================================================================== --- branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,5 +1,4 @@ -include_directories(.) file(GLOB_RECURSE SOURCE "*.c") add_library(vfatlib ${SOURCE}) add_dependencies(vfatlib psdk) Modified: branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/vfatxli… ============================================================================== --- branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,4 +1,3 @@ -include_directories(.) file(GLOB_RECURSE SOURCE "*.c") add_library(vfatxlib ${SOURCE}) Modified: branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/host/wcsfuncs… ============================================================================== --- branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,5 +1,4 @@ file(GLOB_RECURSE SOURCE "*.c") - add_library(host_wcsfuncs ${SOURCE}) Modified: branches/cmake-bringup/lib/inflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/inflib/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,4 +1,3 @@ -include_directories(.) SET(GLOBAL_FILES infcore.c infget.c infput.c) Modified: branches/cmake-bringup/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/newinflib/CMa… ============================================================================== --- branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,4 +1,3 @@ -include_directories(.) SET(GLOBAL_FILES infcore.c infget.c infput.c) Modified: branches/cmake-bringup/lib/recyclebin/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/recyclebin/CM… ============================================================================== --- branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,4 +1,3 @@ file(GLOB_RECURSE SOURCE "*.c") - add_library(recyclebin ${SOURCE}) Modified: branches/cmake-bringup/lib/rossym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,6 +1,4 @@ add_definitions(-D_NTSYSTEM_) - file(GLOB_RECURSE SOURCE "*.c") - add_library(rossym ${SOURCE}) Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeList… ============================================================================== --- branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,5 +1,3 @@ - -include_directories(.) add_definitions(-D_NTOSKRNL_) add_definitions(-DNO_RTL_INLINES) Modified: branches/cmake-bringup/lib/tdilib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/tdilib/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/tdilib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/tdilib/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,6 +1,5 @@ # FIXFIX: You guys should move this header in include/reactos/libs/iphlpapi! include_directories(${REACTOS_SOURCE_DIR}/dll/win32/iphlpapi) -include_directories(.) file(GLOB_RECURSE SOURCE "*.c") 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] Tue Aug 3 21:55:42 2010 @@ -12,4 +12,4 @@ add_subdirectory(wpp) #add_subdirectory(wmc) add_subdirectory(widl) -#add_subdirectory(wry) +#add_subdirectory(wrc) Modified: branches/cmake-bringup/tools/gendib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/gendib/CMak… ============================================================================== --- branches/cmake-bringup/tools/gendib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/gendib/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,4 +1,3 @@ file(GLOB_RECURSE SOURCE "*.c") - add_executable(gendib ${SOURCE}) 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] Tue Aug 3 21:55:42 2010 @@ -1,4 +1,3 @@ file(GLOB_RECURSE SOURCE "*.c") - add_executable(nci ${SOURCE}) Modified: branches/cmake-bringup/tools/rsym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/rsym/CMakeL… ============================================================================== --- branches/cmake-bringup/tools/rsym/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/rsym/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:55:42 2010 @@ -1,4 +1,3 @@ add_executable(rsym rsym_common.c rsym.c) - add_executable(raddr2line rsym_common.c raddr2line.c)

1 0

[akhaldi] 48441: [CMAKE] - Add IDL generated headers to build.
by akhaldi＠svn.reactos.org 03 Aug '10

03 Aug '10

Author: akhaldi Date: Tue Aug 3 21:51:59 2010 New Revision: 48441 URL: http://svn.reactos.org/svn/reactos?rev=48441&view=rev Log: [CMAKE] - Add IDL generated headers to build. Added: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt (with props) Modified: branches/cmake-bringup/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] Tue Aug 3 21:51:59 2010 @@ -75,6 +75,7 @@ add_subdirectory(include/psdk) add_subdirectory(include/dxsdk) +add_subdirectory(include/reactos/idl) add_subdirectory(include/reactos/mc) add_subdirectory(base) @@ -110,8 +111,6 @@ DEPENDS native-nci ${nci_folders} ) -SET_SOURCE_FILES_PROPERTIES(${nci_output} PROPERTIES GENERATED TRUE) - ADD_CUSTOM_TARGET(ntdll_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) ADD_CUSTOM_TARGET(win32k_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) ADD_CUSTOM_TARGET(ntsys_pspec ALL DEPENDS ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) Added: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/CMakeLists.txt (added) +++ branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:51:59 2010 @@ -1,0 +1,51 @@ + +remove_definitions(-DWINVER=0x502) +add_definitions(-DWINVER=0x600) + +include_directories(.) + +get_directory_property(defines COMPILE_DEFINITIONS) +get_directory_property(includes INCLUDE_DIRECTORIES) + +foreach(arg ${defines}) + set(result_defs ${result_defs} -D${arg}) +endforeach(arg ${defines}) + +foreach(arg ${includes}) + set(result_incs -I${arg} ${result_incs}) +endforeach(arg ${includes}) + +MACRO (MACRO_IDL_FILES) + + FOREACH(_in_FILE ${ARGN}) + + get_filename_component(FILE ${_in_FILE} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c + COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h -s -S ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl + DEPENDS native-widl + ) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c + PROPERTIES GENERATED TRUE + ) + add_custom_target(${FILE}_server ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) + + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c + COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h -c -C ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl + DEPENDS native-widl + ) + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c + PROPERTIES GENERATED TRUE + ) + add_custom_target(${FILE}_client ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) + + ENDFOREACH(_in_FILE ${ARGN}) + +ENDMACRO (MACRO_IDL_FILES) + +file(GLOB_RECURSE SOURCE "*.idl") +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/ms-dtyp.idl) +MACRO_IDL_FILES(${SOURCE}) Propchange: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sir_richard] 48440: [CMAKE]: NTDLL WIP.
by sir_richard＠svn.reactos.org 03 Aug '10

03 Aug '10

Author: sir_richard Date: Tue Aug 3 21:39:17 2010 New Revision: 48440 URL: http://svn.reactos.org/svn/reactos?rev=48440&view=rev Log: [CMAKE]: NTDLL WIP. Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:39:17 2010 @@ -1,6 +1,11 @@ add_definitions(-D__NTDLL__) add_definitions(-D_NTOSKRNL_) add_definitions(-DCRTDLL) + +SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE 1) + +include_directories(BEFORE ./include) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) file(GLOB_RECURSE SOURCE *.c) list(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/ldr/elf.c ${CMAKE_CURRENT_SOURCE_DIR}/dispatch/dispatch.c) @@ -10,5 +15,5 @@ add_library(ntdll SHARED ${ARCH_SOURCE} ${SOURCE}) -target_link_libraries(ntdll rtl ntdllsys libcntpr pseh debugsup_ntdll) +target_link_libraries(ntdll rtl ntdllsys libcntpr pseh) add_dependencies(ntdll ntstatus version)

1 0

[sir_richard] 48439: [CMAKE]: Don't auto-link with Win32 stuff.
by sir_richard＠svn.reactos.org 03 Aug '10

03 Aug '10

Author: sir_richard Date: Tue Aug 3 21:38:59 2010 New Revision: 48439 URL: http://svn.reactos.org/svn/reactos?rev=48439&view=rev Log: [CMAKE]: Don't auto-link with Win32 stuff. Modified: branches/cmake-bringup/toolchain-mingw32.cmake 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] Tue Aug 3 21:38:59 2010 @@ -19,6 +19,8 @@ SET(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") +set(CMAKE_STANDARD_LIBRARIES "") + # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search # programs in the host environment

1 0

[sir_richard] 48438: [CMAKE]: Fix CRT.
by sir_richard＠svn.reactos.org 03 Aug '10

03 Aug '10

Author: sir_richard Date: Tue Aug 3 21:38:39 2010 New Revision: 48438 URL: http://svn.reactos.org/svn/reactos?rev=48438&view=rev Log: [CMAKE]: Fix CRT. Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Tue Aug 3 21:38:39 2010 @@ -1,13 +1,14 @@ -include_directories(.) include_directories(./include) + +add_definitions(-D_CRTBLD) file(GLOB_RECURSE CRT_SOURCE "*.c") LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdio/findgen.c) LIST(REMOVE_ITEM CRT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c) add_library(crt ${CRT_SOURCE}) -add_definitions(-D__MINGW_IMPORT=extern -DUSE_MSVCRT_PREFIX -D_MSVCRT_LIB_ -D_MSVCRT_ -D_MT -D_CRTBLD) +set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) add_dependencies(crt psdk) if(ARCH MATCHES i386) @@ -114,6 +115,5 @@ endif() add_library(libcntpr ${LIBCNTPR_SOURCE}) -remove_definitions(-D__MINGW_IMPORT=extern -DUSE_MSVCRT_PREFIX -D_MSVCRT_LIB_ -D_MSVCRT_ -D_MT -D_CRTBLD) -add_definitions(-DNO_RTL_INLINES -D_NTSYSTEM_ -D_NTDLLBUILD_ -D_LIBCNT_ -D__CRT__NO_INLINE) +set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) add_dependencies(libcntpr psdk)

1 0

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